diff --git a/PKGBUILD b/PKGBUILD
index 267fc76..3fc761b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,22 @@
 # Maintainer: David Thurstenson <thurstylark@gmail.com>
 pkgname=greetd-tlgreet
-pkgver=0.8
+pkgver=0.9
 pkgrel=1
-pkgdesc="Thurstylark's greetd + wlgreet setup"
+pkgdesc="Thurstylark's greetd setup"
 arch=(any)
 url="https://git.thurstylark.com/greetd-tlgreet.git/"
 license=('GPL')
-depends=(greetd greetd-wlgreet sway swayidle waybar tl-wallpaper)
-optdepends=(archlinux-wallpaper)
+depends=(greetd greetd-tuigreet)
 source=("greetd.toml"
-	"sway-wlgreet.conf"
-	"wlgreet.toml"
-	"waybar.conf"
-	"waybar.css"
 	"greetd.service.override.conf")
-md5sums=('db675a996223c3f155885d7494b16282'
-         '22cb20f76e276d7b41b173b18bb6e2be'
-         '4c1b6e5dff4071bff81e935322743974'
-         'bfdda1ad67829fd55d3612c857df18dc'
-         '0b3156d2868912d8b4141428b72b4bbe'
-         '6ee23a02a919d6a28f36d3627f3c6960')
+sha256sums=('2c878f0d5ad0e1fae2277de1074b1d1bcff65c211103d824c1060ef3bda3b056'
+            '4369b05c184a32bb088de10695b8c88df407476f90d583eff811a48f588ec453')
 
 package() {
+	# Install greetd service override
 	install -Dm644 ${srcdir}/greetd.service.override.conf \
 		       ${pkgdir}/etc/systemd/system/greetd.service.d/override.conf
-	for i in \
-		greetd.toml \
-		sway-wlgreet.conf \
-		wlgreet.toml \
-		waybar.conf \
-		waybar.css
-	do
-		install -Dm644 ${srcdir}/${i} ${pkgdir}/etc/greetd/tlgreet/${i}
-	done
+
+	# Install greetd configuration
+	install -Dm644 ${srcdir}/greetd.toml ${pkgdir}/etc/greetd/tlgreet/greetd.toml
 }
diff --git a/greetd.toml b/greetd.toml
index df68fd6..a8e95d8 100644
--- a/greetd.toml
+++ b/greetd.toml
@@ -2,5 +2,5 @@
 vt = 1
 
 [default_session]
-command = "sway --config /etc/greetd/tlgreet/sway-wlgreet.conf"
+command = "tuigreet --time --remember-session --asterisks"
 user = "greeter"
diff --git a/sway-wlgreet.conf b/sway-wlgreet.conf
deleted file mode 100644
index 8de8a92..0000000
--- a/sway-wlgreet.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# Sway Config: Greeter
-#
-# Thurstylark
-#
-
-
-# 
-# Settings
-#
-
-# Use script to grab a random wallpaper from tl-wallpaper collection
-set $wallpaper-path $$(/usr/share/backgrounds/thurstylark/tl-wallpaper-shuf.bash)
-
-# Fallback color if no wallpapers exist
-set $fallback-color "#333333"
-
-# Cursor hide delay (in ms)
-set $cursor-delay "100"
-
-# Display sleep idle time (in seconds)
-set $dispsleep-time "30"
-
-# Display sleep and wake commands
-set $dispsleep 'swaymsg "output * dpms off"'
-set $dispwake 'swaymsg "output * dpms on"'
-
-# The input devices worth paying attention to
-set $touchpad "2:7:SynPS/2_Synaptics_Touchpad"
-set $trackpoint "2:10:TPPS/2_IBM_TrackPoint"
-
-# wlgreet config location
-set $wlgreet-config /etc/greetd/tlgreet/wlgreet.toml
-
-# wlgreet command
-set $wlgreet-command sway
-
-# waybar config location
-set $waybar-config /etc/greetd/tlgreet/waybar.conf
-set $waybar-css /etc/greetd/tlgreet/waybar.css
-
-
-# 
-# Setup
-#
-
-# Exit on Mod4+Shift+R, effectively restarting the greeter
-bindsym Mod4+Shift+r exit
-
-# Set the wallpaper to a random file in the wallpapers dir
-output * bg $wallpaper-path fill $fallback-color
-
-# Touchpad options
-input $touchpad {
-	pointer_accel 0.5
-}
-
-# Disable Trackpoint
-input $trackpoint events disabled
-
-# Hide cursor after delay
-seat * hide_cursor $cursor-delay
-
-# Display sleep setup
-exec swayidle timeout $dispsleep-time $dispsleep resume $dispwake
-
-# Start waybar
-exec "waybar --config $waybar-config --style $waybar-css"
-
-# The greeter itself
-exec "wlgreet --command $wlgreet-command --config $wlgreet-config; swaymsg exit"
diff --git a/waybar.conf b/waybar.conf
deleted file mode 100644
index ad10ac3..0000000
--- a/waybar.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "layer": "top",
-    "position": "top",
-    "height": 30, 
-    "modules-left": [],
-    "modules-center": ["clock"],
-    "modules-right": ["network", "battery"],
-    "clock": {
-        "timezone": "America/Chicago",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "battery": {
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
-        "format-icons": ["", "", "", "", ""]
-    }
-}
diff --git a/waybar.css b/waybar.css
deleted file mode 100644
index 1d1d4bb..0000000
--- a/waybar.css
+++ /dev/null
@@ -1,20 +0,0 @@
-* {
-    border: none;
-    border-radius: 0;
-    font-family: Roboto, Helvetica, Arial, sans-serif;
-    font-size: 18px;
-    font-weight: bold;
-    min-height: 30px;
-}
-
-window#waybar {
-    background: linear-gradient(rgba(0,0,0,0.8), rgba(0,0,0,0));
-    color: #ffffff;
-}
-#clock,
-#battery,
-#network{
-    padding: 0 10px;
-    margin: 0 4px;
-    color: #ffffff;
-}
diff --git a/wlgreet.toml b/wlgreet.toml
deleted file mode 100644
index 4a56ff2..0000000
--- a/wlgreet.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-outputMode = "active"
-scale = 1
-
-[background]
-red = 0
-green = 0
-blue = 0
-opacity = 0.7