diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index 5013657f4..d345e5b20 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -59,7 +59,7 @@
     
     $dest.append(Danbooru.RelatedTag.build_html(query, related_tags));
     if (wiki_page_tags.length > 0) {
-      $dest.append(Danbooru.RelatedTag.build_html("wiki:" + query), wiki_page_tags);
+      $dest.append(Danbooru.RelatedTag.build_html("wiki:" + query, wiki_page_tags));
     }
   }
   
@@ -85,8 +85,8 @@
       $link.addClass("tag-type-" + tag[1]);
       $link.attr("href", "/posts?tags=" + encodeURIComponent(tag[0]));
       $link.click(Danbooru.RelatedTag.toggle_tag);
-      if ($.inArray(tag, current)) {
-        $link.addClass("active");
+      if ($.inArray(tag[0], current) > -1) {
+        $link.addClass("selected");
       }
       $ul.append(
         $("<li/>").append($link)
@@ -102,7 +102,7 @@
     var tags = $field.val().match(/\S+/g) || [];
     var tag = $(e.target).html().replace(/ /g, "_");
 
-    if ($.inArray(tag, tags)) {
+    if ($.inArray(tag, tags) > -1) {
       $field.val(Danbooru.without(tags, tag).join(" ") + " ");
     } else {
       $field.val(tags.concat([tag]).join(" ") + " ");
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index f8bf18ff9..8babc332b 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1,37 +1,6 @@
 /*
  *= require "smoothness/jquery-ui-1.8.5.custom.css"
  *= require_self
+ *= require_tree "./common"
+ *= require_tree "./specific"
 */
-
-@import "common/000_vars.css.scss";
-@import "common/010_reset.css.scss";
-@import "common/020_base.css.scss";
-@import "common/030_links.css.scss";
-@import "common/dtext.css.scss";
-@import "common/inline.css.scss";
-@import "common/jquery_ui_custom.css.scss";
-@import "common/main_layout.css.scss";
-@import "common/news.css.scss";
-@import "common/notices.css.scss";
-@import "common/page_header.css.scss";
-@import "common/paginator.css.scss";
-@import "common/simple_form.css.scss";
-@import "common/spoiler.css.scss";
-@import "common/tables.css.scss";
-
-@import "specific/artists.css.scss";
-@import "specific/comments.css.scss";
-@import "specific/favorites.css.scss";
-@import "specific/forum.css.scss";
-@import "specific/moderator_dashboard.css.scss";
-@import "specific/notes.css.scss";
-@import "specific/pools.css.scss";
-@import "specific/post_mode_menu.css.scss";
-@import "specific/posts.css.scss";
-@import "specific/related_tags.css.scss";
-@import "specific/sessions.css.scss";
-@import "specific/site_map.css.scss";
-@import "specific/terms_of_service.css.scss";
-@import "specific/uploads.css.scss";
-@import "specific/users.css.scss";
-@import "specific/wiki_pages.css.scss";
diff --git a/app/assets/stylesheets/common/020_base.css.scss b/app/assets/stylesheets/common/020_base.css.scss
index 63a56ef7e..e62fe1493 100644
--- a/app/assets/stylesheets/common/020_base.css.scss
+++ b/app/assets/stylesheets/common/020_base.css.scss
@@ -1,3 +1,5 @@
+@import "000_vars.css.scss";
+
 body {
   font-family: Verdana, Helvetica, sans-serif;
   padding: 0;
diff --git a/app/assets/stylesheets/common/030_links.css.scss b/app/assets/stylesheets/common/030_links.css.scss
index 920cb94fc..059e61285 100644
--- a/app/assets/stylesheets/common/030_links.css.scss
+++ b/app/assets/stylesheets/common/030_links.css.scss
@@ -1,3 +1,5 @@
+@import "000_vars.css.scss";
+
 a:link {
   color: $link_color;
   text-decoration: none;
diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss
index 553396763..37bdddcde 100644
--- a/app/assets/stylesheets/common/dtext.css.scss
+++ b/app/assets/stylesheets/common/dtext.css.scss
@@ -1,3 +1,5 @@
+@import "000_vars.css.scss";
+
 div.prose {
   h1, h2, h3 {
     line-height: 1em;
diff --git a/app/assets/stylesheets/common/inline.css.scss b/app/assets/stylesheets/common/inline.css.scss
index c0518eeac..b4c1a87d5 100644
--- a/app/assets/stylesheets/common/inline.css.scss
+++ b/app/assets/stylesheets/common/inline.css.scss
@@ -1,3 +1,5 @@
+@import "000_vars.css.scss";
+
 span.error {
   display: block;
   font-weight: bold;
diff --git a/app/assets/stylesheets/common/main_layout.css.scss b/app/assets/stylesheets/common/main_layout.css.scss
index 68524f4cb..9e7b59b84 100644
--- a/app/assets/stylesheets/common/main_layout.css.scss
+++ b/app/assets/stylesheets/common/main_layout.css.scss
@@ -1,3 +1,5 @@
+@import "000_vars.css.scss";
+
 div#search {
   margin-bottom: 1em;
 }
diff --git a/app/assets/stylesheets/specific/comments.css.scss b/app/assets/stylesheets/specific/comments.css.scss
index 90842a5a4..8aa05525d 100644
--- a/app/assets/stylesheets/specific/comments.css.scss
+++ b/app/assets/stylesheets/specific/comments.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div.comments-for-post {
   div.list-of-comments {
     article.comment {
diff --git a/app/assets/stylesheets/specific/pools.css.scss b/app/assets/stylesheets/specific/pools.css.scss
index 4492fad51..c9559c6b9 100644
--- a/app/assets/stylesheets/specific/pools.css.scss
+++ b/app/assets/stylesheets/specific/pools.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div#c-pool-elements {
   div#a-new {
     font-size: 0.8em;
diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 0b4d0a06f..a8fcd2b35 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div.post-previews {
   overflow: visible;
 }
diff --git a/app/assets/stylesheets/specific/related_tags.css.scss b/app/assets/stylesheets/specific/related_tags.css.scss
index e69de29bb..bb312d109 100644
--- a/app/assets/stylesheets/specific/related_tags.css.scss
+++ b/app/assets/stylesheets/specific/related_tags.css.scss
@@ -0,0 +1,34 @@
+@import "../common/000_vars.css.scss";
+
+div#related-tags {
+  overflow: auto;
+  width: 100%;
+  margin-bottom: 1em;
+  
+  div.tag-column {
+    max-width: 15em;
+    margin-right: 2em;
+    float: left;
+    
+    ul {
+      li {
+        padding: 0.25em 0.5em;
+        
+        em {
+          padding: 0.25em 0.5em;
+          font-weight: bold;
+        }
+        
+        a {
+          padding: 0.25em 0.5em;
+          min-width: 3em;
+        }
+        
+        a.selected {
+          background-color: $link_color;
+          color: white;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/specific/sessions.css.scss b/app/assets/stylesheets/specific/sessions.css.scss
index 051ec822e..54cbcc8a5 100644
--- a/app/assets/stylesheets/specific/sessions.css.scss
+++ b/app/assets/stylesheets/specific/sessions.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div#sessions {
   div#new {
     section {
diff --git a/app/assets/stylesheets/specific/site_map.css.scss b/app/assets/stylesheets/specific/site_map.css.scss
index bd56943f1..36d14471f 100644
--- a/app/assets/stylesheets/specific/site_map.css.scss
+++ b/app/assets/stylesheets/specific/site_map.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div#c-static {
   div#a-site-map {
     width: 80em;
diff --git a/app/assets/stylesheets/specific/terms_of_service.css.scss b/app/assets/stylesheets/specific/terms_of_service.css.scss
index 55b9c29f2..523955587 100644
--- a/app/assets/stylesheets/specific/terms_of_service.css.scss
+++ b/app/assets/stylesheets/specific/terms_of_service.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div#terms-of-service {
   width: 40em;
   
diff --git a/app/assets/stylesheets/specific/users.css.scss b/app/assets/stylesheets/specific/users.css.scss
index 47c51f261..423b9a15e 100644
--- a/app/assets/stylesheets/specific/users.css.scss
+++ b/app/assets/stylesheets/specific/users.css.scss
@@ -1,3 +1,5 @@
+@import "../common/000_vars.css.scss";
+
 div#c-users {
   div#a-new {
     max-width: 60em;