diff --git a/playbooks/uwsm.yaml b/playbooks/uwsm.yaml
new file mode 100644
index 0000000..74b4eb5
--- /dev/null
+++ b/playbooks/uwsm.yaml
@@ -0,0 +1,32 @@
+---
+- name: Set up uwsm
+  vars:
+    uid: "{{ lookup('env','USER') }}"
+  hosts: localhost
+  connection: local
+  become: false
+  tasks:
+    - name: Get source code
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources
+        cmd: git clone https://github.com/Vladimir-csp/uwsm.git
+        creates: /home/{{ uid }}/sources/uwsm
+    - name: Build uwsm from source code
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources/uwsm
+        cmd: meson setup --wipe --prefix=/usr/local build -Duuctl=enabled -Duwsm-app=enabled
+        creates: /home/{{ uid }}/sources/uwsm/build
+    - name: Install uwsm
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources/uwsm
+        cmd: meson install -C build
+        creates: /usr/local/bin/uwsm
+        become: true
+    - name: Install uwsm config
+      ansible.builtin.template:
+        src: ../templates/sway_desktop.j2
+        dest: /usr/share/wayland-sessions/swa.desktop
+        owner: 'root'
+        group: 'root'
+        mode: '0640'
+        become: true
diff --git a/templates/sway_config.j2 b/templates/sway_config.j2
index 00c85b1..e2e31c6 100644
--- a/templates/sway_config.j2
+++ b/templates/sway_config.j2
@@ -14,12 +14,8 @@ set $term footclient
 # on the original workspace that the command was run on.
 set $menu wofi -S drun | xargs swaymsg exec --
 
-# Dbus stuff
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec hash dbus-update-activation-environment 2>/dev/null && \
-     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
 # Autostart
+exec exec uwsm finalize SWAYSOCK I3SOCK XCURSOR_SIZE XCURSOR_THEME
 exec --no-startup-id nm-applet
 exec --no-startup-id autotiling
 exec --no-startup-id lxpolkit
@@ -179,9 +175,6 @@ input type:keyboard {
     # Show the next scratchpad window or hide the focused scratchpad window.
     # If there are multiple scratchpad windows, this command cycles through them.
     bindsym $mod+minus scratchpad show
-
-# Flameshot
-for_window [app_id="flameshot"] border pixel 0, floating enable, fullscreen disable, move absolute position 0 0
 #
 # Resizing containers:
 #
@@ -238,16 +231,16 @@ mode $screenshot_mode {
 
 # Status Bar:
 # Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
+# bar {
+#     position top
 
-    swaybar_command waybar
+#     swaybar_command waybar
 
-    colors {
-        statusline #ffffff
-        background #5c5c5c
-        active_workspace #5c5c5c00 #5c5c5c00 #323232
-    }
-}
+#     colors {
+#         statusline #ffffff
+#         background #5c5c5c
+#         active_workspace #5c5c5c00 #5c5c5c00 #323232
+#     }
+# }
 
 include /etc/sway/config.d/*
diff --git a/templates/sway_desktop.j2 b/templates/sway_desktop.j2
new file mode 100644
index 0000000..c4d6702
--- /dev/null
+++ b/templates/sway_desktop.j2
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Sway (with UWSM)
+Comment=Sway
+Exec=uwsm start -N "Sway" -D sway -C "Sway" sway
+DesktopNames=sway
+Type=Application