diff --git a/playbook/roles/role-one/tasks/main.yml b/playbook/roles/role-one/tasks/main.yml
index ceb28ca..d7ad184 100644
--- a/playbook/roles/role-one/tasks/main.yml
+++ b/playbook/roles/role-one/tasks/main.yml
@@ -15,17 +15,19 @@
 - include_tasks: rofi-launcher.yml
 
 - include_tasks: ulauncher.yml
+  when: enable_ulauncher
 
 - include_tasks: conky.yml
+  when: enable_conky
 
 - include_tasks: lightdm-greeter.yml
 
 - include_tasks: picom-compositor.yml
+  when: enable_picom
 
 - include_tasks: customize-firefox.yml
 
 - include_tasks: xfce-terminal.yml
 
-- include_tasks: file-manager.yml
-
-- include_tasks: comice-control.yml
\ No newline at end of file
+- include_tasks: comice-control.yml
+  when: enable_comice_control
\ No newline at end of file