diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..83c971e
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# Global rule, if anything matches after this then that rule takes precedent
+* @JoshStrobl 
\ No newline at end of file
diff --git a/budgie/com.solus-project.icon-tasklist.gschema.override b/budgie/com.solus-project.icon-tasklist.gschema.override
index 8745299..7e02d06 100644
--- a/budgie/com.solus-project.icon-tasklist.gschema.override
+++ b/budgie/com.solus-project.icon-tasklist.gschema.override
@@ -1,2 +1,2 @@
 [com.solus-project.icon-tasklist]
-pinned-launchers=['nemo.desktop', 'firefox.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.gnome.Software.desktop', 'org.xfce.Parole.desktop']
+pinned-launchers=['nemo.desktop', 'org.mozilla.firefox.desktop', 'org.gnome.Rhythmbox3.desktop', 'org.gnome.Software.desktop', 'org.xfce.Parole.desktop']
diff --git a/budgie/meson.build b/budgie/meson.build
index 6e893a0..1e79a2f 100644
--- a/budgie/meson.build
+++ b/budgie/meson.build
@@ -4,11 +4,11 @@ schemas = [
   'org.buddiesofbudgie.budgie-desktop-view.gschema.override',
 ]
 
-custom_target('90_budgie_settings.gschema.override',
+custom_target('10_budgie_org_settings.gschema.override',
     capture: true,
     command: ['cat', '@INPUT@'],
     input: schemas,
     install_dir: path_schema,
     install: true,
-    output: '90_budgie_settings.gschema.override',
+    output: '10_budgie_org_settings.gschema.override',
 )
\ No newline at end of file
diff --git a/gnome/meson.build b/gnome/meson.build
index f3772ad..c5d3c84 100644
--- a/gnome/meson.build
+++ b/gnome/meson.build
@@ -1,15 +1,13 @@
 schemas = [
-  'org.gnome.desktop.background.gschema.override',
   'org.gnome.desktop.interface.gschema.override',
-  'org.gnome.desktop.screensaver.gschema.override',
   'org.gnome.gedit.preferences.editor.gschema.override',
 ]
 
-custom_target('90_budgie_gnome_settings.gschema.override',
+custom_target('10_budgie_org_gnome_settings.gschema.override',
     capture: true,
     command: ['cat', '@INPUT@'],
     input: schemas,
     install_dir: path_schema,
     install: true,
-    output: '90_budgie_gnome_settings.gschema.override',
+    output: '10_budgie_org_gnome_settings.gschema.override',
 )
\ No newline at end of file
diff --git a/gnome/org.gnome.desktop.background.gschema.override b/gnome/org.gnome.desktop.background.gschema.override
deleted file mode 100644
index 9bc3c90..0000000
--- a/gnome/org.gnome.desktop.background.gschema.override
+++ /dev/null
@@ -1,3 +0,0 @@
-[org.gnome.desktop.background:Budgie]
-picture-uri='file:///usr/share/backgrounds/budgie/valley-midnight.jpg'
-picture-uri-dark='file:///usr/share/backgrounds/budgie/valley-midnight.jpg'
diff --git a/gnome/org.gnome.desktop.interface.gschema.override b/gnome/org.gnome.desktop.interface.gschema.override
index 00ae2ce..b8ecd6b 100644
--- a/gnome/org.gnome.desktop.interface.gschema.override
+++ b/gnome/org.gnome.desktop.interface.gschema.override
@@ -1,4 +1,4 @@
 [org.gnome.desktop.interface:Budgie]
 color-scheme='prefer-dark'
-gtk-theme='Materia-dark'
+gtk-theme='Pocillo-dark'
 icon-theme='Papirus'
diff --git a/gnome/org.gnome.desktop.screensaver.gschema.override b/gnome/org.gnome.desktop.screensaver.gschema.override
deleted file mode 100644
index fb4eb8e..0000000
--- a/gnome/org.gnome.desktop.screensaver.gschema.override
+++ /dev/null
@@ -1,2 +0,0 @@
-[org.gnome.desktop.screensaver:Budgie]
-picture-uri='file:///usr/share/backgrounds/budgie/valley-midnight.jpg'
diff --git a/lightdm/meson.build b/lightdm/meson.build
deleted file mode 100644
index d238c0a..0000000
--- a/lightdm/meson.build
+++ /dev/null
@@ -1,12 +0,0 @@
-schemas = [
-  'x.dm.slick-greeter.gschema.override',
-]
-
-custom_target('90_budgie_lightdm.gschema.override',
-    capture: true,
-    command: ['cat', '@INPUT@'],
-    input: schemas,
-    install_dir: path_schema,
-    install: true,
-    output: '90_budgie_lightdm.gschema.override',
-)
\ No newline at end of file
diff --git a/lightdm/x.dm.slick-greeter.gschema.override b/lightdm/x.dm.slick-greeter.gschema.override
deleted file mode 100644
index 54181ae..0000000
--- a/lightdm/x.dm.slick-greeter.gschema.override
+++ /dev/null
@@ -1,2 +0,0 @@
-[x.dm.slick-greeter]
-background='file:///usr/share/backgrounds/budgie/valley-midnight.jpg'
diff --git a/meson.build b/meson.build
index 8f3062b..d2b8690 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'budgie-desktop-defaults',
   'c',
-  version: '0.4',
+  version: '0.5.2',
   license: [
     'CC-BY-SA-4.0'
   ],
@@ -16,7 +16,6 @@ path_schema = join_paths(path_data, 'glib-2.0', 'schemas')
 
 subdir('budgie')
 subdir('gnome')
-subdir('lightdm')
 
 report = [
     '    Build configuration:',
@@ -27,4 +26,4 @@ report = [
     '    schema dir:                            @0@'.format(path_schema),
 ]
 
-message('\n\n\n' + '\n'.join(report) + '\n\n')
\ No newline at end of file
+message('\n\n\n' + '\n'.join(report) + '\n\n')