diff --git a/panels/job_status.py b/panels/job_status.py
index 6bbda773..74331ef1 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -45,7 +45,6 @@ class JobStatusPanel(ScreenPanel):
         self.labels['file'].set_halign(Gtk.Align.START)
         self.labels['file'].set_vexpand(False)
         self.labels['file'].get_style_context().add_class("printing-filename")
-        self.labels['file'].set_max_width_chars(26)
         self.labels['file'].set_ellipsize(True)
         self.labels['file'].set_ellipsize(Pango.EllipsizeMode.END)
         self.labels['status'] = Gtk.Label()
@@ -56,7 +55,6 @@ class JobStatusPanel(ScreenPanel):
         self.labels['lcdmessage'].set_halign(Gtk.Align.START)
         self.labels['lcdmessage'].set_vexpand(False)
         self.labels['lcdmessage'].get_style_context().add_class("printing-status")
-        self.labels['lcdmessage'].set_max_width_chars(43)
         self.labels['lcdmessage'].set_ellipsize(True)
         self.labels['lcdmessage'].set_ellipsize(Pango.EllipsizeMode.END)
 
diff --git a/panels/move.py b/panels/move.py
index ca2fc316..ac7f1399 100644
--- a/panels/move.py
+++ b/panels/move.py
@@ -19,6 +19,7 @@ class MovePanel(ScreenPanel):
         _ = self.lang.gettext
 
         grid = Gtk.Grid()
+        grid.set_column_homogeneous(True)
 
         self.labels['x+'] = self._gtk.ButtonImage("arrow-right", _("X+"), "color1")
         self.labels['x+'].connect("clicked", self.move, "X", "+")
@@ -35,7 +36,7 @@ class MovePanel(ScreenPanel):
         self.labels['z-'] = self._gtk.ButtonImage("z-closer", _("Z-"), "color3")
         self.labels['z-'].connect("clicked", self.move, "Z", "-")
 
-        self.labels['home'] = self._gtk.ButtonImage("home", _("Home All"))
+        self.labels['home'] = self._gtk.ButtonImage("home", _("Home All"), "color4")
         self.labels['home'].connect("clicked", self.home)
 
         if self._screen.lang_ltr:
diff --git a/panels/splash_screen.py b/panels/splash_screen.py
index 8fe8ad55..0f298c55 100644
--- a/panels/splash_screen.py
+++ b/panels/splash_screen.py
@@ -34,9 +34,8 @@ class SplashScreenPanel(ScreenPanel):
         self.labels['actions'] = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         self.labels['actions'].set_hexpand(True)
         self.labels['actions'].set_vexpand(False)
-        self.labels['actions'].set_halign(Gtk.Align.END)
-        self.labels['actions'].set_margin_end(20)
-
+        self.labels['actions'].set_halign(Gtk.Align.CENTER)
+        self.labels['actions'].set_homogeneous(True)
 
         main = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0)
         main.pack_start(image, True, True, 0)
@@ -57,8 +56,6 @@ class SplashScreenPanel(ScreenPanel):
         _ = self.lang.gettext
 
         if "firmware_restart" not in self.labels:
-            self.labels['printer_select'] = self._gtk.ButtonImage("shuffle", _("Change Printer"))
-            self.labels['printer_select'].connect("clicked", self._screen.show_printer_select)
             self.labels['menu'] = self._gtk.ButtonImage("settings", _("Menu"), "color4")
             self.labels['menu'].connect("clicked", self._screen._go_to_submenu, "")
             self.labels['power'] = self._gtk.ButtonImage("shutdown", _("Power On Printer"), "color3")
@@ -80,8 +77,6 @@ class SplashScreenPanel(ScreenPanel):
         self.labels['actions'].add(self.labels['restart'])
         self.labels['actions'].add(self.labels['firmware_restart'])
         self.labels['actions'].add(self.labels['menu'])
-        if len(self._config.get_printers()) > 1:
-            self.labels['actions'].add(self.labels['printer_select'])
         self.labels['actions'].show_all()
 
     def firmware_restart(self, widget):
diff --git a/panels/system.py b/panels/system.py
index 6bf9a60d..ecce2083 100644
--- a/panels/system.py
+++ b/panels/system.py
@@ -93,6 +93,7 @@ class SystemPanel(ScreenPanel):
 
 
                 infogrid.attach(self.labels[prog], 1, i, 1, 1)
+                self.labels[prog].get_style_context().add_class('updater-item')
                 i = i + 1
 
         scroll.add(infogrid)
diff --git a/panels/zcalibrate.py b/panels/zcalibrate.py
index 294c3224..9980bb98 100644
--- a/panels/zcalibrate.py
+++ b/panels/zcalibrate.py
@@ -33,9 +33,9 @@ class ZCalibratePanel(ScreenPanel):
         box.add(label)
         box.add(self.labels['zposition'])
 
-        zpos = self._gtk.ButtonImage('z-farther', _("Raise Nozzle"))
+        zpos = self._gtk.ButtonImage('z-farther', _("Raise Nozzle"), 'color3')
         zpos.connect("clicked", self.move, "+")
-        zneg = self._gtk.ButtonImage('z-closer', _("Lower Nozzle"))
+        zneg = self._gtk.ButtonImage('z-closer', _("Lower Nozzle"), 'color2')
         zneg.connect("clicked", self.move, "-")
 
         distgrid = Gtk.Grid()
@@ -66,7 +66,7 @@ class ZCalibratePanel(ScreenPanel):
         complete = self._gtk.ButtonImage('complete', _('Accept'), 'color4')
         complete.connect("clicked", self.accept)
 
-        b = self._gtk.ButtonImage('cancel', _('Abort'), 'color2')
+        b = self._gtk.ButtonImage('cancel', _('Abort'), 'color1')
         b.connect("clicked", self.abort)
 
 
diff --git a/styles/base.css b/styles/base.css
index 4211100f..fa756b9a 100644
--- a/styles/base.css
+++ b/styles/base.css
@@ -79,6 +79,10 @@ combobox arrow {
     min-width: 1em;
 }
 
+switch slider {
+    border: 0;
+}
+
 entry {
     font-size: 1em;
     background-color: #20292F;
@@ -180,6 +184,14 @@ trough {
     margin-top: 1em;
 }
 
+.dialog button:nth-child(1) {
+    border-bottom-color: green;
+}
+
+.dialog button:nth-child(2) {
+    border-bottom-color: red;
+}
+
 .distbutton_active {
     background-color: #20303D;
 }
@@ -218,6 +230,11 @@ trough {
     padding: .2em .3em;
 }
 
+.updater-item {
+    min-height: 3em;
+    padding: .2em;
+}
+
 .message_popup {
     background-color: #367554;
     border-bottom: .1em solid white;
diff --git a/styles/colorized/style.css b/styles/colorized/style.css
index c32e9d3c..22898559 100644
--- a/styles/colorized/style.css
+++ b/styles/colorized/style.css
@@ -48,6 +48,7 @@ button.color4 {
 
 button.color1:active, button.color2:active, button.color3:active, button.color4:active, button.update:active, button.invalid:active, .dialog button:active {
     border-style: none;
+    margin-top: .5em;
 }
 
 button.active {
@@ -85,9 +86,6 @@ switch:checked {
     background-color: #859900; /*solarized-green*/
 }
 
-switch slider {
-    border: 0;
-}
 entry {
     background-color: #073642; /*base02*/
     border-color: #002b36; /*base03*/
diff --git a/styles/z-bolt/style.css b/styles/z-bolt/style.css
index 78179092..71f8df23 100644
--- a/styles/z-bolt/style.css
+++ b/styles/z-bolt/style.css
@@ -52,6 +52,15 @@ combobox box button {
     border-color: #cccccc;
 }
 
+switch {
+    background-color: #20292F;
+    border: 0;
+}
+
+switch:checked {
+    background-color: #3584e4;
+}
+
 entry {
     background-color: #20292F;
     border-color: #13181C;
@@ -116,6 +125,14 @@ textview .time {
     border-bottom-color: #009384;
 }
 
+.dialog button:nth-child(1) {
+    border-bottom-color: #A7E100;
+}
+
+.dialog button:nth-child(2) {
+    border-bottom-color: #cc1e1e;
+}
+
 .distbutton_active {
     background-color: #20303D;
 }