diff --git a/theme-github-auto.css b/theme-github-auto.css
index c11736c..2900b71 100644
--- a/theme-github-auto.css
+++ b/theme-github-auto.css
@@ -415,13 +415,13 @@
 @media (prefers-color-scheme: dark) {
   :root {
     --color-primary: #347d39;
-    --color-secondary: #535865;
+    --color-secondary: #373e47;
     --border-radius: 6px;
-    --color-body: #373e47;
-    --color-navbar: #22272e;
-    --color-footer: #22272e;
+    --color-body: #0d1117;
+    --color-navbar: #161b22;
+    --color-footer: #161b22;
     --color-text-light: #a6aab5;
-    --color-text-light-2: #adbac7;
+    --color-text-light-2: #e9e8e8;
     --color-text: #bbc0ca;
     --color-box-body: #22272e;
     --color-markup-code-block: #636e7b66;
@@ -437,6 +437,11 @@
     --is-dark-theme: true;
     --color-blue: #539bf5;
     --color-input-background: #22272e;
+    --color-primary-contrast: #e9e8e8;
+    --color-text-light-2: #a6aab5;
+    --color-box-body: #161b22;
+    --color-box-header: #161b22;
+    --color-green-light: #16ab39
 
     /* code editor colors are set in https://github.com/go-gitea/gitea/blob/f5b300ea77081a1b78ac044cb1c0f9225538d091/web_src/js/features/codeeditor.js#L82-L97.  */
     /* monaco editor dark theme is toggled via variable `--is-dark-theme` */
@@ -532,7 +537,7 @@
   .ui.basic.primary.buttons .button {
     background-color: #22272e !important;
     box-shadow: inset 0 0 0 1px rgba(34, 36, 38, 0.15) !important;
-    color: #dbdbdb !important;
+    color: !important;
   }
 
   .ui.basic.green.button:focus,
@@ -562,6 +567,7 @@
     background-color: #22272e;
     border-radius: 6px;
     padding: 3px 10px 3px 10px;
+    border: 1px solid #373e47;
   }
 
   .ui.menu .item {
@@ -615,7 +621,8 @@
   }
 
   .ui.menu.two.item .item {
-    border: 1px solid var(--color-secondary);
+    border: 1px solid #373e47;
+    background: #161b22;
   }
 
   a,
@@ -675,7 +682,7 @@
   .ui.checkbox label:before,
   .ui.checkbox input:checked ~ label:before,
   .ui.checkbox input:not([type="radio"]):indeterminate ~ label:before {
-    border-color: var(--color-input-background);
+    border-color: #373e47 !important;
   }
 
   /* hover repository rows */
@@ -802,12 +809,13 @@
 
   /* border color repo files */
   .repository.file.list #repo-files-table td {
-    border-bottom: 1px solid #373e47;
+    // border-bottom: 1px solid #373e47;
   }
 
   /* text color repo files */
   .repository.file.list #repo-files-table td {
-    color: #7f8699;
+    color: var(--color-text-light) !important;
+    background: #161b22;
   }
 
   .repository.file.list #repo-files-table td a {
@@ -823,7 +831,7 @@
     .timeline-item.commits-list
     .singular-commit
     .sha.label.isSigned.isVerified {
-    border: 1px solid #21ba45 !important;
+    border: 1.5px solid #21ba45 !important;
     background: transparent;
     border-radius: 6px;
   }
@@ -832,6 +840,9 @@
   .ui.tabular.menu .active.item,
   .ui.tabular.menu .active.item:hover {
     background: var(--color-navbar);
+    border-bottom: 3px solid #f78166 !important;
+    border: 0px solid black;
+    color: #e9e8e8;
   }
 
   /* repo watch and fork counters */
@@ -862,7 +873,7 @@
 
   /* repo svg icons */
   .repository.view.issue .comment-list .timeline-item .badge .svg {
-    fill: var(--color-text-light) !important;
+    fill: #ffffff !important;
   }
 
   /* background emoji reactions */
@@ -930,6 +941,7 @@
   .ui.form .field .dropdown,
   .ui.form .field .dropdown .menu > .item {
     background-color: var(--color-border);
+    border: 0px solid black !important;
   }
 
   /* hover font color */
@@ -1028,7 +1040,7 @@
   }
 
   .repository.view.issue .comment-list .timeline:before {
-    background-color: var(--color-secondary);
+    background-color: #373e47;
   }
 
   .repository.view.issue .comment-list .timeline-item .badge .svg {
@@ -1098,9 +1110,11 @@
 
   .following.bar #navbar {
     width: 100vw;
+    border-bottom: 1px solid #373e47;
     /* default 52px */
     min-height: 40px;
     padding: 0 0.5rem;
+    background: var(--color-navbar);
   }
 
   ::-webkit-scrollbar-thumb {
@@ -1169,7 +1183,7 @@
   .ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label:before,
   .ui.checkbox input:checked:focus ~ label:before,
   .ui.radio.checkbox input:focus:checked ~ label:before {
-    border-color: var(--color-secondary);
+    border-color: ;
   }
 
   .repo-icon {
@@ -1193,23 +1207,15 @@
   }
 
   .ui.tabular.menu .active.item {
-    margin-bottom: 2px;
+    margin-bottom: 1px;
   }
 
   /* repository icon for directories */
-  .repository.file.list
-    #repo-files-table
-    tbody
-    .svg.octicon-file-directory-fill,
+  .repository.file.list #repo-files-table tbody .svg.octicon-file-directory-fill,
   .repository.file.list #repo-files-table tbody .svg.octicon-file-submodule {
     color: #768390;
   }
 
-  .ui.menu .item > .label:not(.floating) {
-    padding: 0 6px;
-    line-height: 18px;
-  }
-
   .ui.secondary.pointing.menu .item > .circular.label {
     line-height: 10px;
   }
@@ -1218,9 +1224,10 @@
   .ui.ui.ui.grey.label {
     line-height: 10px;
   }
+
   .ui.primary.label,
   .ui.primary.labels .label {
-    background-color: #768390 !important;
+    background-color: #373e47 !important;
   }
 
   // timeline view icon color
@@ -1243,6 +1250,7 @@
 
   .ui.top.attached.header {
     border-width: inherit;
+    border: 1px solid #373e47;
   }
 
   .following.bar.light {
@@ -1295,5 +1303,94 @@
 
   .repo-buttons .ui.labeled.button > .label {
     border-width: inherit;
+    border: 1px solid #373e47 !important;
+  }
+
+  .repo-button-row .button {
+    height: unset;
+  }
+
+  .repository .repository-summary .segment.language-stats {
+    height: 14px;
+    border-radius: 6px;
+  }
+
+  .ui.table[class*="single line"],
+  .ui.table [class*="single line"] {
+    white-space: nowrap;
+    border: 1px solid #373e47;
+  }
+
+  .ui.tiny.input {
+    font-size: 0.85714286em;
+    border: 1px solid #373e47;
+    border-radius: 6px;
+  }
+
+  .ui.fluid.input {
+    border: 1px solid #373e47 !important;
+    border-radius: 6px;
+  }
+
+  .repository.view.issue .comment-list .comment > .content > div:last-child {
+    border: 0px solid #373e47 !important;
+  }
+  .ui.basic.secondary.buttons .button,
+  .ui.basic.secondary.button {
+    color: var(--color-text) !important;
+    border: 1px solid #373e47 !important;
+  }
+  .ui.small.buttons .dropdown,
+  .ui.small.buttons .dropdown .menu > .item,
+  .ui.small.buttons .button,
+  .ui.small.buttons .or,
+  .ui.ui.ui.ui.small.button {
+    border: 1px solid #373e47 !important;
+  }
+
+  .ui.table > tr > td,
+  .ui.table > tbody > tr > td {
+    border-top-color: #373e47;
+  }
+
+  .ui.basic.primary.button,
+  .ui.basic.primary.buttons .button {
+    color: #e9e8e8 !important;
+    font-weight: 500 !important;
+  }
+
+  .feeds .list ul li .repo-list-link {
+    background: #161b22;
+    border: 0.5px solid #373e47 !important;
+  }
+  .ui.attached:not(.message) + .ui.attached.segment:not(.top) {
+    border: 1px solid #373e47;
+  }
+  .ui.menu .active.item,
+  .ui.menu .active.item:hover,
+  .ui.vertical.menu .active.item,
+  .ui.vertical.menu .active.item:hover {
+    background: #161b22;
+    font-weight: 500;
+    color: #e9e8e8;
+  }
+  .ui.primary.labels .label,
+  .ui.ui.ui.primary.label {
+    color: #a6aab5;
+  }
+  .issue.list a:not(.label):hover {
+    color: var(--color-blue) !important;
+  }
+  .ui.segment,
+  .ui.segments,
+  .ui.attached.segment {
+    border: 1px solid #373e47 !important;
+  }
+  .repository.view.issue .comment-list .comment .comment-container {
+    border: 1px solid #373e47;
+    border-radius: 0px;
+  }
+  .repository.view.issue .comment-list .comment > .content > div:first-child {
+    border-bottom: 1px solid #373e47 !important;
   }
 }
diff --git a/theme-github-dark.css b/theme-github-dark.css
index bb97c13..2cae860 100755
--- a/theme-github-dark.css
+++ b/theme-github-dark.css
@@ -1,12 +1,12 @@
 :root {
   --color-primary: #347d39;
-  --color-secondary: #535865;
+  --color-secondary: #373e47;
   --border-radius: 6px;
-  --color-body: #373e47;
-  --color-navbar: #22272e;
-  --color-footer: #22272e;
+  --color-body: #0d1117;
+  --color-navbar: #161b22;
+  --color-footer: #161b22;
   --color-text-light: #a6aab5;
-  --color-text-light-2: #adbac7;
+  --color-text-light-2: #e9e8e8;
   --color-text: #bbc0ca;
   --color-box-body: #22272e;
   --color-markup-code-block: #636e7b66;
@@ -22,6 +22,11 @@
   --is-dark-theme: true;
   --color-blue: #539bf5;
   --color-input-background: #22272e;
+  --color-primary-contrast: #e9e8e8;
+  --color-text-light-2: #a6aab5;
+  --color-box-body: #161b22;
+  --color-box-header: #161b22;
+  --color-green-light: #16ab39
 
   /* code editor colors are set in https://github.com/go-gitea/gitea/blob/f5b300ea77081a1b78ac044cb1c0f9225538d091/web_src/js/features/codeeditor.js#L82-L97.  */
   /* monaco editor dark theme is toggled via variable `--is-dark-theme` */
@@ -117,7 +122,7 @@ a,
 .ui.basic.primary.buttons .button {
   background-color: #22272e !important;
   box-shadow: inset 0 0 0 1px rgba(34, 36, 38, 0.15) !important;
-  color: #dbdbdb !important;
+  color: !important;
 }
 
 .ui.basic.green.button:focus,
@@ -147,6 +152,7 @@ a,
   background-color: #22272e;
   border-radius: 6px;
   padding: 3px 10px 3px 10px;
+  border: 1px solid #373e47;
 }
 
 .ui.menu .item {
@@ -200,7 +206,8 @@ a,
 }
 
 .ui.menu.two.item .item {
-  border: 1px solid var(--color-secondary);
+  border: 1px solid #373e47;
+  background: #161b22;
 }
 
 a,
@@ -260,7 +267,7 @@ textarea,
 .ui.checkbox label:before,
 .ui.checkbox input:checked ~ label:before,
 .ui.checkbox input:not([type="radio"]):indeterminate ~ label:before {
-  border-color: var(--color-input-background);
+  border-color: #373e47 !important;
 }
 
 /* hover repository rows */
@@ -387,12 +394,13 @@ textarea,
 
 /* border color repo files */
 .repository.file.list #repo-files-table td {
-  border-bottom: 1px solid #373e47;
+  // border-bottom: 1px solid #373e47;
 }
 
 /* text color repo files */
 .repository.file.list #repo-files-table td {
-  color: #7f8699;
+  color: var(--color-text-light) !important;
+  background: #161b22;
 }
 
 .repository.file.list #repo-files-table td a {
@@ -408,7 +416,7 @@ textarea,
   .timeline-item.commits-list
   .singular-commit
   .sha.label.isSigned.isVerified {
-  border: 1px solid #21ba45 !important;
+  border: 1.5px solid #21ba45 !important;
   background: transparent;
   border-radius: 6px;
 }
@@ -417,6 +425,9 @@ textarea,
 .ui.tabular.menu .active.item,
 .ui.tabular.menu .active.item:hover {
   background: var(--color-navbar);
+  border-bottom: 3px solid #f78166 !important;
+  border: 0px solid black;
+  color: #e9e8e8;
 }
 
 /* repo watch and fork counters */
@@ -447,7 +458,7 @@ textarea,
 
 /* repo svg icons */
 .repository.view.issue .comment-list .timeline-item .badge .svg {
-  fill: var(--color-text-light) !important;
+  fill: #ffffff !important;
 }
 
 /* background emoji reactions */
@@ -515,6 +526,7 @@ a.blob-excerpt {
 .ui.form .field .dropdown,
 .ui.form .field .dropdown .menu > .item {
   background-color: var(--color-border);
+  border: 0px solid black !important;
 }
 
 /* hover font color */
@@ -613,7 +625,7 @@ a.blob-excerpt {
 }
 
 .repository.view.issue .comment-list .timeline:before {
-  background-color: var(--color-secondary);
+  background-color: #373e47;
 }
 
 .repository.view.issue .comment-list .timeline-item .badge .svg {
@@ -683,9 +695,11 @@ span.green .svg {
 
 .following.bar #navbar {
   width: 100vw;
+  border-bottom: 1px solid #373e47;
   /* default 52px */
   min-height: 40px;
   padding: 0 0.5rem;
+  background: var(--color-navbar);
 }
 
 ::-webkit-scrollbar-thumb {
@@ -754,7 +768,7 @@ textarea:focus,
 .ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label:before,
 .ui.checkbox input:checked:focus ~ label:before,
 .ui.radio.checkbox input:focus:checked ~ label:before {
-  border-color: var(--color-secondary);
+  border-color: ;
 }
 
 .repo-icon {
@@ -778,7 +792,7 @@ textarea:focus,
 }
 
 .ui.tabular.menu .active.item {
-  margin-bottom: 2px;
+  margin-bottom: 1px;
 }
 
 /* repository icon for directories */
@@ -798,7 +812,7 @@ textarea:focus,
 
 .ui.primary.label,
 .ui.primary.labels .label {
-  background-color: #768390 !important;
+  background-color: #373e47 !important;
 }
 
 // timeline view icon color
@@ -821,6 +835,7 @@ textarea:focus,
 
 .ui.top.attached.header {
   border-width: inherit;
+  border: 1px solid #373e47;
 }
 
 .following.bar.light {
@@ -873,4 +888,93 @@ footer {
 
 .repo-buttons .ui.labeled.button > .label {
   border-width: inherit;
+  border: 1px solid #373e47 !important;
+}
+
+.repo-button-row .button {
+  height: unset;
+}
+
+.repository .repository-summary .segment.language-stats {
+  height: 14px;
+  border-radius: 6px;
+}
+
+.ui.table[class*="single line"],
+.ui.table [class*="single line"] {
+  white-space: nowrap;
+  border: 1px solid #373e47;
+}
+
+.ui.tiny.input {
+  font-size: 0.85714286em;
+  border: 1px solid #373e47;
+  border-radius: 6px;
+}
+
+.ui.fluid.input {
+  border: 1px solid #373e47 !important;
+  border-radius: 6px;
+}
+
+.repository.view.issue .comment-list .comment > .content > div:last-child {
+  border: 0px solid #373e47 !important;
+}
+.ui.basic.secondary.buttons .button,
+.ui.basic.secondary.button {
+  color: var(--color-text) !important;
+  border: 1px solid #373e47 !important;
+}
+.ui.small.buttons .dropdown,
+.ui.small.buttons .dropdown .menu > .item,
+.ui.small.buttons .button,
+.ui.small.buttons .or,
+.ui.ui.ui.ui.small.button {
+  border: 1px solid #373e47 !important;
+}
+
+.ui.table > tr > td,
+.ui.table > tbody > tr > td {
+  border-top-color: #373e47;
+}
+
+.ui.basic.primary.button,
+.ui.basic.primary.buttons .button {
+  color: #e9e8e8 !important;
+  font-weight: 500 !important;
+}
+
+.feeds .list ul li .repo-list-link {
+  background: #161b22;
+  border: 0.5px solid #373e47 !important;
+}
+.ui.attached:not(.message) + .ui.attached.segment:not(.top) {
+  border: 1px solid #373e47;
+}
+.ui.menu .active.item,
+.ui.menu .active.item:hover,
+.ui.vertical.menu .active.item,
+.ui.vertical.menu .active.item:hover {
+  background: #161b22;
+  font-weight: 500;
+  color: #e9e8e8;
+}
+.ui.primary.labels .label,
+.ui.ui.ui.primary.label {
+  color: #a6aab5;
+}
+.issue.list a:not(.label):hover {
+  color: var(--color-blue) !important;
+}
+.ui.segment,
+.ui.segments,
+.ui.attached.segment {
+  border: 1px solid #373e47 !important;
+}
+.repository.view.issue .comment-list .comment .comment-container {
+  border: 1px solid #373e47;
+  border-radius: 0px;
+}
+.repository.view.issue .comment-list .comment > .content > div:first-child {
+  border-bottom: 1px solid #373e47 !important;
 }