Merge pull request #300 from JaKooLit/development

Pre-release stage: Development to Main

14 files changed, 314 insertions, 717 deletions

diff --git a/config/rofi/.current_wallpaper b/config/rofi/.current_wallpaper
index f2470dcf..6d4a09c3 120000
--- a/config/rofi/.current_wallpaper
+++ b/config/rofi/.current_wallpaper
@@ -1 +1 @@
-/home/ja/Pictures/wallpapers/Fantasy-Waterfall.png
\ No newline at end of file
+/home/ja/Pictures/wallpapers/Scifi-Room.png
\ No newline at end of file
diff --git a/config/rofi/config-calc.rasi b/config/rofi/config-calc.rasi
new file mode 100644
index 00000000..bcb0f665
--- /dev/null
+++ b/config/rofi/config-calc.rasi
@@ -0,0 +1,22 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Main Config Calculator */
+/* Submitted by: https://github.com/JosephArmas */
+
+@import "~/.config/rofi/config.rasi" 
+
+/* ---- Entry ---- */
+entry {
+  width: 27%;
+  placeholder: "🧮 Calculate";
+}
+
+/* ---- Window ---- */
+window {
+    width:	30%;
+}
+
+/* ---- Message ---- */
+textbox {
+    background-color:            @selected;
+    text-color:                  @background;
+}
\ No newline at end of file
diff --git a/config/rofi/config-clipboard.rasi b/config/rofi/config-clipboard.rasi
index 9573262e..2a002a29 100644
--- a/config/rofi/config-clipboard.rasi
+++ b/config/rofi/config-clipboard.rasi
@@ -1,10 +1,16 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Clipboard Config (long) - Clipboard */
+/* Clipboard Config - Clipboard */
 
-@import "~/.config/rofi/config-long.rasi" 
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Entry ---- */
 entry {
-  width: 45%;
+  width: 37%;
   placeholder: "📋 Search Clipboard **note** 👀 CTRL Del - Cliphist del or Alt Del - cliphist wipe";
 }
+
+/* ---- Listview ---- */
+listview {
+  columns: 1;
+  lines: 8;
+}
\ No newline at end of file
diff --git a/config/rofi/config-emoji.rasi b/config/rofi/config-emoji.rasi
index 3f0be0e4..8aca6aa2 100644
--- a/config/rofi/config-emoji.rasi
+++ b/config/rofi/config-emoji.rasi
@@ -1,10 +1,16 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) - emoji */
+/* Main Config - emoji */
 
-@import "~/.config/rofi/config-long.rasi" 
+@import "~/.config/rofi/config.rasi" 
 
 /* ---- Entry ---- */
 entry {
-  width: 45%;
+  width: 37%;
   placeholder: "💫 Search Emoji's  **note** 👀 Click or Return to choose | Ctrl V to Paste";
 }
+
+/* ---- Listview ---- */
+listview {
+  columns: 1;
+  lines: 8;
+}
\ No newline at end of file
diff --git a/config/rofi/config-long.rasi b/config/rofi/config-long.rasi
deleted file mode 100644
index 2341e5f6..00000000
--- a/config/rofi/config-long.rasi
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Main Config (long) */
-
-@import "~/.config/rofi/config.rasi" 
-
-/* ---- Window ---- */
-window {
-  width: 50%;
-}
-
-/* ---- Entry ---- */
-entry {
-  placeholder: "🔎 Search       ";
-}
-
-/* ---- Listview ---- */
-listview {
-  columns: 1;
-  lines: 8;
-  scrollbar: true;
-}
\ No newline at end of file
diff --git a/config/rofi/config-rofi-Beats-menu.rasi b/config/rofi/config-rofi-Beats-menu.rasi
index 6cdd6e99..fd2e194e 100644
--- a/config/rofi/config-rofi-Beats-menu.rasi
+++ b/config/rofi/config-rofi-Beats-menu.rasi
@@ -18,5 +18,5 @@ window {
 listview {
   fixed-columns: false;
   colums: 1;
-  lines: 2;
-}
\ No newline at end of file
+  lines: 3;
+}
diff --git a/config/rofi/config-rofi-Beats.rasi b/config/rofi/config-rofi-Beats.rasi
index a45006c8..2bf99e2b 100644
--- a/config/rofi/config-rofi-Beats.rasi
+++ b/config/rofi/config-rofi-Beats.rasi
@@ -11,5 +11,4 @@ entry {
 /* ---- Listview ---- */
 listview {
   lines: 6;
-  scrollbar: true;
 }
diff --git a/config/rofi/config-waybar-style.rasi b/config/rofi/config-waybar-style.rasi
index 9dc8b74c..3be6c9e9 100644
--- a/config/rofi/config-waybar-style.rasi
+++ b/config/rofi/config-waybar-style.rasi
@@ -23,5 +23,4 @@ entry {
 listview {
   columns: 2;
   lines: 6;
-  scrollbar: true;
 }
diff --git a/config/rofi/config-zsh-theme.rasi b/config/rofi/config-zsh-theme.rasi
index ffa8bd14..2684d109 100644
--- a/config/rofi/config-zsh-theme.rasi
+++ b/config/rofi/config-zsh-theme.rasi
@@ -39,9 +39,8 @@ entry {
 /* ---- Listview ---- */
 listview {
   columns: 3;
-  lines: 4;
+  lines: 3;
   spacing: 4px;
-  scrollbar: false;
   border-radius: 10px;
 }
 
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
index 2042f9c5..59576860 100755
--- a/config/rofi/config.rasi
+++ b/config/rofi/config.rasi
@@ -1,236 +1,14 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1080p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+	font: "Fira Code SemiBold 12";
 }
 
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 14";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 14";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/master-config.rasi b/config/rofi/master-config.rasi
new file mode 100644
index 00000000..fe24cd61
--- /dev/null
+++ b/config/rofi/master-config.rasi
@@ -0,0 +1,233 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Master Config */
+
+/* ---- Configuration ---- */
+
+configuration {
+	modi:                       "drun,run,filebrowser";
+    show-icons:                 true;
+    display-drun:               "Apps";
+    display-run:                "Run";
+    display-filebrowser:        "Files";
+    display-window:             "Windows";
+	drun-display-format:        "{name}";
+	hover-select:               true;
+	me-select-entry:            "MouseSecondary";
+    me-accept-entry:            "MousePrimary";
+	window-format:              "{w} · {c} · {t}";
+	dpi:						1;
+}
+
+/* ---- Load wallust colors ---- */
+@theme "~/.config/rofi/wallust/colors-rofi.rasi"
+
+/* ---- Global Properties ---- */
+* {
+
+    background-alt:              @selected-active-background; // Buttons background
+    selected:                    @selected-urgent-background; // Button selected
+    active:                      @selected-normal-background; // Window activated
+    urgent:                      @selected; // When hovering the activated window (maybe more?)
+
+    text-selected:               @background;
+    text-color:                  @foreground;
+    border-color:                @selected;
+}
+
+/* ---- Window ---- */
+window {
+    // Default
+    enabled:                    true;
+    fullscreen:                 false;
+    transparency:               "real";
+    cursor:                     "default";
+    spacing:                    0px;
+    border:                     2px;
+    border-radius:              30px;
+    location:                   center;
+    anchor:                     center;
+
+    // Style Values
+    width:                      50%;
+    background-color:           @background;
+}
+
+/* ----- Main Box ----- */
+mainbox {
+	padding:					 15px;
+    enabled:                     true;
+    orientation:                 vertical;
+    children:                    [ "inputbar", "listbox" ];
+    background-color:            transparent;
+}
+
+
+/* ---- Inputbar ---- */
+inputbar {
+    enabled:                     true;
+    padding:                     10px 10px 100px 10px;
+    margin:                      10px;
+    background-color:            transparent;
+    border-radius:               25px;
+    orientation:                 horizontal;
+    children:                    ["entry", "dummy", "mode-switcher" ];
+    background-image:            url("~/.config/rofi/.current_wallpaper", width);
+}
+
+/* ---- Entry input ---- */
+entry {
+    enabled:                     true;
+    expand:                      false;
+    width:                       20%;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            @selected;
+    text-color:                  @text-selected;
+    cursor:                      text;
+    placeholder:                 "🖥️ Search "; // << Search symbol
+    placeholder-color:           inherit;
+}
+
+/* ---- Listbox ---- */
+listbox {
+    spacing:                     10px;
+    padding:                     10px;
+    background-color:            transparent;
+    orientation:                 vertical;
+    children:                    [ "message", "listview" ];
+}
+
+/* ---- Listview ---- */
+listview {
+    enabled:                     true;
+    columns:                     2;
+    lines:                       6;
+    cycle:                       true;
+    dynamic:                     true;
+    scrollbar:                   true;
+    layout:                      vertical;
+    reverse:                     false;
+    fixed-height:                false;
+    fixed-columns:               true;    
+    spacing:                     10px;
+    background-color:            transparent;
+
+//  Adapt rofi theme
+    border:                      0px;
+}
+
+/* ---- Dummy ---- */
+dummy {
+    expand:                      true;
+    background-color:            transparent;
+}
+
+/* ---- Mode Switcher ---- */
+mode-switcher{
+    enabled:                     true;
+    spacing:                     10px;
+    background-color:            transparent;
+}
+button {
+    width:                       5%;
+    padding:                     12px;
+    border-radius:               12px;
+    background-color:            @text-selected;
+    text-color:                  @text-color;
+    cursor:                      pointer;
+}
+button selected {
+    background-color:            @selected;
+    text-color:                  @text-selected;
+}
+
+/* ---- Scrollbar ---- */
+scrollbar {
+    width:        4px ;
+    border:       0;
+    handle-color: @border-color;
+    handle-width: 8px ;
+    padding:      0;
+}
+
+/* ---- Elements ---- */
+element {
+    enabled:                     true;
+    spacing:                     10px;
+    padding:                     10px;
+    border-radius:               12px;
+    background-color:            transparent;
+    cursor:                      pointer;
+}
+
+element normal.normal {
+    background-color:            inherit;
+    text-color:                  inherit;
+}
+element normal.urgent {
+    background-color:            @urgent;
+    text-color:                  @foreground;
+}
+element normal.active {
+    background-color:            @active;
+    text-color:                  @foreground;
+}
+
+element selected.normal {
+    background-color:            @selected;
+    text-color:                  @text-selected;
+}
+element selected.urgent {
+    background-color:            @urgent;
+    text-color:                  @text-selected;
+}
+element selected.active {
+    background-color:            @urgent;
+    text-color:                  @text-selected;
+}
+// Adapt rofi theme
+element alternate.normal {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element alternate.urgent {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element alternate.active {
+    background-color:            transparent;
+    text-color:                  inherit;
+}
+element-icon {
+    background-color:            transparent;
+    text-color:                  inherit;
+    size:                        36px;
+    cursor:                      inherit;
+}
+element-text {
+    background-color:            transparent;
+    text-color:                  inherit;
+    cursor:                      inherit;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+}
+
+/* ---- Message ---- */
+message {
+    background-color:            transparent;
+    border:                      0px;
+}
+textbox {
+    padding:                     12px;
+    border-radius:               10px;
+    background-color:            @background-alt;
+    text-color:                  @background;
+    vertical-align:              0.5;
+    horizontal-align:            0.0;
+}
+error-message {
+    padding:                     12px;
+    border-radius:               20px;
+    background-color:            @background-alt;
+    text-color:                  @background;
+}
diff --git a/config/rofi/resolution/1080p/config.rasi b/config/rofi/resolution/1080p/config.rasi
index 2042f9c5..59576860 100755
--- a/config/rofi/resolution/1080p/config.rasi
+++ b/config/rofi/resolution/1080p/config.rasi
@@ -1,236 +1,14 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1080p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 12";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load wallust colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
-}
-
-/* ---- Window ---- */
-window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      50%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
-}
-
-/* ---- Entry input ---- */
-entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       20%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
-}
-
-/* ---- Listview ---- */
-listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       6;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+	font: "Fira Code SemiBold 12";
 }
 
-/* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
-button {
-    width:                       5%;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
-}
-
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 14";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 14";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/resolution/1440p/config.rasi b/config/rofi/resolution/1440p/config.rasi
index 3f7a2dc6..b72c1001 100755
--- a/config/rofi/resolution/1440p/config.rasi
+++ b/config/rofi/resolution/1440p/config.rasi
@@ -1,235 +1,33 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Main Config 1440p */
 
-/* ---- Configuration ---- */
+@import "~/.config/rofi/master-config.rasi" 
 
+/* ---- Configuration ---- */
 configuration {
-	modi:                       "drun,run,filebrowser";
-	font:                       "Fira Code SemiBold 13";
-    show-icons:                 true;
-    display-drun:               "Apps";
-    display-run:                "Run";
-    display-filebrowser:        "Files";
-    display-window:             "Windows";
-	drun-display-format:        "{name}";
-	hover-select:               true;
-	me-select-entry:            "MouseSecondary";
-    me-accept-entry:            "MousePrimary";
-	window-format:              "{w} · {c} · {t}";
-	dpi:						1;
-}
-
-/* ---- Load pywal colors ---- */
-@theme "~/.config/rofi/wallust/colors-rofi.rasi"
-
-/* ---- Global Properties ---- */
-* {
-
-    background-alt:              @selected-active-background; // Buttons backgroundr
-    selected:                    @selected-urgent-background; // Button selected
-    active:                      @selected-normal-background; // Window activated
-    urgent:                      @selected; // When hovering the activated window (maybe more?)
-
-    text-selected:               @background;
-    text-color:                  @foreground;
-    border-color:                @selected;
+	font:	"Fira Code SemiBold 13";
 }
-
 /* ---- Window ---- */
 window {
-    // Default
-    enabled:                    true;
-    fullscreen:                 false;
-    transparency:               "real";
-    cursor:                     "default";
-    spacing:                    0px;
-    border:                     2px;
-    border-radius:              30px;
-    location:                   center;
-    anchor:                     center;
-
-    // Style Values
-    width:                      40%;
-    background-color:           @background;
-}
-
-/* ----- Main Box ----- */
-mainbox {
-	padding:					 15px;
-    enabled:                     true;
-    orientation:                 vertical;
-    children:                    [ "inputbar", "listbox" ];
-    background-color:            transparent;
-}
-
-
-/* ---- Inputbar ---- */
-inputbar {
-    enabled:                     true;
-    padding:                     10px 10px 200px 10px;
-    margin:                      10px;
-    background-color:            transparent;
-    border-radius:               25px;
-    orientation:                 horizontal;
-    children:                    ["entry", "dummy", "mode-switcher" ];
-    background-image:            url("~/.config/rofi/.current_wallpaper", width);
+    width:	40%;
 }
 
 /* ---- Entry input ---- */
 entry {
-    enabled:                     true;
-    expand:                      false;
-    width:                       18%;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            @selected;
-    text-color:                  @text-selected;
-    cursor:                      text;
-    placeholder:                 "🖥️ Search "; // << Search symbol
-    placeholder-color:           inherit;
-}
-
-/* ---- Listbox ---- */
-listbox {
-    spacing:                     10px;
-    padding:                     10px;
-    background-color:            transparent;
-    orientation:                 vertical;
-    children:                    [ "message", "listview" ];
+    width:	18%;
 }
 
 /* ---- Listview ---- */
 listview {
-    enabled:                     true;
-    columns:                     2;
-    lines:                       8;
-    cycle:                       true;
-    dynamic:                     true;
-    scrollbar:                   false;
-    layout:                      vertical;
-    reverse:                     false;
-    fixed-height:                false;
-    fixed-columns:               true;    
-    spacing:                     10px;
-    background-color:            transparent;
-
-//  Adapt rofi theme
-    border:                      0px;
-}
-
-/* ---- Dummy ---- */
-dummy {
-    expand:                      true;
-    background-color:            transparent;
+    lines:	8;
 }
 
 /* ---- Mode Switcher ---- */
-mode-switcher{
-    enabled:                     true;
-    spacing:                     10px;
-    background-color:            transparent;
-}
 button {
-    width:                       110px;
-    padding:                     12px;
-    border-radius:               12px;
-    background-color:            @text-selected;
-    text-color:                  @text-color;
-    cursor:                      pointer;
-}
-button selected {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-
-/* ---- Scrollbar ---- */
-scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @border-color;
-    handle-width: 8px ;
-    padding:      0;
-}
-
-/* ---- Elements ---- */
-element {
-    enabled:                     true;
-    spacing:                     10px;
-    padding:                     10px;
-    border-radius:               12px;
-    background-color:            transparent;
-    cursor:                      pointer;
+    width:	110px;
 }
 
-element normal.normal {
-    background-color:            inherit;
-    text-color:                  inherit;
-}
-element normal.urgent {
-    background-color:            @urgent;
-    text-color:                  @foreground;
-}
-element normal.active {
-    background-color:            @active;
-    text-color:                  @foreground;
-}
-
-element selected.normal {
-    background-color:            @selected;
-    text-color:                  @text-selected;
-}
-element selected.urgent {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-element selected.active {
-    background-color:            @urgent;
-    text-color:                  @text-selected;
-}
-// Adapt rofi theme
-element alternate.normal {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.urgent {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element alternate.active {
-    background-color:            transparent;
-    text-color:                  inherit;
-}
-element-icon {
-    background-color:            transparent;
-    text-color:                  inherit;
-    size:                        36px;
-    cursor:                      inherit;
-}
 element-text {
-    background-color:            transparent;
-    font:                       "Fira Code SemiBold 16";
-    text-color:                  inherit;
-    cursor:                      inherit;
-    vertical-align:              0.5;
-    horizontal-align:            0.0;
-
+    font:	"Fira Code SemiBold 16";
 }
 
-/* ---- Message ---- */
-message {
-    background-color:            transparent;
-    border:                      0px;
-}
-textbox {
-    padding:                     12px;
-    border-radius:               10px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-    vertical-align:              0.5;
-}
-error-message {
-    padding:                     12px;
-    border-radius:               20px;
-    background-color:            @background-alt;
-    text-color:                  @background;
-}
diff --git a/config/rofi/wallust/colors-rofi.rasi b/config/rofi/wallust/colors-rofi.rasi
index 15a0b742..d1361a1e 100644
--- a/config/rofi/wallust/colors-rofi.rasi
+++ b/config/rofi/wallust/colors-rofi.rasi
@@ -1,28 +1,28 @@
 * {
-active-background: #A38A46;
-active-foreground: #D1F8FD;
-normal-background: #060402;
-normal-foreground: #D1F8FD;
-urgent-background: #CCBA98;
-urgent-foreground: #D1F8FD;
+active-background: #112D69;
+active-foreground: #C8DFF1;
+normal-background: #030915;
+normal-foreground: #C8DFF1;
+urgent-background: #386CB1;
+urgent-foreground: #C8DFF1;
 
-alternate-active-background: #94A7B8;
-alternate-active-foreground: #D1F8FD;
-alternate-normal-background: #060402;
-alternate-normal-foreground: #D1F8FD;
-alternate-urgent-background: #060402;
-alternate-urgent-foreground: #D1F8FD;
+alternate-active-background: #77659C;
+alternate-active-foreground: #C8DFF1;
+alternate-normal-background: #030915;
+alternate-normal-foreground: #C8DFF1;
+alternate-urgent-background: #030915;
+alternate-urgent-foreground: #C8DFF1;
 
-selected-active-background: #A38A46;
-selected-active-foreground: #D1F8FD;
-selected-normal-background: #B5EDF4;
-selected-normal-foreground: #D1F8FD;
-selected-urgent-background: #CCBA98;
-selected-urgent-foreground: #D1F8FD;
+selected-active-background: #112D69;
+selected-active-foreground: #C8DFF1;
+selected-normal-background: #A9C9E3;
+selected-normal-foreground: #C8DFF1;
+selected-urgent-background: #386CB1;
+selected-urgent-foreground: #C8DFF1;
 
-background-color: #060402;
+background-color: #030915;
 background: rgba(0,0,0,0.7);
-foreground: #B5EDF4;
-border-color: #A38A46;
+foreground: #A9C9E3;
+border-color: #112D69;
 }