diff --git a/qtile/config.py b/qtile/config.py
index e3de8d2..c4f999c 100644
--- a/qtile/config.py
+++ b/qtile/config.py
@@ -4,42 +4,27 @@ from libqtile import qtile
 from libqtile.backend.wayland.inputs import InputConfig
 
 from modules.keys import keys, mouse
+from modules.groups import groups
 
+# Application definitions
 apps = {
     "terminal": "kitty",
     "browser": "firefox",
     "filebrowser": "nemo",
+    "cli-filebrowser": "yazi",
+    "editor": "nvim",
 }
+STYLE_DEFAULTS = dict(
+    margin=3,
+    border_width=0,
+    grow_amount=2,
+)
+# Essentials
+keys = keys
+mouse = mouse
+groups = groups
 
-
-modifier_keys = {
-    "M": "mod4",
-    "A": "mod1",
-    "S": "shift",
-    "C": "control",
-}
-
-
-"""
-General Qtile configuration
-"""
-
-dgroups_key_binder = None
-dgroups_app_rules = []  # type: list
-follow_mouse_focus = True
-bring_front_click = True
-floats_kept_above = True
-cursor_warp = True
-auto_fullscreen = True
-focus_on_window_activation = "smart"
-reconfigure_screens = True
-auto_minimize = True
-
-wmname = "Qtile"
-
-"""
-Wayland specific configuration
-"""
+# Wayland specific configuration
 if qtile.core.name == "X11":
     term = "urvx"
 elif qtile.core.name == "wayland":
@@ -56,3 +41,15 @@ wl_input_rules = {
 
 wl_xcursor_theme = None
 wl_xcursor_size = 18
+# General Qtile configuration
+dgroups_key_binder = None
+dgroups_app_rules = []  # type: list
+follow_mouse_focus = True
+bring_front_click = True
+floats_kept_above = True
+cursor_warp = True
+auto_fullscreen = True
+focus_on_window_activation = "smart"
+reconfigure_screens = True
+auto_minimize = True
+wmname = "Qtile"