diff --git a/hyprland.conf b/hyprland.conf
index d067f96..fb703ca 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -88,8 +88,8 @@ env = HYPRCURSOR_SIZE,24
 
 # https://wiki.hypr.land/Configuring/Variables/#general
 general {
-    gaps_in = 5
-    gaps_out = 5
+    gaps_in = 7
+    gaps_out = 7
 
     border_size = 2
 
diff --git a/windowrules.conf b/windowrules.conf
index 456cc59..4f91f2a 100644
--- a/windowrules.conf
+++ b/windowrules.conf
@@ -14,3 +14,62 @@
 # It's here as a reference or for quick triage of xwayland ap
 #windowrule = noblur, xwayland:1
 
+
+# Jetbrains rules
+windowrule {
+	name = float-jb-windows
+	match:tag = +jb
+
+	float = on
+}
+windowrule {
+	name = focus-jb-windows
+	match:tag = jb
+
+	stay_focused = on
+}
+
+windowrule {
+	name = jb-no-initialfocus
+	match:tag = jb
+
+	no_initial_focus = on
+}
+windowrule {
+	name = jb-focus-on-activate
+	match:class = ^jetbrains-(?!toolbox)
+	
+	focus_on_activate = on
+}
+# Center popups except context menu
+windowrule {
+	name = center-popups
+	match:class = ^jetbrains-(?!toolbox)
+	match:title = ^(?!win.*)
+
+	move = 30% 30%
+	float = on
+}
+windowrule {
+	name = float-context-menu
+	match:class = ^jetbrains-(?!toolbox)
+	match:title = ^(?!win.*)
+
+	float = on
+	size = 40% 40%
+}
+# Fix tab dragging
+windowrule {
+	name = tab-drag-no-initial-focus
+	match:class = ^(.*jetbrains.*)$
+	match:title = ^\\s$
+
+	no_initial_focus = on
+}
+windowrule {
+	name = no-focus-tab-drag
+	match:class = ^(.*jetbrains.*)$
+	match:title = ^\\s$
+
+	no_focus = on
+}