diff --git a/usr/lib/pika/gnome-layouts/theme.sh b/usr/lib/pika/gnome-layouts/theme.sh
index a66719e..6d6dc3d 100755
--- a/usr/lib/pika/gnome-layouts/theme.sh
+++ b/usr/lib/pika/gnome-layouts/theme.sh
@@ -1,51 +1,36 @@
 #! /bin/bash
 rm -rfv $HOME/.config/gtk-4.0
 
-gnome-extensions enable pika-darkmode@pika.com
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/manual-time-source true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-button-placement "'none'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-time "'night'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/time-source "'ondemand'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/enabled true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/enabled true
-
 if [[ $1 == pika ]]
 then
 dconf write /org/pika/layouts/pika-theme 1
-gnome-extensions enable pika-darkmode@pika.com
+gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
 dconf write /org/gnome/desktop/wm/preferences/titlebar-font "'Ubuntu Bold 11'"
 dconf write /org/gnome/desktop/sound/theme-name "'pika'"
 dconf write /org/gnome/desktop/interface/icon-theme "'Papirus'"
 dconf write /org/gnome/desktop/interface/monospace-font-name "'Ubuntu Mono 13'"
 dconf write /org/gnome/desktop/interface/document-font-name "'Sans 11'"
 dconf write /org/gnome/desktop/interface/font-name "'Ubuntu 11'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/manual-time-source true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-button-placement "'none'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/ondemand-time "'night'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/time/time-source "'ondemand'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/enabled true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'pika-gnome-theme'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'pika-gnome-theme dark'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/enabled true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'Jasper-Yellow-Light'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'Jasper-Yellow-Dark'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/enabled true
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Jasper-Yellow-Light'"
-dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Jasper-Yellow-Dark'"
+dconf write /org/gnome/desktop/interface/gtk-theme "'Jasper-Yellow-Dark'"
+dconf write /org/gnome/shell/extensions/user-theme/name "'Jasper-Yellow-Dark'"
 echo '#! /bin/bash' > $HOME/.config/pika_theme || touch $HOME/.config/pika_theme && echo '#! /bin/bash' > $HOME/.config/pika_theme
 echo 'KVANTUM_THEME_DARK=Orchis-dark#' >> $HOME/.config/pika_theme
 echo 'KVANTUM_THEME_LIGHT=Orchis#' >> $HOME/.config/pika_theme
-echo 'GTK_THEME_PATH_DARK=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Dark >> $HOME/.config/pika_theme
-echo 'GTK_THEME_PATH_LIGHT=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Light >> $HOME/.config/pika_theme
-pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C yellow
-
-if dconf read /org/gnome/desktop/interface/color-scheme | grep dark
-then
+echo 'GTK_THEME_DARK=$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Dark >> $HOME/.config/pika_theme
+echo 'GTK_THEME_LIGHT=$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Light >> $HOME/.config/pika_theme
+echo 'GTK_THEME_PATH_DARK=/usr/share/themes/$GTK_THEME_DARK' >> $HOME/.config/pika_theme
+echo 'GTK_THEME_PATH_LIGHT=/usr/share/themes/GTK_THEME_LIGHT' >> $HOME/.config/pika_theme
+dconf write /org/gnome/desktop/interface/color-scheme "'prefer-dark'"
 pika-gnome-theme dark
-else
-pika-gnome-theme
-fi
+pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C yellow
+  if dconf read /org/gnome/desktop/interface/color-scheme | grep dark
+  then
+    pika-gnome-theme dark
+  else
+    pika-gnome-theme
+  fi
 fi
+
 if [[ $1 == gnome ]]
 then
 dconf write /org/pika/layouts/pika-theme 0
@@ -64,6 +49,8 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night
 echo '#! /bin/bash' > $HOME/.config/pika_theme || touch $HOME/.config/pika_theme && echo '#! /bin/bash' > $HOME/.config/pika_theme
 echo 'KVANTUM_THEME_DARK=' >> $HOME/.config/pika_theme
 echo 'KVANTUM_THEME_LIGHT=' >> $HOME/.config/pika_theme
+echo 'GTK_THEME_DARK=' >> $HOME/.config/pika_theme
+echo 'GTK_THEME_LIGHT=' >> $HOME/.config/pika_theme
 echo 'GTK_THEME_PATH_DARK=' >> $HOME/.config/pika_theme
 echo 'GTK_THEME_PATH_LIGHT=' >> $HOME/.config/pika_theme
 fi