diff --git a/.settings/rofi-border.rasi b/.settings/rofi-border.rasi
index e533468..cb9f3cd 100644
--- a/.settings/rofi-border.rasi
+++ b/.settings/rofi-border.rasi
@@ -1 +1,4 @@
-* { border-width: 3px; }
\ No newline at end of file
+* {
+    border-width:   2px;
+    border-radius:  15px;
+}
diff --git a/hypr/conf/windows/default.conf b/hypr/conf/windows/default.conf
index 9ac7993..b880c5d 100644
--- a/hypr/conf/windows/default.conf
+++ b/hypr/conf/windows/default.conf
@@ -6,7 +6,7 @@
 general {
     gaps_in = 10
     gaps_out = 14
-    border_size = 3
+    border_size = 2
     col.active_border = $color11
     col.inactive_border = rgba(ffffffff)
     layout = dwindle
diff --git a/rofi/config-cliphist.rasi b/rofi/config-cliphist.rasi
index c86b82a..c060a10 100644
--- a/rofi/config-cliphist.rasi
+++ b/rofi/config-cliphist.rasi
@@ -43,7 +43,7 @@ configuration {
 window {
     width:                        400px;
     x-offset:                     -14px;
-    y-offset:                     65px;
+    y-offset:                     14px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -56,7 +56,7 @@ window {
     anchor:                       northeast;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -120,6 +120,7 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
+    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -160,7 +161,8 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -170,7 +172,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-compact.rasi b/rofi/config-compact.rasi
index 9bd9557..422f047 100644
--- a/rofi/config-compact.rasi
+++ b/rofi/config-compact.rasi
@@ -56,7 +56,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -120,6 +120,7 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
+    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -160,7 +161,8 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -170,7 +172,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-power.rasi b/rofi/config-power.rasi
index 8a617c4..d36d252 100644
--- a/rofi/config-power.rasi
+++ b/rofi/config-power.rasi
@@ -56,7 +56,7 @@ window {
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -132,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -170,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-screenshot.rasi b/rofi/config-screenshot.rasi
index f2d5cc8..de49e30 100644
--- a/rofi/config-screenshot.rasi
+++ b/rofi/config-screenshot.rasi
@@ -56,7 +56,7 @@ window {
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -132,7 +132,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -170,7 +170,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-short.rasi b/rofi/config-short.rasi
index e84f9f9..61fb1d1 100644
--- a/rofi/config-short.rasi
+++ b/rofi/config-short.rasi
@@ -57,7 +57,7 @@ window {
     anchor:                       northeast;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -133,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -171,7 +171,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-themes.rasi b/rofi/config-themes.rasi
index f999c1c..fc7b340 100644
--- a/rofi/config-themes.rasi
+++ b/rofi/config-themes.rasi
@@ -43,7 +43,7 @@ configuration {
 window {
     width:                        400px;
     x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -56,7 +56,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -120,6 +120,7 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
+    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -160,7 +161,8 @@ listview {
     padding:                      10px;
     margin:                       0px;
     background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -170,7 +172,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }
 
diff --git a/rofi/config-wallpaper.rasi b/rofi/config-wallpaper.rasi
index 62f7f50..a218490 100644
--- a/rofi/config-wallpaper.rasi
+++ b/rofi/config-wallpaper.rasi
@@ -38,7 +38,7 @@ configuration {
 window {
     width:                        761px;
     x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
     spacing:                      0px;
     padding:                      0px;
     margin:                       0px; 
@@ -51,7 +51,7 @@ window {
     anchor:                       north;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -114,6 +114,7 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
+    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -126,7 +127,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -152,9 +153,10 @@ listview {
     padding:                      10px;
     margin:                       0px;
     fixed-height:                true;
-    fixed-columns:               true;    
+    fixed-columns:               true;
     background-color:             @background;
     border:                       0px;
+    border-radius:                0px;
 }
 
 /* ---- Element ---- */
@@ -164,7 +166,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
     orientation:                  vertical;
 }
diff --git a/rofi/config.rasi b/rofi/config.rasi
index 0618872..5a658ef 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -49,14 +49,14 @@ window {
     margin:                       0px; 
     color:                        #FFFFFF;
     border:                       @border-width;
-    border-color:                 #FFFFFF;
+    border-color:                 @foreground;
     cursor:                       "default";
     transparency:                 "real";
     location:                     center;
     anchor:                       center;
     fullscreen:                   false;
     enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             transparent;
 }
 
@@ -98,7 +98,7 @@ inputbar {
     text-color:                   @foreground;
     spacing:                      10px;
     padding:                      15px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border-color:                 @foreground;
     background-color:             @background;
     children:                     [ "textbox-prompt-colon", "entry" ];
@@ -120,6 +120,7 @@ entry {
     cursor:                       text;
     placeholder:                  "Search";
     placeholder-color:            inherit;
+    border-radius:                0px;
 }
 
 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{
 
 button {
     padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     background-color:             @background;
     text-color:                   inherit;
     cursor:                       pointer;
@@ -170,7 +171,7 @@ element {
     margin:                       5px;
     cursor:                       pointer;
     background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
     border:                       @border-width;
 }