diff --git a/etc/xdg/xdg-tileos/waybar/config.jsonc b/etc/skel/.config/waybar/config.jsonc
similarity index 100%
rename from etc/xdg/xdg-tileos/waybar/config.jsonc
rename to etc/skel/.config/waybar/config.jsonc
diff --git a/etc/skel/.config/waybar/config.jsonc.example b/etc/skel/.config/waybar/config.jsonc.example
deleted file mode 100644
index ca4fb6e..0000000
--- a/etc/skel/.config/waybar/config.jsonc.example
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "include": [
-        "/etc/xdg/xdg-ubuntusway/waybar/config.jsonc"
-    ]
-}
diff --git a/etc/xdg/xdg-tileos/waybar/style.css b/etc/skel/.config/waybar/style.css
similarity index 100%
rename from etc/xdg/xdg-tileos/waybar/style.css
rename to etc/skel/.config/waybar/style.css
diff --git a/etc/skel/.config/waybar/style.css.example b/etc/skel/.config/waybar/style.css.example
deleted file mode 100644
index 8d47c78..0000000
--- a/etc/skel/.config/waybar/style.css.example
+++ /dev/null
@@ -1 +0,0 @@
-@import "/etc/xdg/xdg-ubuntusway/waybar/style.css";
diff --git a/etc/sway/config.d/20-waybar.conf b/etc/sway/config.d/20-waybar.conf
deleted file mode 100644
index f25938b..0000000
--- a/etc/sway/config.d/20-waybar.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-    id default
-    swaybar_command /usr/share/sway/scripts/waybar.sh
-    position top
-}
diff --git a/usr/share/sway/scripts/waybar.sh b/usr/share/sway/scripts/waybar.sh
deleted file mode 100755
index 17fe02b..0000000
--- a/usr/share/sway/scripts/waybar.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# wrapper script for waybar with args, see https://github.com/swaywm/sway/issues/5724
-
-USER_CONFIG_PATH=$HOME/.config/waybar/config.jsonc
-USER_STYLE_PATH=$HOME/.config/waybar/style.css
-
-if [ -f "$USER_CONFIG_PATH" ]; then
-  USER_CONFIG=$USER_CONFIG_PATH
-fi
-
-if [ -f "$USER_STYLE_PATH" ]; then
-  USER_STYLE=$USER_STYLE_PATH
-fi
-
-waybar -c "${USER_CONFIG:-"/etc/xdg/xdg-tileos/waybar/config.jsonc"}" -s "${USER_STYLE:-"/etc/xdg/xdg-tileos/waybar/style.css"}" &