diff --git a/bemani/frontend/app.py b/bemani/frontend/app.py
index 97c534a..24aed54 100644
--- a/bemani/frontend/app.py
+++ b/bemani/frontend/app.py
@@ -374,6 +374,7 @@ def navigation() -> Dict[str, Any]:
             return {
                 "components": components,
                 "any": jinja2_any,
+                "assets": f"themes/{config.theme}/",
                 "theme_url": jinja2_theme,
                 "cache_bust": f"v={FRONTEND_CACHE_BUST}",
             }
@@ -384,6 +385,7 @@ def navigation() -> Dict[str, Any]:
         return {
             "components": components,
             "any": jinja2_any,
+            "assets": f"themes/{config.theme}/",
             "theme_url": jinja2_theme,
             "cache_bust": f"v={FRONTEND_CACHE_BUST}",
         }
@@ -938,6 +940,7 @@ def navigation() -> Dict[str, Any]:
         "navigation": pages,
         "components": components,
         "any": jinja2_any,
+        "assets": f"themes/{config.theme}/",
         "theme_url": jinja2_theme,
         "cache_bust": f"v={FRONTEND_CACHE_BUST}",
     }
diff --git a/bemani/frontend/static/components/add.react.js b/bemani/frontend/static/components/add.react.js
index d69230c..48b87a7 100644
--- a/bemani/frontend/static/components/add.react.js
+++ b/bemani/frontend/static/components/add.react.js
@@ -5,6 +5,7 @@ var Add = createReactClass({
         return (
             <Button
                 className="add"
+                style={this.props.style}
                 disabled={this.props.disabled}
                 onClick={function(event) {
                     this.props.onClick(event);
diff --git a/bemani/frontend/static/components/delete.react.js b/bemani/frontend/static/components/delete.react.js
index c535765..da94f1f 100644
--- a/bemani/frontend/static/components/delete.react.js
+++ b/bemani/frontend/static/components/delete.react.js
@@ -5,6 +5,7 @@ var Delete = createReactClass({
         return (
             <Button
                 className="delete"
+                style={this.props.style}
                 disabled={this.props.disabled}
                 onClick={function(event) {
                     this.props.onClick(event);
diff --git a/bemani/frontend/static/components/edit.react.js b/bemani/frontend/static/components/edit.react.js
index 8ddc65e..1422cbc 100644
--- a/bemani/frontend/static/components/edit.react.js
+++ b/bemani/frontend/static/components/edit.react.js
@@ -5,6 +5,7 @@ var Edit = createReactClass({
         return (
             <Button
                 className="edit"
+                style={this.props.style}
                 disabled={this.props.disabled}
                 onClick={function(event) {
                     this.props.onClick(event);
diff --git a/bemani/frontend/static/components/gamesettings.react.js b/bemani/frontend/static/components/gamesettings.react.js
index 8226e55..69cf6d0 100644
--- a/bemani/frontend/static/components/gamesettings.react.js
+++ b/bemani/frontend/static/components/gamesettings.react.js
@@ -195,7 +195,7 @@ var GameSettings = createReactClass({
                         }.bind(this)}
                     />
                     { this.state.settings_saving[this.state.current_setting] ?
-                        <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                        <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                         null
                     }
                     { this.state.settings_saved[this.state.current_setting] ?
diff --git a/bemani/frontend/static/components/table.react.js b/bemani/frontend/static/components/table.react.js
index a53849b..d419966 100644
--- a/bemani/frontend/static/components/table.react.js
+++ b/bemani/frontend/static/components/table.react.js
@@ -139,7 +139,7 @@ var Table = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more data...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/admin/api.react.js b/bemani/frontend/static/controllers/admin/api.react.js
index ded3868..9415dff 100644
--- a/bemani/frontend/static/controllers/admin/api.react.js
+++ b/bemani/frontend/static/controllers/admin/api.react.js
@@ -369,7 +369,7 @@ var api_management = createReactClass({
         if (this.state.info[server.id].loading) {
             return (
                 <>
-                     <img className="loading" src={Link.get('static', 'loading-16.gif')} />
+                     <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} />
                      {' querying server for info...'}
                  </>
              );
diff --git a/bemani/frontend/static/controllers/admin/users.react.js b/bemani/frontend/static/controllers/admin/users.react.js
index 66d9442..7e799b5 100644
--- a/bemani/frontend/static/controllers/admin/users.react.js
+++ b/bemani/frontend/static/controllers/admin/users.react.js
@@ -90,7 +90,7 @@ var card_management = createReactClass({
                         />
                         <input type="submit" value="search" />
                         { this.state.searching ?
-                            <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                            <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                             null
                         }
                     </form>
diff --git a/bemani/frontend/static/controllers/arcade/arcade.react.js b/bemani/frontend/static/controllers/arcade/arcade.react.js
index 26a37ae..1a7d54b 100644
--- a/bemani/frontend/static/controllers/arcade/arcade.react.js
+++ b/bemani/frontend/static/controllers/arcade/arcade.react.js
@@ -542,7 +542,7 @@ var arcade_management = createReactClass({
                         <>
                             PASELI Enabled
                             { this.state.paseli_enabled_saving ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </>
@@ -561,7 +561,7 @@ var arcade_management = createReactClass({
                         <>
                             PASELI Infinite
                             { this.state.paseli_infinite_saving ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </>
@@ -580,7 +580,7 @@ var arcade_management = createReactClass({
                         <>
                             Mask Web Address
                             { this.state.mask_services_url_saving ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </>
diff --git a/bemani/frontend/static/controllers/ddr/rivals.react.js b/bemani/frontend/static/controllers/ddr/rivals.react.js
index 20d02ee..284f276 100644
--- a/bemani/frontend/static/controllers/ddr/rivals.react.js
+++ b/bemani/frontend/static/controllers/ddr/rivals.react.js
@@ -216,7 +216,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/ddr/scores.react.js b/bemani/frontend/static/controllers/ddr/scores.react.js
index d68390f..d36627c 100644
--- a/bemani/frontend/static/controllers/ddr/scores.react.js
+++ b/bemani/frontend/static/controllers/ddr/scores.react.js
@@ -151,7 +151,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/ddr/settings.react.js b/bemani/frontend/static/controllers/ddr/settings.react.js
index 2d0e3e5..8d21710 100644
--- a/bemani/frontend/static/controllers/ddr/settings.react.js
+++ b/bemani/frontend/static/controllers/ddr/settings.react.js
@@ -323,7 +323,7 @@ var settings_view = createReactClass({
                             <>
                                 Fast/Slow Display
                                 { this.state.saving_early_late ?
-                                    <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                    <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                     null
                                 }
                             </>
@@ -342,7 +342,7 @@ var settings_view = createReactClass({
                             <>
                                 Combo Position
                                 { this.state.saving_background_combo ?
-                                    <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                    <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                     null
                                 }
                             </>
@@ -395,7 +395,7 @@ var settings_view = createReactClass({
                                 }.bind(this)}
                             />
                             { this.state.options_saving[this.state.version] ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                             { this.state.options_saved[this.state.version] ?
diff --git a/bemani/frontend/static/controllers/iidx/player.react.js b/bemani/frontend/static/controllers/iidx/player.react.js
index 2bc295c..127424b 100644
--- a/bemani/frontend/static/controllers/iidx/player.react.js
+++ b/bemani/frontend/static/controllers/iidx/player.react.js
@@ -163,7 +163,7 @@ var profile_view = createReactClass({
                                 />
                             }
                             { this.state.updating_rivals ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> : null
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> : null
                             }
                         </div>
                     }
diff --git a/bemani/frontend/static/controllers/iidx/rivals.react.js b/bemani/frontend/static/controllers/iidx/rivals.react.js
index 171babb..077dd05 100644
--- a/bemani/frontend/static/controllers/iidx/rivals.react.js
+++ b/bemani/frontend/static/controllers/iidx/rivals.react.js
@@ -191,7 +191,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/iidx/scores.react.js b/bemani/frontend/static/controllers/iidx/scores.react.js
index 0cced34..827bf52 100644
--- a/bemani/frontend/static/controllers/iidx/scores.react.js
+++ b/bemani/frontend/static/controllers/iidx/scores.react.js
@@ -173,7 +173,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/iidx/settings.react.js b/bemani/frontend/static/controllers/iidx/settings.react.js
index 3970938..4c2a62b 100644
--- a/bemani/frontend/static/controllers/iidx/settings.react.js
+++ b/bemani/frontend/static/controllers/iidx/settings.react.js
@@ -452,7 +452,7 @@ var settings_view = createReactClass({
                             }.bind(this)}
                         />
                         { this.state.qpro_saving[this.state.version] ?
-                            <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                            <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                             null
                         }
                         { this.state.qpro_saved[this.state.version] ?
@@ -494,7 +494,7 @@ var settings_view = createReactClass({
                             }.bind(this)}
                         />
                         { this.state.theme_saving[this.state.version] ?
-                            <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                            <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                             null
                         }
                         { this.state.theme_saved[this.state.version] ?
@@ -534,7 +534,7 @@ var settings_view = createReactClass({
                             }.bind(this)}
                         />
                         { this.state.menu_saving[this.state.version] ?
-                            <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                            <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                             null
                         }
                         { this.state.menu_saved[this.state.version] ?
diff --git a/bemani/frontend/static/controllers/jubeat/rivals.react.js b/bemani/frontend/static/controllers/jubeat/rivals.react.js
index 33c4383..9cf3740 100644
--- a/bemani/frontend/static/controllers/jubeat/rivals.react.js
+++ b/bemani/frontend/static/controllers/jubeat/rivals.react.js
@@ -175,7 +175,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/jubeat/scores.react.js b/bemani/frontend/static/controllers/jubeat/scores.react.js
index 5145d80..befafe8 100644
--- a/bemani/frontend/static/controllers/jubeat/scores.react.js
+++ b/bemani/frontend/static/controllers/jubeat/scores.react.js
@@ -169,7 +169,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/jubeat/settings.react.js b/bemani/frontend/static/controllers/jubeat/settings.react.js
index fa2b659..3a5a099 100644
--- a/bemani/frontend/static/controllers/jubeat/settings.react.js
+++ b/bemani/frontend/static/controllers/jubeat/settings.react.js
@@ -246,7 +246,7 @@ var settings_view = createReactClass({
                     }.bind(this)}
                 />
                 { this.state.emblem_saving[this.state.version] ?
-                    <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                    <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                     null
                 }
                 { this.state.emblem_saved[this.state.version] ?
diff --git a/bemani/frontend/static/controllers/museca/scores.react.js b/bemani/frontend/static/controllers/museca/scores.react.js
index dce35c1..e5dcb2f 100644
--- a/bemani/frontend/static/controllers/museca/scores.react.js
+++ b/bemani/frontend/static/controllers/museca/scores.react.js
@@ -160,7 +160,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/popn/rivals.react.js b/bemani/frontend/static/controllers/popn/rivals.react.js
index ecacba0..943f62d 100644
--- a/bemani/frontend/static/controllers/popn/rivals.react.js
+++ b/bemani/frontend/static/controllers/popn/rivals.react.js
@@ -225,7 +225,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching_name ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
@@ -255,7 +255,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching_id ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/popn/scores.react.js b/bemani/frontend/static/controllers/popn/scores.react.js
index 0890ff3..30e3914 100644
--- a/bemani/frontend/static/controllers/popn/scores.react.js
+++ b/bemani/frontend/static/controllers/popn/scores.react.js
@@ -169,7 +169,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/reflec/rivals.react.js b/bemani/frontend/static/controllers/reflec/rivals.react.js
index 5f07d40..f9ca114 100644
--- a/bemani/frontend/static/controllers/reflec/rivals.react.js
+++ b/bemani/frontend/static/controllers/reflec/rivals.react.js
@@ -273,7 +273,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching_name ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
@@ -301,7 +301,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching_id ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/reflec/scores.react.js b/bemani/frontend/static/controllers/reflec/scores.react.js
index 1b64192..c0e2f36 100644
--- a/bemani/frontend/static/controllers/reflec/scores.react.js
+++ b/bemani/frontend/static/controllers/reflec/scores.react.js
@@ -164,7 +164,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/controllers/sdvx/rivals.react.js b/bemani/frontend/static/controllers/sdvx/rivals.react.js
index f48df9e..66b97e4 100644
--- a/bemani/frontend/static/controllers/sdvx/rivals.react.js
+++ b/bemani/frontend/static/controllers/sdvx/rivals.react.js
@@ -181,7 +181,7 @@ var rivals_view = createReactClass({
                             />
                             <input type="submit" value="search" />
                             { this.state.searching ?
-                                <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
+                                <img className="loading" src={Link.get('static', window.assets + 'loading-16.gif')} /> :
                                 null
                             }
                         </form>
diff --git a/bemani/frontend/static/controllers/sdvx/scores.react.js b/bemani/frontend/static/controllers/sdvx/scores.react.js
index 07441ec..d5d25b8 100644
--- a/bemani/frontend/static/controllers/sdvx/scores.react.js
+++ b/bemani/frontend/static/controllers/sdvx/scores.react.js
@@ -153,7 +153,7 @@ var network_scores = createReactClass({
                                         <span className="loading" style={ {float: 'right' } }>
                                             <img
                                                 className="loading"
-                                                src={Link.get('static', 'loading-16.gif')}
+                                                src={Link.get('static', window.assets + 'loading-16.gif')}
                                             /> loading more scores...
                                         </span> : null
                                 }
diff --git a/bemani/frontend/static/loading-16.gif b/bemani/frontend/static/loading-16.gif
deleted file mode 100644
index b7596ab..0000000
Binary files a/bemani/frontend/static/loading-16.gif and /dev/null differ
diff --git a/bemani/frontend/static/loading-20.gif b/bemani/frontend/static/loading-20.gif
deleted file mode 100644
index 54f7f12..0000000
Binary files a/bemani/frontend/static/loading-20.gif and /dev/null differ
diff --git a/bemani/frontend/static/themes/dark/form.css b/bemani/frontend/static/themes/dark/form.css
index 8203757..a8055e0 100644
--- a/bemani/frontend/static/themes/dark/form.css
+++ b/bemani/frontend/static/themes/dark/form.css
@@ -46,14 +46,14 @@ div.buttons {
 
 input[type="submit"] {
     border: 1px solid #19480a;
-	color: #242526;
+    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 #6a6a6a;
-	color: #b0b1b2;
+    color: #b0b1b2;
     background: #282828;
     margin-right: 5px;
 }
@@ -71,17 +71,17 @@ input[type="text"], input[type="password"], textarea {
     border: 1px solid #6a6a6a;
     padding: 4px;
     border-radius: 0px;
-	background-color: #b3b4b5;
+    background-color: #1f1f1f;
 }
 
 select {
     border: 1px solid #6a6a6a;
     padding: 4px 4px 3px 4px;
     border-radius: 0px;
-	background: #b3b4b5;
+    background: #1f1f1f;
 }
 input {
-	#b3b4b5
+    #1f1f1f
 }
 
 input[type="button"] {
@@ -95,9 +95,9 @@ 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;
+    border: 1px solid #6a6a6a;
     background-color: #282828;
-	color: #b3b3b3;
+    color: #cecece;
 }
 
 button.nav {
@@ -125,8 +125,8 @@ button.active {
 }
 
 button {
-	color: #b3b3b3;
-	background-color: #282828;
+    color: #cecece;
+    background-color: #282828;
 }
 
 button.delete {
diff --git a/bemani/frontend/static/themes/dark/loading-16.gif b/bemani/frontend/static/themes/dark/loading-16.gif
new file mode 100755
index 0000000..2b55eb2
Binary files /dev/null and b/bemani/frontend/static/themes/dark/loading-16.gif differ
diff --git a/bemani/frontend/static/themes/dark/loading-24.gif b/bemani/frontend/static/themes/dark/loading-24.gif
new file mode 100755
index 0000000..972f4f9
Binary files /dev/null and b/bemani/frontend/static/themes/dark/loading-24.gif differ
diff --git a/bemani/frontend/static/themes/dark/site.css b/bemani/frontend/static/themes/dark/site.css
index cb31d61..4e1f662 100644
--- a/bemani/frontend/static/themes/dark/site.css
+++ b/bemani/frontend/static/themes/dark/site.css
@@ -1,6 +1,6 @@
 body {
     font-family: Helvetica;
-    color: #b3b3b3;
+    color: #cecece;
     margin: 0px;
     padding-bottom: 30px;
     background-color: #121212;
@@ -29,11 +29,11 @@ div.container {
 div.loading {
     margin-left: 50%;
     margin-right: 50%;
-    height: 20px;
+    height: 24px;
 }
 
 div.navigation {
-    background-color: #b3b4b5;
+    background-color: #1f1f1f;
     padding-left: 10px;
     padding-right: 10px;
 }
@@ -124,7 +124,7 @@ ul.navigation {
     padding-left: 10px;
     padding-right: 10px;
     margin: 0px;
-    background-color: #b3b4b5;
+    background-color: #1f1f1f;
     position: relative;
     text-align: right;
     -webkit-touch-callout: none;
@@ -144,7 +144,7 @@ ul.navigation li {
 ul.navigation_sub {
     display: none;
     position: absolute;
-    background-color: #e4e4e4;
+    background-color: #2d2d2d;
     padding: 10px;
     margin: 0;
     padding: 0;
@@ -186,15 +186,15 @@ ul.navigation li a {
     display: block;
     text-decoration: none;
     padding: 10px;
-    color: #121212;
+    color: #b5b5b5;
 }
 
 ul.navigation li a:hover {
-    background-color: #d2d2d2;
+    background-color: #343434;
 }
 
 ul.navigation li a:active {
-    background-color: #d2d2d2;
+    background-color: #343434;
 }
 
 ul.navigation > li > a.current {
diff --git a/bemani/frontend/static/themes/dark/table.css b/bemani/frontend/static/themes/dark/table.css
index 8d7850a..8b7cd7b 100644
--- a/bemani/frontend/static/themes/dark/table.css
+++ b/bemani/frontend/static/themes/dark/table.css
@@ -20,7 +20,7 @@ table.list th {
 }
 
 table.list th.action {
-    background-color: #b3b4b5;
+    background-color: #1f1f1f;
     border: none;
 }
 
@@ -63,7 +63,7 @@ table.list tbody tr:nth-child(even) td {
 }
 
 table td.subheader {
-    background-color: #b3b4b5 ! important;
+    background-color: #1f1f1f ! important;
     font-weight: bold;
 }
 
@@ -102,7 +102,7 @@ table.records a, table.attempts a, table.topscores a, table.players a, table.jub
 }
 
 td.edit {
-    background-color: #b3b4b5 ! important;
+    background-color: #1f1f1f ! important;
     border: none ! important;
 }
 
diff --git a/bemani/frontend/static/themes/default/loading-16.gif b/bemani/frontend/static/themes/default/loading-16.gif
new file mode 100755
index 0000000..fad94ed
Binary files /dev/null and b/bemani/frontend/static/themes/default/loading-16.gif differ
diff --git a/bemani/frontend/static/themes/default/loading-24.gif b/bemani/frontend/static/themes/default/loading-24.gif
new file mode 100755
index 0000000..2880ff5
Binary files /dev/null and b/bemani/frontend/static/themes/default/loading-24.gif differ
diff --git a/bemani/frontend/static/themes/default/site.css b/bemani/frontend/static/themes/default/site.css
index 44dc320..3f7c521 100644
--- a/bemani/frontend/static/themes/default/site.css
+++ b/bemani/frontend/static/themes/default/site.css
@@ -23,7 +23,7 @@ div.container {
 div.loading {
     margin-left: 50%;
     margin-right: 50%;
-    height: 20px;
+    height: 24px;
 }
 
 div.navigation {
diff --git a/bemani/frontend/templates/base.html b/bemani/frontend/templates/base.html
index a31a83f..78bcf3d 100644
--- a/bemani/frontend/templates/base.html
+++ b/bemani/frontend/templates/base.html
@@ -150,6 +150,7 @@
                     window.{{name}} = {{ val|tojson|safe }};
                 {% endfor %}
             {% endif %}
+            window.assets = {{ assets|tojson|safe }};
         </script>
         <script type="text/javascript">
             $(function () {
diff --git a/bemani/frontend/templates/react.html b/bemani/frontend/templates/react.html
index 03b66d7..e3b6ed8 100644
--- a/bemani/frontend/templates/react.html
+++ b/bemani/frontend/templates/react.html
@@ -5,7 +5,7 @@
 {% block content %}
     <div id="content">
         <div class="loading">
-            <img src="{{ url_for('static', filename='loading-20.gif') }}" />
+            <img src="{{ url_for('static', filename=assets + 'loading-24.gif') }}" />
         </div>
     </div>
 {% endblock %}