diff --git a/public/s/css/f0ck.css b/public/s/css/f0ck.css
index 20480b4..e9b1931 100644
--- a/public/s/css/f0ck.css
+++ b/public/s/css/f0ck.css
@@ -46,6 +46,15 @@ html[theme="f0ck"] .admin-search button {
 
 html[theme="f0ck"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="f0ck"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="f0ck"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme='p1nk'] {
@@ -85,6 +94,15 @@ html[theme='p1nk'] {
 
 html[theme="p1nk"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="p1nk"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="p1nk"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme='orange'] {
@@ -124,6 +142,15 @@ html[theme='orange'] {
 
 html[theme="orange"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="orange"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="orange"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme='amoled'] {
@@ -164,6 +191,15 @@ html[theme='amoled'] {
 
 html[theme="amoled"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="amoled"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="amoled"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme="amoled"] .admin-search button {
@@ -221,6 +257,15 @@ html[theme="paper"] {
 
 html[theme="paper"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="paper"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="paper"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme="paper"] body {
@@ -365,6 +410,15 @@ html[theme="atmos"] {
 
 html[theme="atmos"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="atmos"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="atmos"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme="term"] {
@@ -406,6 +460,17 @@ html[theme="term"] {
 
 html[theme="term"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="term"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="term"] span#favs {
+  box-shadow: var(--pagination-anchor-box-shadow);
+  background-image: linear-gradient(to bottom,var(--nav-link-background-linear-gradient));
+  border: 1px solid var(--black);
 }
 
 html[theme="term"] .metadata {
@@ -460,6 +525,15 @@ html[theme="iced"] {
 
 html[theme="iced"] .pagination > a, .pagination > span  {
   border-radius: 3px;
+  border: 1px solid var(--black);
+}
+
+html[theme="iced"] .pagination > span {
+  border-radius: 3px;
+}
+
+html[theme="iced"] span#favs {
+  border: 1px solid var(--black);
 }
 
 html[theme="iced"] .navbar-brand:hover {
@@ -494,7 +568,7 @@ html[theme='f0ck95'] {
   --pagination-background-hover: #8a8989;
   --pagination-border-color: rgba(0,0,0,.8) rgba(0,0,0,.65) rgba(0,0,0,.5);
   --metadata-bg: silver;
-  --badge-bg: silver;
+  --badge-bg: #a8a5a5;
   --posts-meta-bg: #000000b8;
   --badge-sfw: #68a728;
   --badge-nsfw: #a72828;
@@ -511,6 +585,10 @@ html[theme="f0ck95"] a {
     color: var(--black);
 }
 
+html[theme="f0ck95"] span#favs {
+  border: inset 1px gray;
+}
+
 html[theme="f0ck95"] .nav-link, .pagination > a, .pagination > span {
     border-radius: 0px;
     border-left: inset 1px silver;
@@ -595,6 +673,13 @@ html[theme="f0ck95"] .about {
     color: black;
 }
 
+html[theme="f0ck95"] .badge-dark, #themeselector {
+  border: inset 1px gray;
+  background: #a8a5a5;
+}
+
+html[theme="f0ck95"] 
+
 ::-webkit-scrollbar {
   width: 5px;
 }
@@ -1086,7 +1171,6 @@ span.placeholder {
   font-weight: 500;
   color: var(--accent);
   text-align: center;
-  border: 1px solid var(--black);
 }
 
 .pagination > span {
@@ -1100,7 +1184,6 @@ span.placeholder {
 .pagination > a {
   text-decoration: none;
   text-shadow: 0 1px var(--black);
-  border-color: var(--black);
   background-clip: padding-box;
   box-shadow: var(--pagination-anchor-box-shadow);
   background-image: linear-gradient(to bottom,var(--nav-link-background-linear-gradient));
@@ -1892,8 +1975,8 @@ span#favs {
   margin: 5px;
   line-height: 0;
   background: var(--badge-bg);
-  border: 1px solid var(--black);
 }
+
 #favs > a img {
   border: 2px solid var(--accent);
 }