diff --git a/themes/gtk-3.0-base/common/switch.scss b/themes/gtk-3.0-base/common/switch.scss
index 3409885..a5861b7 100644
--- a/themes/gtk-3.0-base/common/switch.scss
+++ b/themes/gtk-3.0-base/common/switch.scss
@@ -11,24 +11,15 @@ switch
 {
     @include __wintc_apply_props($switch_styles);
 
-    //background:    linear-gradient(140deg, rgba(180,180,171,1) 0%, rgba(238,236,221,1) 100%);
-    //border:        1px solid #1C5180;
-    //border-radius: 14px;
-
     &:checked
     {
         @include __wintc_apply_props($switch_selected_styles);
-
-        //background: linear-gradient(140deg, rgba(93,234,89,1) 0%, rgba(21,147,18,1) 100%);
     }
 
     &:disabled
     {
         @include __wintc_apply_props($switch_inactive_styles);
 
-        //background:   transparent;
-        //border-color: #C0BFB5;
-
         &:checked
         {
             @include __wintc_apply_props($switch_inactive_selected_styles);
@@ -39,26 +30,17 @@ switch
     {
         @include __wintc_apply_props($switch_slider_styles);
 
-        //background:     linear-gradient(140deg, rgba(229,229,226,1) 0%, rgba(251,251,251,1) 100%);
-        //border:         1px solid #1C5180;
-        //border-radius:  50%;
-        //margin:        -1px;
-        //min-height:     15px;
-        //min-width:      15px;
+        min-height: 15px;
+        min-width:  15px;
 
         &:hover
         {
             @include __wintc_apply_props($switch_slider_hover_styles);
-
-            //background: linear-gradient(139deg, rgba(255,240,207,1) 0%, rgba(250,197,90,1) 100%);
         }
 
         &:disabled
         {
             @include __wintc_apply_props($switch_slider_inactive_styles);
-
-            //background:   transparent;
-            //border-color: #C0BFB5;
         }
     }
 
diff --git a/themes/gtk-3.0-base/init/switch.scss b/themes/gtk-3.0-base/init/switch.scss
index 1f4190b..92f79ba 100644
--- a/themes/gtk-3.0-base/init/switch.scss
+++ b/themes/gtk-3.0-base/init/switch.scss
@@ -1,5 +1,5 @@
 /**
- * treeview.scss - WinTC Switch Theme Part Definitions
+ * switch.scss - WinTC Switch Theme Part Definitions
  *
  * This source-code is part of Windows XP stuff for XFCE:
  * <<https://www.oddmatics.uk>>
diff --git a/themes/luna/blue/gtk-3.0/styling/_all.scss b/themes/luna/blue/gtk-3.0/styling/_all.scss
index fb245d1..374b666 100644
--- a/themes/luna/blue/gtk-3.0/styling/_all.scss
+++ b/themes/luna/blue/gtk-3.0/styling/_all.scss
@@ -19,6 +19,7 @@
 @import "notebook";
 @import "csd";
 @import "treeview";
+@import "switch";
 
 @import "start-menu";
 @import "systray";
diff --git a/themes/luna/blue/gtk-3.0/styling/switch.scss b/themes/luna/blue/gtk-3.0/styling/switch.scss
new file mode 100644
index 0000000..1847b58
--- /dev/null
+++ b/themes/luna/blue/gtk-3.0/styling/switch.scss
@@ -0,0 +1,151 @@
+/**
+ * switch.scss - Luna (Blue) Style Switch Style Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+//
+// SWITCH ITSELF
+//
+$switch_styles:
+    wintc_define_props_bg(
+        $switch_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        linear-gradient(140deg, rgba(180,180,171,1) 0%, rgba(238,236,221,1) 100%)
+    );
+$switch_styles:
+    wintc_define_props_border_radius(
+        $switch_styles,
+        false,
+        15
+    );
+$switch_styles:
+    wintc_define_props_borders(
+        $switch_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        #1C5180,
+        undefined
+    );
+
+$switch_selected_styles:
+    wintc_define_props_bg(
+        $switch_selected_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        linear-gradient(140deg, rgba(93,234,89,1) 0%, rgba(21,147,18,1) 100%)
+    );
+
+$switch_inactive_styles:
+    wintc_define_props_bg(
+        $switch_inactive_styles,
+        false,
+        transparent,
+        undefined,
+        undefined,
+        undefined,
+        none
+    );
+$switch_inactive_styles:
+    wintc_define_props_borders(
+        $switch_inactive_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        #C0BFB5,
+        undefined
+    );
+
+
+//
+// SWITCH SLIDER
+//
+$switch_slider_styles:
+    wintc_define_props_bg(
+        $switch_slider_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        linear-gradient(140deg, rgba(229,229,226,1) 0%, rgba(251,251,251,1) 100%)
+    );
+$switch_slider_styles:
+    wintc_define_props_border_radius(
+        $switch_slider_styles,
+        false,
+        15
+    );
+$switch_slider_styles:
+    wintc_define_props_borders(
+        $switch_slider_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        1,
+        #1C5180,
+        undefined
+    );
+$switch_slider_styles:
+    wintc_define_props_box(
+        $switch_slider_styles,
+        false,
+        margin,
+        -1,
+        -1,
+        -1,
+        -1
+    );
+
+$switch_slider_hover_styles:
+    wintc_define_props_bg(
+        $switch_slider_hover_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        linear-gradient(139deg, rgba(255,240,207,1) 0%, rgba(250,197,90,1) 100%)
+    );
+
+$switch_slider_inactive_styles:
+    wintc_define_props_bg(
+        $switch_slider_inactive_styles,
+        false,
+        transparent,
+        undefined,
+        undefined,
+        undefined,
+        none
+    );
+$switch_slider_inactive_styles:
+    wintc_define_props_borders(
+        $switch_slider_inactive_styles,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        #C0BFB5,
+        undefined
+    );