diff --git a/.config/foot/colorscheme b/.config/foot/colorscheme
new file mode 100755
index 0000000..ede475e
--- /dev/null
+++ b/.config/foot/colorscheme
@@ -0,0 +1,33 @@
+[colors]
+# Base16 OneDark - foot color config
+# Scheme by Lalit Magant (http://github.com/tilal6991)
+
+background=282c34
+foreground=abb2bf
+
+# normal
+regular0=282c34
+regular1=e06c75
+regular2=98c379
+regular3=e5c07b
+regular4=61afef
+regular5=c678dd
+regular6=56b6c2
+regular7=abb2bf
+
+# bright
+bright0=545862
+bright1=d19a66
+bright2=353b45
+bright3=3e4451
+bright4=565c64
+bright5=b6bdca
+bright6=be5046
+bright7=c8ccd4
+
+# misc
+selection-background=abb2bf
+selection-foreground=282c34
+urls=565c64
+jump-labels=282c34 e5c07b
+scrollback-indicator=282c34 565c64
diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index dd73c90..ccb5e8a 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -34,9 +34,13 @@
 # selection-target=primary
 # workers=<number of logical CPUs>
 
+include=~/.config/foot/colorscheme
+
 [environment]
 # name=value
 
+
+
 [bell]
 # urgent=no
 # notify=no
@@ -111,6 +115,7 @@
 # search-box-match=<regular0> <regular3>     # black-on-yellow
 # urls=<regular3>
 
+
 [csd]
 # preferred=server
 # size=26
diff --git a/.config/mako/config b/.config/mako/config
new file mode 100644
index 0000000..a3a7e17
--- /dev/null
+++ b/.config/mako/config
@@ -0,0 +1,18 @@
+## Base16 OneDark
+# Author: Lalit Magant (http://github.com/tilal6991)
+#
+# You can use these variables anywhere in the mako configuration file.
+
+background-color=#282c34
+text-color=#abb2bf
+border-color=#61afef
+
+[urgency=low]
+background-color=#282c34
+text-color=#e5c07b
+border-color=#61afef
+
+[urgency=high]
+background-color=#282c34
+text-color=#e06c75
+border-color=#61afef
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index d0ab824..3712ddf 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -146,4 +146,4 @@ configuration {
   }
 }
 
-@theme "base16-gruvbox-dark-medium"
+@theme "colorscheme"
diff --git a/.config/sway/colorscheme b/.config/sway/colorscheme
new file mode 100644
index 0000000..839bf7f
--- /dev/null
+++ b/.config/sway/colorscheme
@@ -0,0 +1,22 @@
+## Base16 OneDark
+# Author: Lalit Magant (http://github.com/tilal6991)
+
+set $base00 #282c34
+set $base01 #353b45
+set $base02 #3e4451
+set $base03 #545862
+set $base04 #565c64
+set $base05 #abb2bf
+set $base06 #b6bdca
+set $base07 #c8ccd4
+set $base08 #e06c75
+set $base09 #d19a66
+set $base0A #e5c07b
+set $base0B #98c379
+set $base0C #56b6c2
+set $base0D #61afef
+set $base0E #c678dd
+set $base0F #be5046
+
+
+set $base04 #ffffff
diff --git a/.config/sway/config b/.config/sway/config
index 9363014..9e97d97 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -17,9 +17,9 @@ set $right l
 set $term foot 
 # Your preferred application launcher
 # Note: it's recommended that you pass the final command to sway
-set $menu bemenu-run | xargs swaymsg exec --
+#set $menu bemenu-run | xargs swaymsg exec --
 #set $menu tofi-run | xargs swaymsg exec --
-#set $menu rofi -show run | xargs swaymsg exec --
+set $menu rofi -show run | xargs swaymsg exec --
 
 ### Output configuration
 #
@@ -247,6 +247,7 @@ bindsym ctrl+alt+delete exec waylogout
 
 
 #include ~/.local/src/base16-sway/themes/base16-gruvbox-dark-medium.config
+include ~/.config/sway/colorscheme
 
 #
 # Status Bar:
@@ -261,28 +262,28 @@ bar {
     status_command sh $HOME/.local/scripts/sway-bar.sh -l
 
     colors {
-        #background $base00
-        #separator  $base01
-        #statusline $base04
+        background $base00
+        separator  $base01
+        statusline $base04
 
-        ## State             Border  BG      Text
-        #focused_workspace   $base05 $base0D $base00
-        #active_workspace    $base05 $base03 $base00
-        #inactive_workspace  $base03 $base01 $base05
-        #urgent_workspace    $base08 $base08 $base00
-        #binding_mode        $base00 $base0A $base00
+        # State             Border  BG      Text
+        focused_workspace   $base05 $base0D $base00
+        active_workspace    $base05 $base03 $base00
+        inactive_workspace  $base03 $base01 $base05
+        urgent_workspace    $base08 $base08 $base00
+        binding_mode        $base00 $base0A $base00
     }
 }
 
 
 # Basic color configuration using the Base16 variables for windows and borders.
 # Property Name         Border  BG      Text    Indicator Child Border
-#client.focused          $base05 $base0D $base00 $base0D $base0D
-#client.focused_inactive $base01 $base01 $base05 $base03 $base01
-#client.unfocused        $base01 $base00 $base05 $base01 $base01
-#client.urgent           $base08 $base08 $base00 $base08 $base08
-#client.placeholder      $base00 $base00 $base05 $base00 $base00
-#client.background       $base07
+client.focused          $base05 $base0D $base00 $base0D $base0D
+client.focused_inactive $base01 $base01 $base05 $base03 $base01
+client.unfocused        $base01 $base00 $base05 $base01 $base01
+client.urgent           $base08 $base08 $base00 $base08 $base08
+client.placeholder      $base00 $base00 $base05 $base00 $base00
+client.background       $base07
 
 #GTK theme
 set $gnome_schema "org.gnome.desktop.interface"
diff --git a/.local/share/rofi/themes/colorscheme.config b/.local/share/rofi/themes/colorscheme.config
new file mode 100644
index 0000000..0f8ad72
--- /dev/null
+++ b/.local/share/rofi/themes/colorscheme.config
@@ -0,0 +1,33 @@
+! Base16 OneDark
+! Author: Lalit Magant (http://github.com/tilal6991)
+
+! base00: #282c34
+! base01: #353b45
+! base02: #3e4451
+! base03: #545862
+! base04: #565c64
+! base05: #abb2bf
+! base06: #b6bdca
+! base07: #c8ccd4
+! base08: #e06c75
+! base09: #d19a66
+! base0A: #e5c07b
+! base0B: #98c379
+! base0C: #56b6c2
+! base0D: #61afef
+! base0E: #c678dd
+! base0F: #be5046
+
+! Enable the extended coloring options
+rofi.color-enabled: true
+
+! Property Name     BG       Border   Separator
+rofi.color-window:  #353b45, #353b45, #282c34
+
+! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
+rofi.color-normal:  #353b45, #abb2bf, #353b45, #353b45, #c8ccd4
+rofi.color-active:  #353b45, #61afef, #353b45, #353b45, #61afef
+rofi.color-urgent:  #353b45, #e06c75, #353b45, #353b45, #e06c75
+
+! Set the desired separator style
+rofi.separator-style: solid
diff --git a/.local/share/rofi/themes/colorscheme.rasi b/.local/share/rofi/themes/colorscheme.rasi
new file mode 100644
index 0000000..21c2620
--- /dev/null
+++ b/.local/share/rofi/themes/colorscheme.rasi
@@ -0,0 +1,150 @@
+/**
+ * Base16 OneDark ROFI Color theme
+ *
+ * Authors
+ *  Scheme: Lalit Magant (http://github.com/tilal6991)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
+ */
+
+* {
+    red:                         rgba ( 224, 108, 117, 100 % );
+    blue:                        rgba ( 97, 175, 239, 100 % );
+    lightfg:                     rgba ( 182, 189, 202, 100 % );
+    lightbg:                     rgba ( 53, 59, 69, 100 % );
+    foreground:                  rgba ( 171, 178, 191, 100 % );
+    background:                  rgba ( 40, 44, 52, 100 % );
+    background-color:            rgba ( 40, 44, 52, 0 % );
+    separatorcolor:              @foreground;
+    border-color:                @foreground;
+    selected-normal-foreground:  @lightbg;
+    selected-normal-background:  @lightfg;
+    selected-active-foreground:  @background;
+    selected-active-background:  @blue;
+    selected-urgent-foreground:  @background;
+    selected-urgent-background:  @red;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
+    active-background:           @background;
+    urgent-foreground:           @red;
+    urgent-background:           @background;
+    alternate-normal-foreground: @foreground;
+    alternate-normal-background: @lightbg;
+    alternate-active-foreground: @blue;
+    alternate-active-background: @lightbg;
+    alternate-urgent-foreground: @red;
+    alternate-urgent-background: @lightbg;
+    spacing:                     2;
+}
+window {
+    background-color: @background;
+    border:           1;
+    padding:          5;
+}
+mainbox {
+    border:           0;
+    padding:          0;
+}
+message {
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
+}
+textbox {
+    text-color:       @foreground;
+}
+listview {
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
+}
+element-text, element-icon {
+    background-color: inherit;
+    text-color:       inherit;
+}
+element {
+    border:           0;
+    padding:          1px ;
+}
+element normal.normal {
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}
+element normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+element normal.active {
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}
+element selected.normal {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+element selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}
+element selected.active {
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}
+element alternate.normal {
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}
+element alternate.urgent {
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}
+element alternate.active {
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}
+scrollbar {
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
+}
+sidebar {
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+}
+button {
+    spacing:          0;
+    text-color:       @normal-foreground;
+}
+button selected {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+inputbar {
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+case-indicator {
+    spacing:          0;
+    text-color:       @normal-foreground;
+}
+entry {
+    spacing:          0;
+    text-color:       @normal-foreground;
+}
+prompt {
+    spacing:          0;
+    text-color:       @normal-foreground;
+}
+textbox-prompt-colon {
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
+}