diff --git a/themes/gokarna/static/css/dark.css b/themes/gokarna/static/css/dark.css
index e1484ff..f01aa88 100644
--- a/themes/gokarna/static/css/dark.css
+++ b/themes/gokarna/static/css/dark.css
@@ -14,7 +14,26 @@ a {
 }
 
 .nav-links .nav-icons-divider {
-  color: #484848; !important
+  color: #484848;
+}
+
+.post-tags .post-tag {
+  border: 1px solid white;
+  color: white;
+}
+
+.post-tags .post-tag:hover {
+  background-color: white;
+  color: black;
+}
+
+.tags-list .post-tags .post-tag a .tag-posts-count {
+  background-color: #1f1f1f;
+}
+
+.tags-list .post-tags .post-tag:hover a .tag-posts-count {
+  background-color: white;
+  color: black;
 }
 
 .footer {
diff --git a/themes/gokarna/static/css/main.css b/themes/gokarna/static/css/main.css
index 143d503..b5cc989 100644
--- a/themes/gokarna/static/css/main.css
+++ b/themes/gokarna/static/css/main.css
@@ -22,7 +22,7 @@ a {
 }
 
 a:hover {
-  color: var(--accent-color) !important;
+  color: var(--accent-color);
 }
 
 main#content {
@@ -50,7 +50,6 @@ img {
 }
 
 .header a {
-  color: inherit;
   text-decoration: none;
 }
 .header .header-nav {
@@ -153,21 +152,21 @@ img {
   padding: 0;
 }
 .post-tags .post-tag {
-  background-color: var(--accent-color);
-  border: 1px solid var(--accent-color);
+  border: 1px solid black;
   border-radius: 4px;
   box-sizing: border-box;
-  color: white;
+  color: black;
   display: inline-block;
   font-size: 14px;
-  padding: 4px 12px;
 }
 .post-tags .post-tag:hover {
-  background-color: #3d86d2;
-  border: 1px solid #3d86d2;
+  background-color: black;
+  color: white;
 }
 .post-tag a {
   color: inherit;
+  display: block;
+  padding: 6px 12px;
   text-decoration: none;
 }
 
@@ -270,11 +269,18 @@ blockquote {
   margin: 0 5px;
   padding: 0;
 }
+.tags-list .post-tags .post-tag a {
+  padding: 0;
+}
+
 .tags-list .post-tags .post-tag a div {
   display: inline-block;
+}
+.tags-list .post-tags .post-tag a .tag-name {
   padding: 5px 8px;
 }
 .tags-list .post-tags .post-tag a .tag-posts-count {
   background: rgba(0, 0, 0, 0.1);
   opacity: 0.8;
+  padding: 6px;
 }