diff --git a/.gitmodules b/.gitmodules
index 36837ed4..25f6f18f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -35,7 +35,7 @@
 	path = base/.vim/bundle/vim-ansible-yaml
 	url = https://github.com/chase/vim-ansible-yaml
 [submodule "firestarter/.firestarter"]
-	path = firestarter/.firestarter
+	path = desktop-common/.firestarter
 	url = git@git.desu.ltd:salt/firestarter
 [submodule "bin/.bin"]
 	path = base/.bin
diff --git a/README.md b/README.md
index 9d904fae..7a11b43e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,6 @@ This stash contains a number of packages for numerous situations:
 | `base` | The base package contains shell and core utility configuration. Other packages do not depend on it; it merely contains basic configuration that I find necessary in every case. |
 | `desktop-common` | Common configuration shared across all possible rices. This contains things such as keybindings for applications, Quake configs, Redshift, etc. Configuration files with themes are avoided where possible. |
 | `desktop-gruvbox` | My current rice and its accompanying configs. A nice and simple one with Rofi, bspwm, Dunst, Compton, and Polybar. |
-| `firestarter` | A custom set of desktop environment scripts that I threw together to manage my environment without worrying about the fine details all the time. See the Firestarter repo for more info. |
 | `git` | My personal git configuration. Separated from base because sometimes I don't want cockmail on all my commits. |
 | `mac` | MacOS-specific configs. Very sparse; I hardly ever have to use one. |
 | `ssh` | SSH configuration for my desktop machines. |
diff --git a/firestarter/.config/firestarter/akonadi b/desktop-common/.config/firestarter/akonadi
similarity index 100%
rename from firestarter/.config/firestarter/akonadi
rename to desktop-common/.config/firestarter/akonadi
diff --git a/firestarter/.config/firestarter/audiod b/desktop-common/.config/firestarter/audiod
similarity index 100%
rename from firestarter/.config/firestarter/audiod
rename to desktop-common/.config/firestarter/audiod
diff --git a/firestarter/.config/firestarter/cloud b/desktop-common/.config/firestarter/cloud
similarity index 100%
rename from firestarter/.config/firestarter/cloud
rename to desktop-common/.config/firestarter/cloud
diff --git a/firestarter/.config/firestarter/im b/desktop-common/.config/firestarter/im
similarity index 100%
rename from firestarter/.config/firestarter/im
rename to desktop-common/.config/firestarter/im
diff --git a/firestarter/.config/firestarter/mpd b/desktop-common/.config/firestarter/mpd
similarity index 100%
rename from firestarter/.config/firestarter/mpd
rename to desktop-common/.config/firestarter/mpd
diff --git a/firestarter/.config/firestarter/networkd b/desktop-common/.config/firestarter/networkd
similarity index 100%
rename from firestarter/.config/firestarter/networkd
rename to desktop-common/.config/firestarter/networkd
diff --git a/firestarter/.config/firestarter/polkitd b/desktop-common/.config/firestarter/polkitd
similarity index 100%
rename from firestarter/.config/firestarter/polkitd
rename to desktop-common/.config/firestarter/polkitd
diff --git a/firestarter/.config/firestarter/powerd b/desktop-common/.config/firestarter/powerd
similarity index 100%
rename from firestarter/.config/firestarter/powerd
rename to desktop-common/.config/firestarter/powerd
diff --git a/firestarter/.config/firestarter/redshift b/desktop-common/.config/firestarter/redshift
similarity index 100%
rename from firestarter/.config/firestarter/redshift
rename to desktop-common/.config/firestarter/redshift
diff --git a/firestarter/.config/firestarter/settingsd b/desktop-common/.config/firestarter/settingsd
similarity index 100%
rename from firestarter/.config/firestarter/settingsd
rename to desktop-common/.config/firestarter/settingsd
diff --git a/firestarter/.config/firestarter/steam b/desktop-common/.config/firestarter/steam
similarity index 100%
rename from firestarter/.config/firestarter/steam
rename to desktop-common/.config/firestarter/steam
diff --git a/firestarter/.config/firestarter/syncthing b/desktop-common/.config/firestarter/syncthing
similarity index 100%
rename from firestarter/.config/firestarter/syncthing
rename to desktop-common/.config/firestarter/syncthing
diff --git a/firestarter/.config/firestarter/telegram b/desktop-common/.config/firestarter/telegram
similarity index 100%
rename from firestarter/.config/firestarter/telegram
rename to desktop-common/.config/firestarter/telegram
diff --git a/firestarter/.config/firestarter/wallet b/desktop-common/.config/firestarter/wallet
similarity index 100%
rename from firestarter/.config/firestarter/wallet
rename to desktop-common/.config/firestarter/wallet
diff --git a/firestarter/.firestarter b/desktop-common/.firestarter
similarity index 100%
rename from firestarter/.firestarter
rename to desktop-common/.firestarter
diff --git a/firestarter/.xinitrc b/desktop-common/.xinitrc
similarity index 100%
rename from firestarter/.xinitrc
rename to desktop-common/.xinitrc
diff --git a/firestarter/.xsessionrc b/desktop-common/.xsessionrc
similarity index 100%
rename from firestarter/.xsessionrc
rename to desktop-common/.xsessionrc
diff --git a/firestarter/.config/firestarter/bar b/desktop-gruvbox/.config/firestarter/bar
similarity index 100%
rename from firestarter/.config/firestarter/bar
rename to desktop-gruvbox/.config/firestarter/bar
diff --git a/firestarter/.config/firestarter/compositor b/desktop-gruvbox/.config/firestarter/compositor
similarity index 100%
rename from firestarter/.config/firestarter/compositor
rename to desktop-gruvbox/.config/firestarter/compositor
diff --git a/firestarter/.config/firestarter/conky b/desktop-gruvbox/.config/firestarter/conky
similarity index 100%
rename from firestarter/.config/firestarter/conky
rename to desktop-gruvbox/.config/firestarter/conky
diff --git a/firestarter/.config/firestarter/hkd b/desktop-gruvbox/.config/firestarter/hkd
similarity index 100%
rename from firestarter/.config/firestarter/hkd
rename to desktop-gruvbox/.config/firestarter/hkd
diff --git a/firestarter/.config/firestarter/notifyd b/desktop-gruvbox/.config/firestarter/notifyd
similarity index 100%
rename from firestarter/.config/firestarter/notifyd
rename to desktop-gruvbox/.config/firestarter/notifyd
diff --git a/firestarter/.config/firestarter/wallpaper b/desktop-gruvbox/.config/firestarter/wallpaper
similarity index 100%
rename from firestarter/.config/firestarter/wallpaper
rename to desktop-gruvbox/.config/firestarter/wallpaper
diff --git a/firestarter/.config/firestarter/wm b/desktop-gruvbox/.config/firestarter/wm
similarity index 100%
rename from firestarter/.config/firestarter/wm
rename to desktop-gruvbox/.config/firestarter/wm