diff --git a/bemani/frontend/static/themes/dark/form.css b/bemani/frontend/static/themes/dark/form.css
index 3d9094a..c4edddf 100644
--- a/bemani/frontend/static/themes/dark/form.css
+++ b/bemani/frontend/static/themes/dark/form.css
@@ -41,15 +41,17 @@ div.buttons {
 }
 
 input[type="submit"] {
-    border: 1px solid #cddcc1;
+    border: 1px solid #19480a;
+	color: #242526;
     background: #49B979;
     margin-right: 5px;
 }
 
 input[type="button"], button.nav, button.toggle, button.edit, button.add, button.viewmore, button.btn-default {
-    border: 1px solid #dadada;
+    border: 1px solid #6a6a6a;
 	color: #b0b1b2;
     background: #282828;
+	
     margin-right: 5px;
 }
 
@@ -63,17 +65,20 @@ input[type="submit"], input[type="button"], button {
 }
 
 input[type="text"], input[type="password"], textarea {
-    border: 1px solid #dadada;
+    border: 1px solid #6a6a6a;
     padding: 4px;
     border-radius: 0px;
 	background-color: #b3b4b5;
 }
 
 select {
-    border: 1px solid #dadada;
+    border: 1px solid #6a6a6a;
     padding: 4px 4px 3px 4px;
     border-radius: 0px;
-	background: #dadada;
+	background: #b3b4b5;
+}
+input {
+	#b3b4b5
 }
 
 input[type="button"] {
@@ -87,6 +92,7 @@ button.toggle:not(:last-child):not(:only-child), button.edit:not(:last-child):no
 span + button.edit, span + button.toggle, span + button.delete, span + button.add,
 div + button.edit, div + button.toggle, div + button.delete, div + button.add {
     margin-left: 15px;
+	border: 1px solid #6a6a6a;
     background-color: #282828;
 	color: #b3b3b3;
 }
@@ -94,7 +100,7 @@ div + button.edit, div + button.toggle, div + button.delete, div + button.add {
 button.nav {
     margin-bottom: 5px;
     margin-right: 0px;
-    border: 1px solid #dadada;
+    border: 1px solid #6a6a6a;
     background-color: #282828;
 }
 
@@ -121,7 +127,7 @@ button {
 }
 
 button.delete {
-    border: 1px solid #d6caca;
+    border: 1px solid #5d5d5d;
     background: #B94949;
 }
 
diff --git a/bemani/frontend/static/themes/dark/site.css b/bemani/frontend/static/themes/dark/site.css
index 92a16b8..cd8d1cb 100644
--- a/bemani/frontend/static/themes/dark/site.css
+++ b/bemani/frontend/static/themes/dark/site.css
@@ -9,6 +9,7 @@ body {
 a {
 	color: #878889;
 }
+
 div.messages {
     padding-top: 0px;
     padding-bottom: 0px;
@@ -32,7 +33,7 @@ div.loading {
 }
 
 div.navigation {
-    background-color: whitesmoke;
+    background-color: #b3b4b5;
     padding-left: 10px;
     padding-right: 10px;
 }
@@ -115,7 +116,7 @@ ul.navigation {
     padding-left: 10px;
     padding-right: 10px;
     margin: 0px;
-    background-color: whitesmoke;
+    background-color: #b3b4b5;
     position: relative;
     text-align: right;
     -webkit-touch-callout: none;
@@ -176,7 +177,7 @@ ul.navigation li a {
     display: block;
     text-decoration: none;
     padding: 10px;
-    color: #676767;
+    color: #121212;
 }
 
 ul.navigation li a:hover {
diff --git a/bemani/frontend/static/themes/dark/table.css b/bemani/frontend/static/themes/dark/table.css
index a3971bb..0763c93 100644
--- a/bemani/frontend/static/themes/dark/table.css
+++ b/bemani/frontend/static/themes/dark/table.css
@@ -16,11 +16,11 @@ table.list th {
     font-weight: bold;
     padding: 10px;
     text-align: left;
-    border: 1px solid #e0e0e0;
+    border: 1px solid #6a6a6a;
 }
 
 table.list th.action {
-    background-color: #808080;
+    background-color: #b3b4b5;
     border: none;
 }
 
@@ -30,7 +30,7 @@ table.list tbody td, table.add tbody td {
 }
 
 table.list tbody td {
-    border: 1px solid #e0e0e0;
+    border: 1px solid #6a6a6a;
     padding: 10px;
 }
 
@@ -56,7 +56,7 @@ table.list tbody tr:nth-child(even) td {
 }
 
 table td.subheader {
-    background-color: #e7e7e7 ! important;
+    background-color: #b3b4b5 ! important;
     font-weight: bold;
 }
 
@@ -73,7 +73,7 @@ table.records a, table.attempts a, table.topscores a, table.players a {
 }
 
 td.edit {
-    background-color: #808080 ! important;
+    background-color: #b3b4b5 ! important;
     border: none ! important;
 }
 
@@ -87,6 +87,10 @@ table.list input[type="checkbox"], table.add input[type="checkbox"] {
     margin: 0px;
 }
 
+td.subheader {
+    color: 121212;
+}
+
 table.events div.circle {
     width: 16px;
     height: 16px;