diff --git a/basic/#keybinds.conf# b/basic/#keybinds.conf#
new file mode 100644
index 0000000..43bc656
--- /dev/null
+++ b/basic/#keybinds.conf#
@@ -0,0 +1,271 @@
+:q
+:q
+## KEYBINDINGS ###
+###################
+
+$mainMod = SUPER # Sets "Windows" key as main modifier
+$ipc = qs -c noctalia-shell ipc call
+
+# 1. Basic Binds
+bind = $mainMod, Q, exec, $terminal
+bind = ALT, Q, exec, $terminal --class popup-term
+bind = $mainMod, W, exec, $terminal --class popup-term
+bind = $mainMod, C, killactive,
+bind = $mainMod SHIFT CTRL, M, exec, command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit
+# bind = $mainMod, E, exec, $fileManager
+
+# Workspace movement and tiling rule
+bind = $mainMod, 	P, togglefloating,
+bind = $mainMod, 	P, pin,
+bind = $mainMod SHIFT, 	BACKSLASH, togglefloating, # float
+bind = $mainMod, 	BACKSLASH, layoutmsg, togglesplit # dwindle
+bind = $mainMod CTRL,	BACKSLASH, pseudo #
+
+# bind = $mainMod, SEMICOLON, exec, hyprctl general:layout master 
+# bind = $mainMod, APOSTROPHE, exec, hyprctl general:layout dwindle 
+
+# Compiler window
+bind = $mainMod SHIFT, A, tagwindow, compiler
+bind = $mainMod, A, exec, $XDG_CONFIG_HOME/hypr/scripts/compile.sh
+
+# 2. moving focus with vim
+bind = $mainMod, H, movefocus, l
+bind = $mainMod, L, movefocus, r
+bind = $mainMod, K, movefocus, u
+bind = $mainMod, J, movefocus, d
+
+bind = $mainMod SHIFT, H, moveWindow, l
+bind = $mainMod SHIFT, L, moveWindow, r
+bind = $mainMod SHIFT, K, moveWindow, u
+bind = $mainMod SHIFT, J, moveWindow, d
+
+bind = $mainMod, mouse_up, workspace, m-1
+bind = $mainMod, mouse_down, workspace, m-1
+
+bind = $mainMod SHIFT , mouse_up, workspace, e-1
+bind = $mainMod SHIFT , mouse_down, workspace, e-1
+
+bind = $mainMod CTRL, right, workspace, m+1 # alt-tab switch workspace
+bind = $mainMod CTRL, left, workspace, m-1 # alt-tab switch workspace
+
+bind = CTRL, SPACE, focuscurrentorlast
+
+# bind = $mainMod, TAB, focusmonitor, +1
+# bind = $mainMod SHIFT, TAB, focusmonitor, -1
+
+# bind = ALT, TAB, hyprexpo:expo, toggle
+# bind = ALT, TAB, overview:toggle, all
+
+# 3. resize with arrows
+binde = $mainMod, right, resizeActive,  20   0
+binde = $mainMod, left, resizeActive, -20   0
+binde = $mainMod, up, resizeActive,   0 -20 
+binde = $mainMod, down, resizeActive,   0  20 
+
+# 4. Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# 5. Move actihe window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# 6. special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+bind = $mainMod, B, togglespecialworkspace, magic2
+bind = $mainMod SHIFT, B, movetoworkspace, special:book
+
+bind = $mainMod, D, exec, discord
+bind = $mainMod, D, togglespecialworkspace, discord
+
+bind = $mainMod, E, exec, $email
+bind = $mainMod, E, togglespecialworkspace, email
+
+bind = $mainMod, G, exec, steam -forcedesktopscaling 0.5
+bind = $mainMod, G, togglespecialworkspace, gaming
+
+bind = $mainMod, N, togglespecialworkspace, notes
+
+bind = $mainMod, X, togglespecialworkspace, phantom
+bind = $mainMod, X, togglespecialworkspace, phantom
+
+# 7. Other Workspace tools
+# 8. Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# 9. Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+bind  = ALT, mouse:274, exec, playerctl play-pause
+
+
+# 10. Applications and shortcuts 
+# bindr = SUPER, SUPER_L, exec, $menu
+bind = $mainMod, D, exec, vesktop
+bind = $mainMod, F, exec, firefox
+bind = $mainMod SHIFT, F, exec, qutebrowser
+bind = $mainMod SHIFT, Q, exec, qutebrowser
+bind = $mainMod, SPACE, exec, playerctl play-pause
+# bind = FUNCTION, L, exec, command, qs noctalia-shell ipc call lockScreen lock
+bind = ALT_L, C, exec, $ipc plugin:clipper openPanel
+bind = ,code:148, exec, kitty --class calc-term -o "confirm_os_window_close 0" /home/venus/.cargo/bin/mathypad 
+bind = SUPER, escape, exec, kitty --class btop -o "confirm_os_window_close 0" /usr/bin/btop
+bind = SUPER SHIFT, escape, exec, kitty --class btop -o "confirm_os_window_close 0" /usr/bin/nvtop
+bind = $mainMod, I, exec, /home/venus/.config/scripts/connectPhone.sh 
+bind = $mainMod, I, exec, scrcpy --no-audio --no-video --keyboard=uhid --mouse=uhid
+bind = $mainMod SHIFT, I, exec, /home/venus/.config/scripts/connectPhone.sh 
+bind = $mainMod SHIFT, I, exec, scrcpy --no-audio --keyboard=uhid --mouse=uhid
+
+bind = CTRL,SHIFT ESCAPE, exec, btop++
+bind = $mainMod, T, exec, notify-send "$(/home/venus/.config/hypr/scripts/getIp.sh)"
+bind = $mainMod, T, exec, kdeconnect-app
+
+# Change background opacity of terminal window
+# bind = $mainMod ALT, k, exec,kitty +kitten @ set-background-opacity -a 1
+
+# 11. hande lid switch
+# bindl = , switch:Lid Switch, exec, s$ipc lockScreen lock
+#Plugin shortcuts
+# This will toggle HyprExpo when SUPER+g is pressed
+
+### GESTURES
+gesture = 3, up, dispatcher, hyprexpo:expo
+# gesture = 3, pinch, special, magic
+gesture = 3, down, special, magic
+# gesture = 3, up, dispatcher, overview:toggle
+
+
+# 12. quick access to controls submap
+bind = $mainMod, comma, exec, $ipc controlCenter toggle
+bind = $mainMod, period, exec, $ipc settings toggle
+bind = , PRINT, exec, hyprshot -m active -m window --output-folder ~/Images/Screenshots
+bind = SHIFT, PRINT, exec, hyprshot -m region --output-folder ~/Images/Screenshots
+bind = ALT, PRINT, exec, hyprshot -m active -m output --output-folder ~/Images/Screenshots
+
+bind = $mainMod, M, exec, $ipc controlCenter toggle #& hyprctl dispatch submap quick-settings
+bind = $mainMod, M, submap, quick-settings
+bind = $mainMod, O, submap, open-apps
+
+# 13. Mouse binds
+
+submap = quick-settings, reset
+	bind = , V, exec, protonvpn-app & hyprctl dispatch submap vpn
+	bind = , S, exec, $ipc settings toggle
+	bind = , C, exec, $ipc plugin:clipper togglePanel 
+	bind = , P, exec, $ipc sessionMenu toggle
+	bind = $mainMod, L, exec, $ipc sessionMenu toggle
+	bind = , T, exec, $ipc systemMonitor toggle
+	bind = , M, exec, $ipc controlCenter toggle
+	bind = , D, exec, $ipc notifications toggleDND
+	bind = , A, exec, $ipc notifications dismissAll
+	bind = , N, exec, $ipc notifications toggleHistory & hyprctl dispatch submap notifications-sub
+	# bind = , L, exec, notify-send "layout switching" & hyprctl dispatch submap layouts
+	bind = , L, submap, layouts
+	# To Do bind clear and dnd toggles inside this shell
+	bind = SHIFT, B, exec, $ipc bar toggle
+	bind = , P, exec, $ipc wallpaper toggle
+	bind = , B, exec, $ipc bluetooth togglePanel & hyprctl dispatch submap bt-sub
+	# To Do add submenu for bt
+	bind = , W, exec, $ipc network togglePanel & hyprctl dispatch submap wifi-sub
+	bind = SHIFT, W, exec, $ipc wifi toggle # toggle wifi
+	bind = $mainMod, B, exec, $ipc battery togglePanel # toggle battery panel
+	bind = $mainMod, C, exec, $ipc calendar toggle
+	bind = , E, exec, nvim /home/venus/.config/hypr/basic/keybinds
+submap = reset
+
+submap = notifications-sub
+	bind = , D, exec, $ipc notifications toggleDND
+	bind = , S, exec, $ipc notifications toggleDND
+	bind = , Q, exec, $ipc notifications toggleDND
+	bind = , A, exec, $ipc notifications dismissAll
+	bind = CTRL, D, exec, $ipc notifications dismissAll
+	bind = SHIFT, D, exec, $ipc notifications dismissAll
+	bind = $mainMod, D, exec, $ipc notifications dismissAll
+	bind = , C, exec, $ipc notifications clear
+	bind = , catchall, exec, hyprctl dispatch submap reset && qs -c noctalia-shell ipc call notifications toggleHistory
+submap = reset
+
+submap = wifi-sub
+	$call = exec, $ipc wifi
+	bind = , T, $call toggle
+	bind = , S, $call togglePanel
+	bind = , D, $call disable
+	bind = , E, $call enable
+	bind = , R, exec, sudo systemctl restart iwd
+	bind = , catchall, exec, hyprctl dispatch submap reset && qs -c noctalia-shell ipc call network togglePanel
+submap = reset
+
+submap = bt-sub
+	$call = exec, $ipc bluetooth
+	bind = , T, $call toggle
+	bind = , S, $call togglePanel
+	bind = , D, $call disable
+	bind = , E, $call enable
+	bind = , H, exec, sh -c "bluetoothctl connect 88:92:CC:53:88:7E" && notify-send "connected to headphones"
+	bind = , J, exec, sh -c "bluetoothctl disconnect 88:92:CC:53:88:7E" && notify-send "disconnected from headphones"
+	bind = , P, exec, sh -c "bluetoothctl connect 64:9D:38:E0:4D:02" && notify-send "Connected to phone"
+	bind = , M, exec, sh -c "bluetoothctl disconnect 64:9D:38:E0:4D:02" && notify-send "Disconnected from phone"
+	# bind = CTRL, H, exec, bluetoothctl connect 88:92:CC:53:88:7E
+	# bind = , escape, submap, reset
+	bind = , catchall, exec, hyprctl dispatch submap reset && qs -c noctalia-shell ipc call bluetooth togglePanel
+submap = reset
+
+submap = vpn
+	$call = exec, protonvpn
+	bind = , O, $call-app
+	bind = , C, $call connect
+	bind = , D, $call disconnect
+	bind = , catchall, submap, reset
+submap = reset
+
+submap = open-apps, reset
+	bind = , S, exec, signal-desktop
+	bind = , D, exec, vesktop
+	bind = , F, exec, firefox
+	bind = , Q, exec, qutebrowser
+	bind = , M, exec, feishin
+	bind = , O, exec, obsidian
+	bind = , T, exec, thunderbird
+	bind = , R, exec, calibre
+	bind = , E, exec, darktable
+	bind = , catchall, submap, reset
+submap = reset
+
+submap = layouts, reset
+	bind = , D, exec, hyprctl general:layout dwindle
+	bind = , M, exec, hyprctl general:layout master
+submap = reset
+
+
+# 13. Misc tools.
+bind = ALT, SPACE, exec, $menu
+bind = $mainMod CTRL, L, exec, $ipc lockScreen lock
diff --git a/basic/keybinds.lua b/basic/keybinds.lua
new file mode 100644
index 0000000..e69de29
diff --git a/basic/looks.conf b/basic/looks.conf
deleted file mode 100644
index 98471a4..0000000
--- a/basic/looks.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-#####################
-### LOOK AND FEEL ###
-#####################
-
-# Refer to https://wiki.hypr.land/Configuring/Variables/
-
-# https://wiki.hypr.land/Configuring/Variables/#general
-general {
-    gaps_in = 3
-    gaps_out = 5
-
-    border_size = 1
-
-    # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = true
-
-    # Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = dwindle
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#decoration
-decoration {
-    rounding = 10
-    rounding_power = 2
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    shadow {
-        enabled = true
-        range = 4
-        render_power = 3
-        color = rgba(1a1a1aee)
-    }
-
-    # https://wiki.hypr.land/Configuring/Variables/#blur
-    blur {
-        enabled = true
-        size = 3
-        passes = 1
-
-        vibrancy = 0.1696
-    }
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves
-    #        NAME,           X0,   Y0,   X1,   Y1
-    bezier = easeOutQuint,   0.23, 1,    0.32, 1
-    bezier = easeInOutCubic, 0.65, 0.05, 0.36, 1
-    bezier = linear,         0,    0,    1,    1
-    bezier = almostLinear,   0.5,  0.5,  0.75, 1
-    bezier = quick,          0.15, 0,    0.1,  1
-
-    # Default animations, see https://wiki.hypr.land/Configuring/Animations/
-    #           NAME,          ONOFF, SPEED, CURVE,        [STYLE]
-    animation = global,        1,     10,    default
-    animation = border,        1,     5.39,  easeOutQuint
-    animation = windows,       1,     4.79,  easeOutQuint
-    animation = windowsIn,     1,     4.1,   easeOutQuint, popin 87%
-    animation = windowsOut,    1,     1.49,  linear,       popin 87%
-    animation = fadeIn,        1,     1.73,  almostLinear
-    animation = fadeOut,       1,     1.46,  almostLinear
-    animation = fade,          1,     3.03,  quick
-    animation = layers,        1,     3.81,  easeOutQuint
-    animation = layersIn,      1,     4,     easeOutQuint, fade
-    animation = layersOut,     1,     1.5,   linear,       fade
-    animation = fadeLayersIn,  1,     1.79,  almostLinear
-    animation = fadeLayersOut, 1,     1.39,  almostLinear
-    animation = workspaces,    1,     1.94,  almostLinear, fade
-    animation = workspacesIn,  1,     1.21,  almostLinear, fade
-    animation = workspacesOut, 1,     1.94,  almostLinear, fade
-    animation = zoomFactor,    1,     7,     quick
-}
-
-# Ref https://wiki.hypr.land/Configuring/Workspace-Rules/
-# "Smart gaps" / "No gaps when only"
-# uncomment all if you wish to use that.
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrule {
-#     name = no-gaps-wtv1
-#     match:float = false
-#     match:workspace = w[tv1]
-#
-#     border_size = 0
-#     rounding = 0
-# }
-#
-# windowrule {
-#     name = no-gaps-f1
-#     match:float = false
-#     match:workspace = f[1]
-#
-#     border_size = 0
-#     rounding = 0
-# }
-
-# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
-# dwindle {
-#     pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-#     preserve_split = true # You probably want this
-# }
-
-# See https://wiki.hypr.land/Configuring/Master-Layout/ for more
-master {
-    new_status = master
-}
-
-# https://wiki.hypr.land/Configuring/Variables/#misc
-misc {
-    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-}
-
-
-
diff --git a/hyprland.conf b/hyprland.conf
new file mode 100644
index 0000000..29abeb0
--- /dev/null
+++ b/hyprland.conf
@@ -0,0 +1,3 @@
+
+source = /home/venus/.config/hypr/noctalia/noctalia-colors.conf
+
diff --git a/hyprland.lua b/hyprland.lua
index d99d878..c15e1ab 100644
--- a/hyprland.lua
+++ b/hyprland.lua
@@ -2,24 +2,24 @@
 --- STARTUP  ---
 ----------------
 
-local terminal      = "kitty"
-local fileManager   = "dolphin"
-local menu          = "qs -c noctalia-shell ipc call launcher toggle"
-local browser       = "firefox"
-local menuBar       = "qs -c noctalia-shell"
-local shellWrapper  = "qs -c noctalia-shell"
-local blkmanager    = "udiskie"
-local email         = "thunderbird"
+_G.terminal      = "kitty"
+_G.fileManager   = "dolphin"
+_G.menu          = "qs -c noctalia-shell ipc call launcher toggle"
+_G.browser       = "firefox"
+_G.menuBar       = "qs -c noctalia-shell"
+_G.shellWrapper  = "qs -c noctalia-shell"
+_G.blkmanager    = "udiskie"
+_G.email         = "thunderbird"
 
 hl.on("hyprland.start", function()
 	hl.exec_cmd(menuBar)
 	hl.exec_cmd("systemctl") --user start hyprpolkitagent)
-	hl.exec_cmd("udiskie")
+	hl.exec_cmd(blkmanager)
 	hl.exec_cmd("hyprpm reload -n")
 	hl.exec_cmd("kdeconnectd")
-	hl.exec_cmd("hyprshell run &")
+	-- hl.exec_cmd("hyprshell run &")
 	hl.exec_cmd("[workspace special:discord silent] vesktop -m")
-	hl.exec_cmd("[workspace special:email silent] $email")
+	hl.exec_cmd("[workspace special:email silent]" .. email)
 	hl.exec_cmd("[workspace special:notes silent] obsidian")
 	hl.exec_cmd("protonmail-bridge") --no-window)
 end)
@@ -39,13 +39,13 @@ local basic = base .. "/basic"
 
 
 require("basic/looks")
---require(base .. "/noctalia/noctalia-colors.lua")
 --require(basic .. "/keybinds.lua")
 --require(basic .. "/windows.lua")
 --require(basic .. "/plugins.lua")
 --require(basic .. "/inputs.lua")
 require("basic/permissions")
 --require(base .. "/monitors.lua")
+--require(base .. "/noctalia/noctalia-colors.lua")
 ----wayland rules in basic/windows.lua
 
 --require("base/noctalia/noctalia-colors.lua")