diff --git a/src/components/tags/TagsColorContainer.svelte b/src/components/tags/TagsColorContainer.svelte
index 2a1e9e4..260e2ce 100644
--- a/src/components/tags/TagsColorContainer.svelte
+++ b/src/components/tags/TagsColorContainer.svelte
@@ -19,50 +19,60 @@
   .tag-color-container:is(:global(.tag-color-container--rating)) :global(.tag) {
     background-color: colors.$tag-rating-background;
     color: colors.$tag-rating-text;
+    border-color: colors.$tag-rating-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--spoiler)) :global(.tag) {
     background-color: colors.$tag-spoiler-background;
     color: colors.$tag-spoiler-text;
+    border-color: colors.$tag-spoiler-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--origin)) :global(.tag) {
     background-color: colors.$tag-origin-background;
     color: colors.$tag-origin-text;
+    border-color: colors.$tag-origin-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--oc)) :global(.tag) {
     background-color: colors.$tag-oc-background;
     color: colors.$tag-oc-text;
+    border-color: colors.$tag-oc-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--error)) :global(.tag) {
     background-color: colors.$tag-error-background;
     color: colors.$tag-error-text;
+    border-color: colors.$tag-error-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--character)) :global(.tag) {
     background-color: colors.$tag-character-background;
     color: colors.$tag-character-text;
+    border-color: colors.$tag-character-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--content-official)) :global(.tag) {
     background-color: colors.$tag-content-official-background;
     color: colors.$tag-content-official-text;
+    border-color: colors.$tag-content-official-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--content-fanmade)) :global(.tag) {
     background-color: colors.$tag-content-fanmade-background;
     color: colors.$tag-content-fanmade-text;
+    border-color: colors.$tag-content-fanmade-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--species)) :global(.tag) {
     background-color: colors.$tag-species-background;
     color: colors.$tag-species-text;
+    border-color: colors.$tag-species-border;
   }
 
   .tag-color-container:is(:global(.tag-color-container--body-type)) :global(.tag) {
     background-color: colors.$tag-body-type-background;
     color: colors.$tag-body-type-text;
+    border-color: colors.$tag-body-type-border;
   }
 </style>
diff --git a/src/styles/colors.scss b/src/styles/colors.scss
index 7bdfe9e..40e72bb 100644
--- a/src/styles/colors.scss
+++ b/src/styles/colors.scss
@@ -27,27 +27,38 @@ $media-box-border: #311e49;
 $tag-background: #1b3c21;
 $tag-count-background: #2d6236;
 $tag-text: #4aa158;
+$tag-border: #2d6236;
 
 $tag-rating-text: #418dd9;
 $tag-rating-background: color.adjust($tag-rating-text, $lightness: -35%);
+$tag-rating-border: color.adjust($tag-rating-text, $saturation: -10%, $lightness: -20%);
 $tag-spoiler-text: #d49b39;
 $tag-spoiler-background: color.adjust($tag-spoiler-text, $lightness: -34%);
+$tag-spoiler-border: color.adjust($tag-spoiler-text, $lightness: -23%);
 $tag-origin-text: #6f66d6;
 $tag-origin-background: color.adjust($tag-origin-text, $lightness: -40%);
+$tag-origin-border: color.adjust($tag-origin-text, $saturation: -28%, $lightness: -22%);
 $tag-oc-text: #b157b7;
 $tag-oc-background: color.adjust($tag-oc-text, $lightness: -33%);
+$tag-oc-border: color.adjust($tag-oc-text, $lightness: -15%);
 $tag-error-text: #d45460;
 $tag-error-background: color.adjust($tag-error-text, $lightness: -38%, $saturation: -6%, $space: hsl);
+$tag-error-border: color.adjust($tag-error-text, $lightness: -22%, $space: hsl);
 $tag-character-text: #4aaabf;
 $tag-character-background: color.adjust($tag-character-text, $lightness: -33%);
+$tag-character-border: color.adjust($tag-character-text, $lightness: -20%);
 $tag-content-official-text: #b9b541;
 $tag-content-official-background: color.adjust($tag-content-official-text, $lightness: -29%, $saturation: -2%, $space: hsl);
+$tag-content-official-border: color.adjust($tag-content-official-text, $lightness: -20%, $space: hsl);
 $tag-content-fanmade-text: #cc8eb5;
 $tag-content-fanmade-background: color.adjust($tag-content-fanmade-text, $lightness: -40%);
+$tag-content-fanmade-border: color.adjust($tag-content-fanmade-text, $saturation: -10%, $lightness: -20%);
 $tag-species-text: #b16b50;
 $tag-species-background: color.adjust($tag-species-text, $lightness: -35%);
+$tag-species-border: color.adjust($tag-species-text, $saturation: -10%, $lightness: -20%);
 $tag-body-type-text: #b8b8b8;
-$tag-body-type-background: color.adjust($tag-body-type-text, $lightness: -35%, $saturation: -10%, $space: hsl);
+$tag-body-type-background: color.adjust($tag-body-type-text, $lightness: -50%, $space: hsl);
+$tag-body-type-border: color.adjust($tag-body-type-text, $lightness: -37%, $saturation: -10%, $space: hsl);
 
 $input-background: #26232d;
 $input-border: #5c5a61;
diff --git a/src/styles/injectable/tag.scss b/src/styles/injectable/tag.scss
index 68dd70c..bbec107 100644
--- a/src/styles/injectable/tag.scss
+++ b/src/styles/injectable/tag.scss
@@ -1,4 +1,5 @@
 @use '../colors';
+@use '../environment';
 
 .tag {
   background: colors.$tag-background;
@@ -9,9 +10,13 @@
   padding: 0 4px;
   display: flex;
 
+  @if environment.$current-site == 'derpibooru' {
+    border: 1px solid colors.$tag-border;
+  }
+
   .remove {
     content: "x";
     margin-left: 6px;
     cursor: pointer;
   }
-}
\ No newline at end of file
+}