diff --git a/js/views/app_view.js b/js/views/app_view.js
index 7ef047d690d6..bf587136f51c 100644
--- a/js/views/app_view.js
+++ b/js/views/app_view.js
@@ -7,11 +7,20 @@
         initialize: function(options) {
           this.inboxView = null;
           this.installView = null;
+          this.applyTheme();
         },
         events: {
             'click .openInstaller': 'openInstaller',
             'click .openStandalone': 'openStandalone',
             'openInbox': 'openInbox',
+            'change-theme': 'applyTheme'
+        },
+        applyTheme: function() {
+            var theme = storage.get('theme-setting') || 'android';
+            this.$el.removeClass('ios')
+                    .removeClass('android-dark')
+                    .removeClass('android')
+                    .addClass(theme);
         },
         openView: function(view) {
           this.el.innerHTML = "";
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 0518f5643261..e9287f575228 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -78,19 +78,11 @@
     Whisper.InboxView = Whisper.View.extend({
         templateName: 'two-column',
         className: 'inbox index',
-        applyTheme: function() {
-            var theme = storage.get('theme-setting') || 'android';
-            this.$el.removeClass('ios')
-                    .removeClass('android-dark')
-                    .removeClass('android')
-                    .addClass(theme);
-        },
         initialize: function (options) {
             options = options || {};
 
             this.ready = false;
             this.render();
-            this.applyTheme();
             this.$el.attr('tabindex', '1');
             new Whisper.FontSizeView({ el: this.$el });
             this.conversation_stack = new Whisper.ConversationStack({
@@ -223,7 +215,6 @@
         showSettings: function() {
             var view = new Whisper.SettingsView();
             view.$el.appendTo(this.el);
-            view.$el.on('change-theme', this.applyTheme.bind(this));
         },
         filterContacts: function(e) {
             this.searchView.filterContacts(e);
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 2ffafda5be19..b21b097733e6 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -13,6 +13,7 @@ body {
   margin: 0;
   font-family: $roboto;
   font-size: 14px;
+  color: $grey_d;
 }
 
 .clearfix:before,
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index 817a1717b4b0..a53d67d56e51 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -180,7 +180,6 @@ input.search {
 }
 
 .index {
-  color: $grey_d;
 
   .gutter .new-group-update-form {
     display: none;
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 0f7e6683545e..d850a44d89b4 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -29,7 +29,8 @@ body {
   width: 100%;
   margin: 0;
   font-family: Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif;
-  font-size: 14px; }
+  font-size: 14px;
+  color: #454545; }
 
 .clearfix:before,
 .clearfix:after {
@@ -1008,20 +1009,20 @@ input.search {
   .new-contact.valid {
     opacity: 1.0; }
 
-.index {
-  color: #454545; }
-  .index .gutter .new-group-update-form {
-    display: none;
-    padding: 0.5em; }
-  .index .last-message {
-    margin: 6px 0 0;
-    font-size: 0.9285714286em;
-    font-weight: 300; }
-  .index .gutter .timestamp {
-    position: absolute;
-    top: 14px;
-    right: 12px;
-    color: #616161; }
+.index .gutter .new-group-update-form {
+  display: none;
+  padding: 0.5em; }
+
+.index .last-message {
+  margin: 6px 0 0;
+  font-size: 0.9285714286em;
+  font-weight: 300; }
+
+.index .gutter .timestamp {
+  position: absolute;
+  top: 14px;
+  right: 12px;
+  color: #616161; }
 
 .conversations .unread .contact-details .name,
 .conversations .unread .contact-details .last-message,