diff --git a/.config/dconf/user b/.config/dconf/user
index 6e08ab3a..a11d9927 100644
Binary files a/.config/dconf/user and b/.config/dconf/user differ
diff --git a/.config/firestarter/audio-daemon b/.config/firestarter/audio-daemon
deleted file mode 100644
index 6331ef89..00000000
--- a/.config/firestarter/audio-daemon
+++ /dev/null
@@ -1,3 +0,0 @@
-#.fsdefaults
-command -v pulseaudio
-pulseaudio
diff --git a/.config/firestarter/bar b/.config/firestarter/bar
deleted file mode 100644
index f3d5589d..00000000
--- a/.config/firestarter/bar
+++ /dev/null
@@ -1,13 +0,0 @@
-#.fsdefaults
-command -v polybar && [ -r "/home/salt/.config/polybar/launch.sh" ]
-"/home/salt/.config/polybar/launch.sh"
-command -v tint2
-tint2
-command -v lxpanel
-lxpanel
-command -v lxqt-panel
-lxqt-panel
-command -v mate-panel
-mate-panel
-command -v xfce4-panel
-xfce4-panel
diff --git a/.config/firestarter/blue-light-filter b/.config/firestarter/blue-light-filter
deleted file mode 100644
index 3914a896..00000000
--- a/.config/firestarter/blue-light-filter
+++ /dev/null
@@ -1,5 +0,0 @@
-#.fsdefaults
-command -v redshift-gtk
-redshift-gtk
-command -v redshift
-redshift
diff --git a/.config/firestarter/compositor b/.config/firestarter/compositor
deleted file mode 100644
index dcbf0dec..00000000
--- a/.config/firestarter/compositor
+++ /dev/null
@@ -1,9 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-command -v unagi
-unagi
-command -v compton
-compton
-command -v xcompmgr
-xcompmgr
diff --git a/.config/firestarter/hotkey-daemon b/.config/firestarter/hotkey-daemon
deleted file mode 100644
index b45bd997..00000000
--- a/.config/firestarter/hotkey-daemon
+++ /dev/null
@@ -1,7 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-command -v sxhkd
-sxhkd
-command -v lxqt-globalkeysd
-lxqt-globalkeysd
diff --git a/.config/firestarter/network-daemon b/.config/firestarter/network-daemon
deleted file mode 100644
index 77933bac..00000000
--- a/.config/firestarter/network-daemon
+++ /dev/null
@@ -1,3 +0,0 @@
-#.fsdefaults
-command -v nm-applet
-nm-applet
diff --git a/.config/firestarter/notification-daemon b/.config/firestarter/notification-daemon
deleted file mode 100644
index 1522d9e8..00000000
--- a/.config/firestarter/notification-daemon
+++ /dev/null
@@ -1,7 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-command -v dunst
-dunst
-command -v lxqt-notificationd
-notificationd
diff --git a/.config/firestarter/polkit-agent b/.config/firestarter/polkit-agent
deleted file mode 100644
index 040b5ecf..00000000
--- a/.config/firestarter/polkit-agent
+++ /dev/null
@@ -1,42 +0,0 @@
-#.fsdefaults
-command -v lxqt-policykit-agent
-lxqt-policykit-agent
-command -v lxpolkit
-lxpolkit
-command -v mate-polkit
-mate-polkit
-command -v polkit-efl-authentication-agent-1
-polkit-efl-authentication-agent-1
-[ -x "/usr/lib/ts-polkitagent" ]
-/usr/lib/ts-polkitagent
-[ -x "/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1" ]
-/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-[ -x "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" ]
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-# Debian locations
-# On generation time, your architecture is filled in here
-[ -x "/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1" ]
-"/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1"
-[ -x "/usr/lib/x86_64-linux-gnu/libexec/polkit-kde-authentication-agent-1" ]
-"/usr/lib/x86_64-linux-gnu/libexec/polkit-kde-authentication-agent-1"
-# OpenSuSE locations
-[ -x "/usr/lib/polkit-mate/polkit-mate-authentication-agent-1" ]
-"/usr/lib/polkit-mate/polkit-mate-authentication-agent-1"
-[ -x "/usr/lib/polkit-kde-authentication-agent-1" ]
-"/usr/lib/polkit-kde-authentication-agent-1"
-# Arch locations
-[ -x "/usr/lib/mate-polkit/polkit-mate-authentication-agent-1" ]
-/usr/lib/mate-polkit/polkit-mate-authentication-agent-1
-[ -x "/usr/lib/polkit-kde-authentication-agent-1" ]
-/usr/lib/polkit-kde-authentication-agent-1
-# Fedora locations
-[ -x "/usr/libexec/xfce-polkit" ]
-/usr/libexec/xfce-polkit
-[ -x "/usr/libexec/lxqt-policykit-agent" ]
-/usr/libexec/lxqt-policykit-agent
-[ -x "/usr/libexec/polkit-mate-authentication-agent-1" ]
-/usr/libexec/polkit-mate-authentication-agent-1
-[ -x "/usr/libexec/kf5/polkit-kde-authentication-agent-1" ]
-/usr/libexec/kf5/polkit-kde-authentication-agent-1
-[ -x "/usr/libexec/polkit-gnome-authentication-agent-1" ]
-/usr/libexec/polkit-gnome-authentication-agent-1
diff --git a/.config/firestarter/power-daemon b/.config/firestarter/power-daemon
deleted file mode 100644
index f9948e11..00000000
--- a/.config/firestarter/power-daemon
+++ /dev/null
@@ -1,13 +0,0 @@
-#.fsdefaults
-command -v batterymon
-batterymon
-command -v cbatticon
-cbatticon
-command -v lxqt-powermangement
-lxqt-powermanagement
-command -v xfce4-power-manager
-xfce4-power-manager
-command -v mate-power-manager
-mate-power-manager
-command -v gnome-power-manager
-gnome-power-manager
diff --git a/.config/firestarter/runner b/.config/firestarter/runner
deleted file mode 100644
index 9dd18a6c..00000000
--- a/.config/firestarter/runner
+++ /dev/null
@@ -1,3 +0,0 @@
-#.fsdefaults
-command -v krunner
-krunner
diff --git a/.config/firestarter/settings-daemon b/.config/firestarter/settings-daemon
deleted file mode 100644
index 9c5b5228..00000000
--- a/.config/firestarter/settings-daemon
+++ /dev/null
@@ -1,13 +0,0 @@
-#.fsdefaults
-command -v xsettingsd
-xsettingsd
-command -v xsettings-kde
-xsettingskde
-command -v lxsettings-daemon
-lxsettings-daemon
-command -v xfsettingsd
-xfsettingsd
-command -v mate-settings-daemon
-mate-settings-daemon
-command -v gnome-settings-daemon
-gnome-settings-daemon
diff --git a/.config/firestarter/stat-glances b/.config/firestarter/stat-glances
deleted file mode 100644
index 3ea9fe3e..00000000
--- a/.config/firestarter/stat-glances
+++ /dev/null
@@ -1,9 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-[ -f "$HOME/.config/nitrogen/nitrogen.cfg" ]
-:
-# Note: the dumb sleep hack is because Conky crashes with window_type override if the WM hasn't loaded yet
-# This gives the WM ample time to load up
-command -v conky && [ -r "${XDG_CONFIG_HOME:-/home/salt/.config}/conky/conky.conf" ]
-sleep 5 && conky
diff --git a/.config/firestarter/wallpaper b/.config/firestarter/wallpaper
deleted file mode 100644
index b72cc948..00000000
--- a/.config/firestarter/wallpaper
+++ /dev/null
@@ -1,7 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-command -v feh && [ -r "/home/salt/.fehbg" ]
-~/.fehbg
-command -v nitrogen
-nitrogen --restore
diff --git a/.config/firestarter/wm b/.config/firestarter/wm
deleted file mode 100644
index 1acd5723..00000000
--- a/.config/firestarter/wm
+++ /dev/null
@@ -1,63 +0,0 @@
-#.fsdefaults
-[ -z "$DISPLAY" ]
-:
-command -v 2bwm
-2bwm
-command -v aewm
-aewm
-command -v awesome
-awesome
-command -v bspwm
-bspwm
-command -v catwm
-catwm
-command -v cwm
-cwm
-command -v dwm
-dwm
-command -v evilwm
-evilwm
-command -v exwm
-exwm
-command -v fluxbox
-fluxbox
-command -v flwm
-flwm
-command -v fvwm
-fvwm
-command -v herbstluftwm
-herbstluftwm
-command -v i3
-i3
-command -v icewm
-icewm
-command -v jbwm
-jbwm
-command -v jwm
-jwm
-command -v lwm
-lwm
-command -v openbox
-openbox
-command -v pawm
-pawm
-command -v ratpoison
-ratpoison
-command -v twm
-twm
-command -v windowmaker
-windowmaker
-command -v wmii
-wmii
-command -v xmonad
-xmonad
-command -v xfwm4
-xfwm4
-command -v metacity
-metacity
-command -v mutter
-mutter
-command -v kwin
-kwin
-command -v tinywm
-tinywm
diff --git a/.config/i3/config b/.config/i3/config
index 7ff8afd2..6683a2d1 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -4,11 +4,23 @@
 #
 
 ###################
-# DO NOT START DAEMONS HERE
+## Startup tasks
 ###################
-# This script leverages firestarter for startup scripts
-# gitlab.com/rehashedsalt/firestarter
-# Set up firestarter scripts instead!
+
+# High-priority shit
+exec --no-startup-id pulseaudio
+exec --no-startup-id mate-settings-daemon
+exec --no-startup-id compton
+exec --no-startup-id nitrogen --restore
+exec --no-startup-id ~/.config/polybar/launch.sh
+exec --no-startup-id redshift
+# Start up whenever shit
+exec --no-startup-id dunst
+exec --no-startup-id /usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1
+exec --no-startup-id /usr/lib/polkit-mate/polkit-mate-authentication-agent-1
+exec --no-startup-id mate-power-manager
+# XDG
+exec --no-startup-id "dex -a"
 
 ###################
 ## Workspaces
@@ -110,7 +122,7 @@ set $shift Shift
 floating_modifier $mod
 
 # Program opening and closing
-bindsym $mod+Return exec "i3-sensible-terminal"
+bindsym $mod+Return exec "mate-terminal"
 bindsym $mod+q kill
 bindsym $mod+space exec "rofi -show drun"
 bindsym $mod+backslash exec "rofi -show ssh"
diff --git a/.firestarter b/.firestarter
deleted file mode 160000
index b0028650..00000000
--- a/.firestarter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b00286506a63e764dae33d9aa5ee46d082c0ac1f
diff --git a/.firestarterrc b/.firestarterrc
deleted file mode 100755
index 818d1025..00000000
--- a/.firestarterrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-#hsetroot -solid "#383c4a"
diff --git a/.gitmodules b/.gitmodules
index eaa80874..d1446b3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,6 +46,3 @@
 [submodule ".vim/bundle/nord-vim"]
 	path = .vim/bundle/nord-vim
 	url = https://github.com/arcticicestudio/nord-vim
-[submodule ".firestarter"]
-	path = .firestarter
-	url = git@gitlab.com:rehashedsalt/firestarter
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100755
index bdb05a0f..00000000
--- a/.xinitrc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Salt's .xinitrc
-# Copyright (C) 2018 salt <salt@lap-th-e560-0>
-#
-# Distributed under terms of the MIT license.
-#
-
-die() {
-	if [ -z "$1" ]; then
-		echo "Failed to start session" >&2
-	else
-		echo "Failed to start session: $1" >&2
-	fi
-	exit 1
-}
-
-# Set up our session target
-export FS_DIEONWM=1
-export XDG_CURRENT_DESKTOP=MATE
-if [ -x "$HOME/.firestarter/firestarter" ]; then
-	export STARTUP="$HOME/.firestarter/firestarter"
-elif [ -x "$HOME/Projects/firestarter/firestarter" ]; then
-	export STARTUP="$HOME/Projects/firestarter/firestarter"
-fi
-[ -z "$STARTUP" ] && die "No session target available"
-
-# Execute our target
-# Yes shellcheck, the rest of the code is an error handler
-# shellcheck disable=2093
-exec "$STARTUP"
-
-# If we get here, we haven't exec'd a target and must die
-die "Miscellaneous error"
-
diff --git a/.xsession b/.xsession
deleted file mode 120000
index 03280dfd..00000000
--- a/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-.xinitrc
\ No newline at end of file