diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml
index ff60ab3..1aa32e0 100644
--- a/facts/workstation/package.yml
+++ b/facts/workstation/package.yml
@@ -43,11 +43,11 @@
   when: ansible_distribution == "Ubuntu"
 
 
-- name: Workstation | Facts | Package | Debian
+- name: Workstation | Facts | Package | Debian & Devuan
   set_fact:
     flatpak_distro: true
     dmenu: suckless-tools
-  when: ansible_distribution == "Debian"
+  when: ansible_distribution in ("Debian", "Devuan")
 
 
 - name: Workstation | Facts | Package | Mint
diff --git a/local.yml b/local.yml
index 2039c9f..b0691d6 100644
--- a/local.yml
+++ b/local.yml
@@ -130,17 +130,20 @@
       - include_tasks: tasks/workstation/shared/software/dwm.yml
 
       - include_tasks: tasks/workstation/linux/software/i3.yml
-
+      
       # Polished Desktop Environments #
       - include_tasks: tasks/workstation/freebsd/software/gnome.yml
         when: ansible_system == "FreeBSD"
 
-      - include_tasks: tasks/workstation/linux/software/gnome.yml
+      - name: Main | Workstation | Fancy Desktop Environments
+        block:
+        - include_tasks: tasks/workstation/linux/software/gnome.yml
+          when: ansible_service_mgr == "systemd"
+        
+        - include_tasks: tasks/workstation/linux/software/cinnamon.yml
+        - include_tasks: tasks/workstation/linux/software/lxqt.yml
         when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/cinnamon.yml
-
-      - include_tasks: tasks/workstation/linux/software/lxqt.yml
+          # TBD: Implement this: and extra_desktops == true
 
       ## Software Tasks ##