diff --git a/shell/desktop/src/res/appstyles_p.css b/shell/desktop/src/res/appstyles_p.css
index 474de42..146d5ca 100644
--- a/shell/desktop/src/res/appstyles_p.css
+++ b/shell/desktop/src/res/appstyles_p.css
@@ -5,7 +5,7 @@
 /**
  * Default styles for the icon view
  */
-iconview
+iconview:not(:selected)
 {
     background: transparent;
 }
diff --git a/shell/desktop/src/window.c b/shell/desktop/src/window.c
index 0d67bc4..9e169e8 100644
--- a/shell/desktop/src/window.c
+++ b/shell/desktop/src/window.c
@@ -162,6 +162,11 @@ static void wintc_desktop_window_init(
         G_CALLBACK(on_window_map_event),
         NULL
     );
+
+    wintc_widget_add_style_class(
+        GTK_WIDGET(self),
+        "wintc-desktop"
+    );
 }
 
 //
@@ -292,8 +297,21 @@ static gboolean wintc_desktop_window_draw(
 
     // FIXME: Just drawing default desktop background colour atm
     //
-    cairo_set_source_rgb(cr, 0.0f, 0.298f, 0.596f);
-    cairo_paint(cr);
+    //cairo_set_source_rgb(cr, 0.0f, 0.298f, 0.596f);
+    //cairo_paint(cr);
+
+    // FIXME: Just drawing the style background colour atm
+    //
+    GtkStyleContext* ctx = gtk_widget_get_style_context(widget);
+
+    gtk_render_background(
+        ctx,
+        cr,
+        0.0f,
+        0.0f,
+        (gdouble) wnd_w,
+        (gdouble) wnd_h
+    );
 
     // FIXME: Billy basic drawing of the wallpaper, if present
     //
diff --git a/shell/explorer/src/window.c b/shell/explorer/src/window.c
index dd6cbc5..2005a01 100644
--- a/shell/explorer/src/window.c
+++ b/shell/explorer/src/window.c
@@ -534,13 +534,20 @@ static void wintc_explorer_window_set_property(
 
         case PROP_INITIAL_PATH:
         {
+            const gchar* uri = g_value_get_string(value);
+
+            if (!uri)
+            {
+                break;
+            }
+
             // FIXME: We don't handle extended paths yet!
             //
             WinTCShextPathInfo path_info;
 
             wintc_shext_path_info_demangle_uri(
                 &path_info,
-                g_value_get_string(value)
+                uri
             );
 
             wnd->initial_path = path_info.base_path;
diff --git a/themes/build-common/gtk-3.0-base/common/basic.scss b/themes/build-common/gtk-3.0-base/common/basic.scss
index 040ae82..21e726d 100644
--- a/themes/build-common/gtk-3.0-base/common/basic.scss
+++ b/themes/build-common/gtk-3.0-base/common/basic.scss
@@ -68,8 +68,6 @@
         &:focus, &
         {
             @extend %selected_items;
-
-            border-radius: 3px;
         }
     }
 }
diff --git a/themes/build-common/gtk-3.0-base/init/_all.scss b/themes/build-common/gtk-3.0-base/init/_all.scss
index 81ac39a..2ac00a7 100644
--- a/themes/build-common/gtk-3.0-base/init/_all.scss
+++ b/themes/build-common/gtk-3.0-base/init/_all.scss
@@ -10,6 +10,7 @@
 @import "scheme";
 @import "button";
 @import "entry";
+@import "desktop";
 @import "start-menu";
 @import "systray";
 @import "taskband";
diff --git a/themes/build-common/gtk-3.0-base/init/desktop.scss b/themes/build-common/gtk-3.0-base/init/desktop.scss
new file mode 100644
index 0000000..6c3e6dd
--- /dev/null
+++ b/themes/build-common/gtk-3.0-base/init/desktop.scss
@@ -0,0 +1,11 @@
+/**
+ * desktop.scss - WinTC Desktop Theme Part Definitions
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$desktop_styles:          ();
+$desktop_selected_styles: ();
diff --git a/themes/build-common/gtk-3.0-base/override/_all.scss b/themes/build-common/gtk-3.0-base/override/_all.scss
index 5ad0ac2..4b10a8d 100644
--- a/themes/build-common/gtk-3.0-base/override/_all.scss
+++ b/themes/build-common/gtk-3.0-base/override/_all.scss
@@ -8,6 +8,7 @@
  */
 
 @import "wintc-comctl";
+@import "wintc-desktop";
 @import "wintc-taskband";
 @import "wintc-taskbuttons";
 @import "xp-start-plugin";
diff --git a/themes/build-common/gtk-3.0-base/override/wintc-desktop.scss b/themes/build-common/gtk-3.0-base/override/wintc-desktop.scss
new file mode 100644
index 0000000..2e43208
--- /dev/null
+++ b/themes/build-common/gtk-3.0-base/override/wintc-desktop.scss
@@ -0,0 +1,23 @@
+/**
+ * wintc-desktop.scss - Theme Base WinTC Desktop Styles
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+.wintc-desktop
+{
+    background: $desktop_bg;
+}
+
+.wintc-desktop iconview
+{
+    @include __wintc_apply_props($desktop_styles);
+
+    &:selected
+    {
+        @include __wintc_apply_props($desktop_selected_styles);
+    }
+}
diff --git a/themes/build-common/gtk-3.0-base/styling/_all.scss b/themes/build-common/gtk-3.0-base/styling/_all.scss
index c84cab1..d46e156 100644
--- a/themes/build-common/gtk-3.0-base/styling/_all.scss
+++ b/themes/build-common/gtk-3.0-base/styling/_all.scss
@@ -22,6 +22,7 @@
 @import "treeview";
 @import "switch";
 
+@import "desktop";
 @import "start-menu";
 @import "systray";
 @import "taskband";
diff --git a/themes/build-common/gtk-3.0-base/styling/desktop.scss b/themes/build-common/gtk-3.0-base/styling/desktop.scss
new file mode 100644
index 0000000..9a20e6e
--- /dev/null
+++ b/themes/build-common/gtk-3.0-base/styling/desktop.scss
@@ -0,0 +1,16 @@
+/**
+ * desktop.scss - Theme Base Desktop Style Constants
+ *
+ * This source-code is part of Windows XP stuff for XFCE:
+ * <<https://www.oddmatics.uk>>
+ *
+ * Author(s): Rory Fewell <roryf@oddmatics.uk>
+ */
+
+$desktop_styles:
+    wintc_define_props_fg(
+        $desktop_styles,
+        true,
+        #FFFFFF,
+        undefined
+    );