Update template formatting

101 files changed, 6363 insertions, 6060 deletions

diff --git a/themes/base16-3024.rasi b/themes/base16-3024.rasi
index acfad79..7b63b6b 100644
--- a/themes/base16-3024.rasi
+++ b/themes/base16-3024.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 3024 ROFI Color theme
- * User: Jan T. Sott (http://github.com/idleberg)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott (http://github.com/idleberg)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 165, 162, 162, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 219, 45, 32, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 1, 160, 228, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 214, 213, 212, 100 % );
     lightbg:                     rgba ( 58, 52, 50, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 165, 162, 162, 100 % );
     background:                  rgba ( 9, 3, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 214, 213, 212, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 9, 3, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 9, 3, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-apathy.rasi b/themes/base16-apathy.rasi
index 0341101..9b85664 100644
--- a/themes/base16-apathy.rasi
+++ b/themes/base16-apathy.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Apathy ROFI Color theme
- * User: Jannik Siebert (https://github.com/janniks)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jannik Siebert (https://github.com/janniks)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 129, 181, 172, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 62, 150, 136, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 150, 136, 62, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 167, 206, 200, 100 % );
     lightbg:                     rgba ( 11, 52, 45, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 129, 181, 172, 100 % );
     background:                  rgba ( 3, 26, 22, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 167, 206, 200, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 3, 26, 22, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 3, 26, 22, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-ashes.rasi b/themes/base16-ashes.rasi
index 6f63cf3..7f23c6d 100644
--- a/themes/base16-ashes.rasi
+++ b/themes/base16-ashes.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Ashes ROFI Color theme
- * User: Jannik Siebert (https://github.com/janniks)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jannik Siebert (https://github.com/janniks)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 199, 204, 209, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 199, 174, 149, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 174, 149, 199, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 223, 226, 229, 100 % );
     lightbg:                     rgba ( 57, 63, 69, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 199, 204, 209, 100 % );
     background:                  rgba ( 28, 32, 35, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 223, 226, 229, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 28, 32, 35, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 28, 32, 35, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-cave-light.rasi b/themes/base16-atelier-cave-light.rasi
index 8cef62d..880eee1 100644
--- a/themes/base16-atelier-cave-light.rasi
+++ b/themes/base16-atelier-cave-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Cave Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 88, 82, 96, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 190, 70, 120, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 87, 109, 219, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 38, 35, 42, 100 % );
     lightbg:                     rgba ( 226, 223, 231, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 88, 82, 96, 100 % );
     background:                  rgba ( 239, 236, 244, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 38, 35, 42, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 239, 236, 244, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 239, 236, 244, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-cave.rasi b/themes/base16-atelier-cave.rasi
index 58daa2a..ca2c842 100644
--- a/themes/base16-atelier-cave.rasi
+++ b/themes/base16-atelier-cave.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Cave ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 139, 135, 146, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 190, 70, 120, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 87, 109, 219, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 226, 223, 231, 100 % );
     lightbg:                     rgba ( 38, 35, 42, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 139, 135, 146, 100 % );
     background:                  rgba ( 25, 23, 28, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 226, 223, 231, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 25, 23, 28, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 25, 23, 28, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-dune-light.rasi b/themes/base16-atelier-dune-light.rasi
index 353b174..bc991b5 100644
--- a/themes/base16-atelier-dune-light.rasi
+++ b/themes/base16-atelier-dune-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Dune Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 110, 107, 94, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 215, 55, 55, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 102, 132, 225, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 41, 40, 36, 100 % );
     lightbg:                     rgba ( 232, 228, 207, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 110, 107, 94, 100 % );
     background:                  rgba ( 254, 251, 236, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 41, 40, 36, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 254, 251, 236, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 254, 251, 236, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-dune.rasi b/themes/base16-atelier-dune.rasi
index 269ae07..439e521 100644
--- a/themes/base16-atelier-dune.rasi
+++ b/themes/base16-atelier-dune.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Dune ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 166, 162, 140, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 215, 55, 55, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 102, 132, 225, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 228, 207, 100 % );
     lightbg:                     rgba ( 41, 40, 36, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 166, 162, 140, 100 % );
     background:                  rgba ( 32, 32, 29, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 228, 207, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 32, 32, 29, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 32, 32, 29, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-estuary-light.rasi b/themes/base16-atelier-estuary-light.rasi
index 21b58b0..30dbe95 100644
--- a/themes/base16-atelier-estuary-light.rasi
+++ b/themes/base16-atelier-estuary-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Estuary Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 95, 94, 78, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 186, 98, 54, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 54, 161, 102, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 48, 47, 39, 100 % );
     lightbg:                     rgba ( 231, 230, 223, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 95, 94, 78, 100 % );
     background:                  rgba ( 244, 243, 236, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 48, 47, 39, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 244, 243, 236, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 244, 243, 236, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-estuary.rasi b/themes/base16-atelier-estuary.rasi
index 854926f..fff2543 100644
--- a/themes/base16-atelier-estuary.rasi
+++ b/themes/base16-atelier-estuary.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Estuary ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 146, 145, 129, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 186, 98, 54, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 54, 161, 102, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 231, 230, 223, 100 % );
     lightbg:                     rgba ( 48, 47, 39, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 146, 145, 129, 100 % );
     background:                  rgba ( 34, 34, 27, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 231, 230, 223, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 34, 34, 27, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 34, 34, 27, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-forest-light.rasi b/themes/base16-atelier-forest-light.rasi
index 7f4cd73..fcc2124 100644
--- a/themes/base16-atelier-forest-light.rasi
+++ b/themes/base16-atelier-forest-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Forest Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 104, 97, 94, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 242, 44, 64, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 64, 126, 231, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 44, 36, 33, 100 % );
     lightbg:                     rgba ( 230, 226, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 104, 97, 94, 100 % );
     background:                  rgba ( 241, 239, 238, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 44, 36, 33, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 241, 239, 238, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 241, 239, 238, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-forest.rasi b/themes/base16-atelier-forest.rasi
index 50b50ce..65b7017 100644
--- a/themes/base16-atelier-forest.rasi
+++ b/themes/base16-atelier-forest.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Forest ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 168, 161, 159, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 242, 44, 64, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 64, 126, 231, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 230, 226, 224, 100 % );
     lightbg:                     rgba ( 44, 36, 33, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 168, 161, 159, 100 % );
     background:                  rgba ( 27, 25, 24, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 230, 226, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 27, 25, 24, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 27, 25, 24, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-heath-light.rasi b/themes/base16-atelier-heath-light.rasi
index d60e5ac..d484b1c 100644
--- a/themes/base16-atelier-heath-light.rasi
+++ b/themes/base16-atelier-heath-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Heath Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 105, 93, 105, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 202, 64, 43, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 81, 106, 236, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 41, 35, 41, 100 % );
     lightbg:                     rgba ( 216, 202, 216, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 105, 93, 105, 100 % );
     background:                  rgba ( 247, 243, 247, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 41, 35, 41, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 247, 243, 247, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 247, 243, 247, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-heath.rasi b/themes/base16-atelier-heath.rasi
index 67ee4ac..ea61334 100644
--- a/themes/base16-atelier-heath.rasi
+++ b/themes/base16-atelier-heath.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Heath ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 171, 155, 171, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 202, 64, 43, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 81, 106, 236, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 216, 202, 216, 100 % );
     lightbg:                     rgba ( 41, 35, 41, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 171, 155, 171, 100 % );
     background:                  rgba ( 27, 24, 27, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 216, 202, 216, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 27, 24, 27, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 27, 24, 27, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-lakeside-light.rasi b/themes/base16-atelier-lakeside-light.rasi
index a1d22f7..7acd7d6 100644
--- a/themes/base16-atelier-lakeside-light.rasi
+++ b/themes/base16-atelier-lakeside-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Lakeside Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 81, 109, 123, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 210, 45, 114, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 37, 127, 173, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 31, 41, 46, 100 % );
     lightbg:                     rgba ( 193, 228, 246, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 81, 109, 123, 100 % );
     background:                  rgba ( 235, 248, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 31, 41, 46, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 235, 248, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 235, 248, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-lakeside.rasi b/themes/base16-atelier-lakeside.rasi
index 9bb109d..1b4ee87 100644
--- a/themes/base16-atelier-lakeside.rasi
+++ b/themes/base16-atelier-lakeside.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Lakeside ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 126, 162, 180, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 210, 45, 114, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 37, 127, 173, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 193, 228, 246, 100 % );
     lightbg:                     rgba ( 31, 41, 46, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 126, 162, 180, 100 % );
     background:                  rgba ( 22, 27, 29, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 193, 228, 246, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 22, 27, 29, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 22, 27, 29, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-plateau-light.rasi b/themes/base16-atelier-plateau-light.rasi
index d49b6bd..9d2a592 100644
--- a/themes/base16-atelier-plateau-light.rasi
+++ b/themes/base16-atelier-plateau-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Plateau Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 88, 80, 80, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 202, 73, 73, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 114, 114, 202, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 41, 36, 36, 100 % );
     lightbg:                     rgba ( 231, 223, 223, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 88, 80, 80, 100 % );
     background:                  rgba ( 244, 236, 236, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 41, 36, 36, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 244, 236, 236, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 244, 236, 236, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-plateau.rasi b/themes/base16-atelier-plateau.rasi
index 12206eb..e6b518d 100644
--- a/themes/base16-atelier-plateau.rasi
+++ b/themes/base16-atelier-plateau.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Plateau ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 138, 133, 133, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 202, 73, 73, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 114, 114, 202, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 231, 223, 223, 100 % );
     lightbg:                     rgba ( 41, 36, 36, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 138, 133, 133, 100 % );
     background:                  rgba ( 27, 24, 24, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 231, 223, 223, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 27, 24, 24, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 27, 24, 24, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-savanna-light.rasi b/themes/base16-atelier-savanna-light.rasi
index 547a0a5..4e1bb8a 100644
--- a/themes/base16-atelier-savanna-light.rasi
+++ b/themes/base16-atelier-savanna-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Savanna Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 82, 96, 87, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 177, 97, 57, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 71, 140, 144, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 35, 42, 37, 100 % );
     lightbg:                     rgba ( 223, 231, 226, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 82, 96, 87, 100 % );
     background:                  rgba ( 236, 244, 238, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 35, 42, 37, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 236, 244, 238, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 236, 244, 238, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-savanna.rasi b/themes/base16-atelier-savanna.rasi
index 783087c..86e45b9 100644
--- a/themes/base16-atelier-savanna.rasi
+++ b/themes/base16-atelier-savanna.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Savanna ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 135, 146, 138, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 177, 97, 57, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 71, 140, 144, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 223, 231, 226, 100 % );
     lightbg:                     rgba ( 35, 42, 37, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 135, 146, 138, 100 % );
     background:                  rgba ( 23, 28, 25, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 223, 231, 226, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 23, 28, 25, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 23, 28, 25, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-seaside-light.rasi b/themes/base16-atelier-seaside-light.rasi
index 6307e48..fe9903d 100644
--- a/themes/base16-atelier-seaside-light.rasi
+++ b/themes/base16-atelier-seaside-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Seaside Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 94, 110, 94, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 230, 25, 60, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 61, 98, 245, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 36, 41, 36, 100 % );
     lightbg:                     rgba ( 207, 232, 207, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 94, 110, 94, 100 % );
     background:                  rgba ( 244, 251, 244, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 36, 41, 36, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 244, 251, 244, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 244, 251, 244, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-seaside.rasi b/themes/base16-atelier-seaside.rasi
index d2ba1d5..b9c24eb 100644
--- a/themes/base16-atelier-seaside.rasi
+++ b/themes/base16-atelier-seaside.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Seaside ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 140, 166, 140, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 230, 25, 60, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 61, 98, 245, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 207, 232, 207, 100 % );
     lightbg:                     rgba ( 36, 41, 36, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 140, 166, 140, 100 % );
     background:                  rgba ( 19, 21, 19, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 207, 232, 207, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 19, 21, 19, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 19, 21, 19, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-sulphurpool-light.rasi b/themes/base16-atelier-sulphurpool-light.rasi
index fa0c2ae..c2eacb5 100644
--- a/themes/base16-atelier-sulphurpool-light.rasi
+++ b/themes/base16-atelier-sulphurpool-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Sulphurpool Light ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 94, 102, 135, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 201, 73, 34, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 61, 143, 209, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 41, 50, 86, 100 % );
     lightbg:                     rgba ( 223, 226, 241, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 94, 102, 135, 100 % );
     background:                  rgba ( 245, 247, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 41, 50, 86, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 245, 247, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 245, 247, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-atelier-sulphurpool.rasi b/themes/base16-atelier-sulphurpool.rasi
index 6a0e72e..6068180 100644
--- a/themes/base16-atelier-sulphurpool.rasi
+++ b/themes/base16-atelier-sulphurpool.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Atelier Sulphurpool ROFI Color theme
- * User: Bram de Haan (http://atelierbramdehaan.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Bram de Haan (http://atelierbramdehaan.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 151, 157, 180, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 201, 73, 34, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 61, 143, 209, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 223, 226, 241, 100 % );
     lightbg:                     rgba ( 41, 50, 86, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 151, 157, 180, 100 % );
     background:                  rgba ( 32, 39, 70, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 223, 226, 241, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 32, 39, 70, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 32, 39, 70, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-bespin.rasi b/themes/base16-bespin.rasi
index b1b9a69..a8f841d 100644
--- a/themes/base16-bespin.rasi
+++ b/themes/base16-bespin.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Bespin ROFI Color theme
- * User: Jan T. Sott
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 138, 137, 134, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 207, 106, 76, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 94, 166, 234, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 157, 155, 151, 100 % );
     lightbg:                     rgba ( 54, 49, 46, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 138, 137, 134, 100 % );
     background:                  rgba ( 40, 33, 28, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 157, 155, 151, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 40, 33, 28, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 40, 33, 28, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-brewer.rasi b/themes/base16-brewer.rasi
index 9a1a73b..6933778 100644
--- a/themes/base16-brewer.rasi
+++ b/themes/base16-brewer.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Brewer ROFI Color theme
- * User: Timothée Poisot (http://github.com/tpoisot)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Timothée Poisot (http://github.com/tpoisot)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 183, 184, 185, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 227, 26, 28, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 49, 130, 189, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 218, 219, 220, 100 % );
     lightbg:                     rgba ( 46, 47, 48, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 183, 184, 185, 100 % );
     background:                  rgba ( 12, 13, 14, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 218, 219, 220, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 12, 13, 14, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 12, 13, 14, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-bright.rasi b/themes/base16-bright.rasi
index 8be0d17..b7a4349 100644
--- a/themes/base16-bright.rasi
+++ b/themes/base16-bright.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Bright ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 224, 224, 224, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 1, 32, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 111, 179, 210, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 245, 245, 245, 100 % );
     lightbg:                     rgba ( 48, 48, 48, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 224, 224, 224, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 245, 245, 245, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-brushtrees-dark.rasi b/themes/base16-brushtrees-dark.rasi
index 1524662..b993d3f 100644
--- a/themes/base16-brushtrees-dark.rasi
+++ b/themes/base16-brushtrees-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Brush Trees Dark ROFI Color theme
- * User: Abraham White <abelincoln.white@gmail.com>
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Abraham White <abelincoln.white@gmail.com>
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 176, 197, 200, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 179, 134, 134, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 134, 140, 179, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 201, 219, 220, 100 % );
     lightbg:                     rgba ( 90, 109, 122, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 176, 197, 200, 100 % );
     background:                  rgba ( 72, 88, 103, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 201, 219, 220, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 72, 88, 103, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 72, 88, 103, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-brushtrees.rasi b/themes/base16-brushtrees.rasi
index b1f0c55..7d41eb0 100644
--- a/themes/base16-brushtrees.rasi
+++ b/themes/base16-brushtrees.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Brush Trees ROFI Color theme
- * User: Abraham White <abelincoln.white@gmail.com>
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Abraham White <abelincoln.white@gmail.com>
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 109, 130, 142, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 179, 134, 134, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 134, 140, 179, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 90, 109, 122, 100 % );
     lightbg:                     rgba ( 201, 219, 220, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 109, 130, 142, 100 % );
     background:                  rgba ( 227, 239, 239, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 90, 109, 122, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 227, 239, 239, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 227, 239, 239, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-chalk.rasi b/themes/base16-chalk.rasi
index 632ea82..c559404 100644
--- a/themes/base16-chalk.rasi
+++ b/themes/base16-chalk.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Chalk ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 208, 208, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 159, 177, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 111, 194, 239, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 32, 32, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 208, 208, 100 % );
     background:                  rgba ( 21, 21, 21, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 21, 21, 21, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 21, 21, 21, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-circus.rasi b/themes/base16-circus.rasi
index 03c9a3c..15dc3ff 100644
--- a/themes/base16-circus.rasi
+++ b/themes/base16-circus.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Circus ROFI Color theme
- * User: Stephan Boyer (https://github.com/stepchowfun) and Esther Wang (https://github.com/ewang12)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Stephan Boyer (https://github.com/stepchowfun) and Esther Wang (https://github.com/ewang12)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 167, 167, 167, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 220, 101, 125, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 99, 158, 228, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 128, 128, 128, 100 % );
     lightbg:                     rgba ( 32, 32, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 167, 167, 167, 100 % );
     background:                  rgba ( 25, 25, 25, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 128, 128, 128, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 25, 25, 25, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 25, 25, 25, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-classic-dark.rasi b/themes/base16-classic-dark.rasi
index 753d565..689d796 100644
--- a/themes/base16-classic-dark.rasi
+++ b/themes/base16-classic-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Classic Dark ROFI Color theme
- * User: Jason Heeris (http://heeris.id.au)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jason Heeris (http://heeris.id.au)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 208, 208, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 172, 65, 66, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 106, 159, 181, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 32, 32, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 208, 208, 100 % );
     background:                  rgba ( 21, 21, 21, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 21, 21, 21, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 21, 21, 21, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-classic-light.rasi b/themes/base16-classic-light.rasi
index 39b6698..bcab178 100644
--- a/themes/base16-classic-light.rasi
+++ b/themes/base16-classic-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Classic Light ROFI Color theme
- * User: Jason Heeris (http://heeris.id.au)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jason Heeris (http://heeris.id.au)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 48, 48, 48, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 172, 65, 66, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 106, 159, 181, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 32, 32, 32, 100 % );
     lightbg:                     rgba ( 224, 224, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 48, 48, 48, 100 % );
     background:                  rgba ( 245, 245, 245, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 32, 32, 32, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 245, 245, 245, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 245, 245, 245, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-codeschool.rasi b/themes/base16-codeschool.rasi
index 3dc45dd..03432c8 100644
--- a/themes/base16-codeschool.rasi
+++ b/themes/base16-codeschool.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Codeschool ROFI Color theme
- * User: blockloop
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: blockloop
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 158, 167, 166, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 42, 84, 145, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 72, 77, 121, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 167, 207, 163, 100 % );
     lightbg:                     rgba ( 28, 54, 87, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 158, 167, 166, 100 % );
     background:                  rgba ( 35, 44, 49, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 167, 207, 163, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 35, 44, 49, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 35, 44, 49, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-cupcake.rasi b/themes/base16-cupcake.rasi
index 8ac1764..236a459 100644
--- a/themes/base16-cupcake.rasi
+++ b/themes/base16-cupcake.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Cupcake ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 139, 129, 152, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 213, 126, 133, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 114, 151, 185, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 114, 103, 126, 100 % );
     lightbg:                     rgba ( 242, 241, 244, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 139, 129, 152, 100 % );
     background:                  rgba ( 251, 241, 242, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 114, 103, 126, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 251, 241, 242, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 251, 241, 242, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-cupertino.rasi b/themes/base16-cupertino.rasi
index f41f6e5..9fb1090 100644
--- a/themes/base16-cupertino.rasi
+++ b/themes/base16-cupertino.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Cupertino ROFI Color theme
- * User: Defman21
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Defman21
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 64, 64, 64, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 196, 26, 21, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 0, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 64, 64, 64, 100 % );
     lightbg:                     rgba ( 192, 192, 192, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 64, 64, 64, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 64, 64, 64, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-darktooth.rasi b/themes/base16-darktooth.rasi
index bd4c519..0fcd3f1 100644
--- a/themes/base16-darktooth.rasi
+++ b/themes/base16-darktooth.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Darktooth ROFI Color theme
- * User: Jason Milkins (https://github.com/jasonm23)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jason Milkins (https://github.com/jasonm23)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 168, 153, 132, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 84, 63, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 13, 102, 120, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 213, 196, 161, 100 % );
     lightbg:                     rgba ( 50, 48, 47, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 168, 153, 132, 100 % );
     background:                  rgba ( 29, 32, 33, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 213, 196, 161, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 29, 32, 33, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 29, 32, 33, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-default-dark.rasi b/themes/base16-default-dark.rasi
index b36c0ca..fc5bdef 100644
--- a/themes/base16-default-dark.rasi
+++ b/themes/base16-default-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Default Dark ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 216, 216, 216, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 171, 70, 66, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 124, 175, 194, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 232, 232, 100 % );
     lightbg:                     rgba ( 40, 40, 40, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 216, 216, 216, 100 % );
     background:                  rgba ( 24, 24, 24, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 232, 232, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 24, 24, 24, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 24, 24, 24, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-default-light.rasi b/themes/base16-default-light.rasi
index 5d9851e..82e4d4d 100644
--- a/themes/base16-default-light.rasi
+++ b/themes/base16-default-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Default Light ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 56, 56, 56, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 171, 70, 66, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 124, 175, 194, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 40, 40, 40, 100 % );
     lightbg:                     rgba ( 232, 232, 232, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 56, 56, 56, 100 % );
     background:                  rgba ( 248, 248, 248, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 40, 40, 40, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 248, 248, 248, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 248, 248, 248, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-dracula.rasi b/themes/base16-dracula.rasi
index 20a3e40..9be7d19 100644
--- a/themes/base16-dracula.rasi
+++ b/themes/base16-dracula.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Dracula ROFI Color theme
- * User: Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 233, 233, 244, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 234, 81, 178, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 98, 214, 232, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 241, 242, 248, 100 % );
     lightbg:                     rgba ( 58, 60, 78, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 233, 233, 244, 100 % );
     background:                  rgba ( 40, 41, 54, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 241, 242, 248, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 40, 41, 54, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 40, 41, 54, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-eighties.rasi b/themes/base16-eighties.rasi
index 0e64c60..ffbc4a6 100644
--- a/themes/base16-eighties.rasi
+++ b/themes/base16-eighties.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Eighties ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 211, 208, 200, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 242, 119, 122, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 102, 153, 204, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 230, 223, 100 % );
     lightbg:                     rgba ( 57, 57, 57, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 211, 208, 200, 100 % );
     background:                  rgba ( 45, 45, 45, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 230, 223, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 45, 45, 45, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 45, 45, 45, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-embers.rasi b/themes/base16-embers.rasi
index 5070342..290bacc 100644
--- a/themes/base16-embers.rasi
+++ b/themes/base16-embers.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Embers ROFI Color theme
- * User: Jannik Siebert (https://github.com/janniks)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jannik Siebert (https://github.com/janniks)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 163, 154, 144, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 130, 109, 87, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 109, 87, 130, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 190, 182, 174, 100 % );
     lightbg:                     rgba ( 44, 38, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 163, 154, 144, 100 % );
     background:                  rgba ( 22, 19, 15, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 190, 182, 174, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 22, 19, 15, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 22, 19, 15, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-flat.rasi b/themes/base16-flat.rasi
index b8254ff..4b0408b 100644
--- a/themes/base16-flat.rasi
+++ b/themes/base16-flat.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Flat ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 224, 224, 224, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 231, 76, 60, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 52, 152, 219, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 245, 245, 245, 100 % );
     lightbg:                     rgba ( 52, 73, 94, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 224, 224, 224, 100 % );
     background:                  rgba ( 44, 62, 80, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 245, 245, 245, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 44, 62, 80, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 44, 62, 80, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-github.rasi b/themes/base16-github.rasi
index 70e4a62..37a00ef 100644
--- a/themes/base16-github.rasi
+++ b/themes/base16-github.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Github ROFI Color theme
- * User: Defman21
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Defman21
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 51, 51, 51, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 237, 106, 67, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 121, 93, 163, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 255, 255, 255, 100 % );
     lightbg:                     rgba ( 245, 245, 245, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 51, 51, 51, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 255, 255, 255, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-google-dark.rasi b/themes/base16-google-dark.rasi
index 94a22a9..ac8a9cd 100644
--- a/themes/base16-google-dark.rasi
+++ b/themes/base16-google-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Google Dark ROFI Color theme
- * User: Seth Wright (http://sethawright.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Seth Wright (http://sethawright.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 197, 200, 198, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 204, 52, 43, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 57, 113, 237, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 40, 42, 46, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 197, 200, 198, 100 % );
     background:                  rgba ( 29, 31, 33, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 29, 31, 33, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 29, 31, 33, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-google-light.rasi b/themes/base16-google-light.rasi
index 2b633ce..188c2ad 100644
--- a/themes/base16-google-light.rasi
+++ b/themes/base16-google-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Google Light ROFI Color theme
- * User: Seth Wright (http://sethawright.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Seth Wright (http://sethawright.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 55, 59, 65, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 204, 52, 43, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 57, 113, 237, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 40, 42, 46, 100 % );
     lightbg:                     rgba ( 224, 224, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 55, 59, 65, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 40, 42, 46, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-grayscale-dark.rasi b/themes/base16-grayscale-dark.rasi
index 1faddea..0419994 100644
--- a/themes/base16-grayscale-dark.rasi
+++ b/themes/base16-grayscale-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Grayscale Dark ROFI Color theme
- * User: Alexandre Gavioli (https://github.com/Alexx2/)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Alexandre Gavioli (https://github.com/Alexx2/)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 185, 185, 185, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 124, 124, 124, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 104, 104, 104, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 227, 227, 227, 100 % );
     lightbg:                     rgba ( 37, 37, 37, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 185, 185, 185, 100 % );
     background:                  rgba ( 16, 16, 16, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 227, 227, 227, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 16, 16, 16, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 16, 16, 16, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-grayscale-light.rasi b/themes/base16-grayscale-light.rasi
index f2f9b01..ef36c37 100644
--- a/themes/base16-grayscale-light.rasi
+++ b/themes/base16-grayscale-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Grayscale Light ROFI Color theme
- * User: Alexandre Gavioli (https://github.com/Alexx2/)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Alexandre Gavioli (https://github.com/Alexx2/)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 70, 70, 70, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 124, 124, 124, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 104, 104, 104, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 37, 37, 37, 100 % );
     lightbg:                     rgba ( 227, 227, 227, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 70, 70, 70, 100 % );
     background:                  rgba ( 247, 247, 247, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 37, 37, 37, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 247, 247, 247, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 247, 247, 247, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-greenscreen.rasi b/themes/base16-greenscreen.rasi
index adce612..146ec3c 100644
--- a/themes/base16-greenscreen.rasi
+++ b/themes/base16-greenscreen.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Green Screen ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 0, 187, 0, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 0, 119, 0, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 153, 0, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 0, 221, 0, 100 % );
     lightbg:                     rgba ( 0, 51, 0, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 0, 187, 0, 100 % );
     background:                  rgba ( 0, 17, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 0, 221, 0, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 17, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 17, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-dark-hard.rasi b/themes/base16-gruvbox-dark-hard.rasi
index 1d1e4d7..f19caab 100644
--- a/themes/base16-gruvbox-dark-hard.rasi
+++ b/themes/base16-gruvbox-dark-hard.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox dark, hard ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 213, 196, 161, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 73, 52, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 131, 165, 152, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 235, 219, 178, 100 % );
     lightbg:                     rgba ( 60, 56, 54, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 213, 196, 161, 100 % );
     background:                  rgba ( 29, 32, 33, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 235, 219, 178, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 29, 32, 33, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 29, 32, 33, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-dark-medium.rasi b/themes/base16-gruvbox-dark-medium.rasi
index 6a0c1ae..633e8c3 100644
--- a/themes/base16-gruvbox-dark-medium.rasi
+++ b/themes/base16-gruvbox-dark-medium.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox dark, medium ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 213, 196, 161, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 73, 52, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 131, 165, 152, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 235, 219, 178, 100 % );
     lightbg:                     rgba ( 60, 56, 54, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 213, 196, 161, 100 % );
     background:                  rgba ( 40, 40, 40, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 235, 219, 178, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 40, 40, 40, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 40, 40, 40, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-dark-pale.rasi b/themes/base16-gruvbox-dark-pale.rasi
index cdc2bfd..ce139b5 100644
--- a/themes/base16-gruvbox-dark-pale.rasi
+++ b/themes/base16-gruvbox-dark-pale.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox dark, pale ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 218, 185, 151, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 215, 95, 95, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 131, 173, 173, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 213, 196, 161, 100 % );
     lightbg:                     rgba ( 58, 58, 58, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 218, 185, 151, 100 % );
     background:                  rgba ( 38, 38, 38, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 213, 196, 161, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 38, 38, 38, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 38, 38, 38, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-dark-soft.rasi b/themes/base16-gruvbox-dark-soft.rasi
index 1147298..9a6b871 100644
--- a/themes/base16-gruvbox-dark-soft.rasi
+++ b/themes/base16-gruvbox-dark-soft.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox dark, soft ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 213, 196, 161, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 251, 73, 52, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 131, 165, 152, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 235, 219, 178, 100 % );
     lightbg:                     rgba ( 60, 56, 54, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 213, 196, 161, 100 % );
     background:                  rgba ( 50, 48, 47, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 235, 219, 178, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 50, 48, 47, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 50, 48, 47, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-light-hard.rasi b/themes/base16-gruvbox-light-hard.rasi
index 64f5576..77dcb99 100644
--- a/themes/base16-gruvbox-light-hard.rasi
+++ b/themes/base16-gruvbox-light-hard.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox light, hard ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 80, 73, 69, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 157, 0, 6, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 7, 102, 120, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 60, 56, 54, 100 % );
     lightbg:                     rgba ( 235, 219, 178, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 80, 73, 69, 100 % );
     background:                  rgba ( 249, 245, 215, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 60, 56, 54, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 249, 245, 215, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 249, 245, 215, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-light-medium.rasi b/themes/base16-gruvbox-light-medium.rasi
index 82c259c..2e9a13f 100644
--- a/themes/base16-gruvbox-light-medium.rasi
+++ b/themes/base16-gruvbox-light-medium.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox light, medium ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 80, 73, 69, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 157, 0, 6, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 7, 102, 120, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 60, 56, 54, 100 % );
     lightbg:                     rgba ( 235, 219, 178, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 80, 73, 69, 100 % );
     background:                  rgba ( 251, 241, 199, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 60, 56, 54, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 251, 241, 199, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 251, 241, 199, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-gruvbox-light-soft.rasi b/themes/base16-gruvbox-light-soft.rasi
index cd2fb76..d5b77d2 100644
--- a/themes/base16-gruvbox-light-soft.rasi
+++ b/themes/base16-gruvbox-light-soft.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Gruvbox light, soft ROFI Color theme
- * User: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 80, 73, 69, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 157, 0, 6, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 7, 102, 120, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 60, 56, 54, 100 % );
     lightbg:                     rgba ( 235, 219, 178, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 80, 73, 69, 100 % );
     background:                  rgba ( 242, 229, 188, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 60, 56, 54, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 242, 229, 188, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 242, 229, 188, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-harmonic-dark.rasi b/themes/base16-harmonic-dark.rasi
index 7720c8f..b2f8190 100644
--- a/themes/base16-harmonic-dark.rasi
+++ b/themes/base16-harmonic-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Harmonic16 Dark ROFI Color theme
- * User: Jannik Siebert (https://github.com/janniks)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jannik Siebert (https://github.com/janniks)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 203, 214, 226, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 191, 139, 86, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 139, 86, 191, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 229, 235, 241, 100 % );
     lightbg:                     rgba ( 34, 59, 84, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 203, 214, 226, 100 % );
     background:                  rgba ( 11, 28, 44, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 229, 235, 241, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 11, 28, 44, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 11, 28, 44, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-harmonic-light.rasi b/themes/base16-harmonic-light.rasi
index 06af81d..385190b 100644
--- a/themes/base16-harmonic-light.rasi
+++ b/themes/base16-harmonic-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Harmonic16 Light ROFI Color theme
- * User: Jannik Siebert (https://github.com/janniks)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jannik Siebert (https://github.com/janniks)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 64, 92, 121, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 191, 139, 86, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 139, 86, 191, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 34, 59, 84, 100 % );
     lightbg:                     rgba ( 229, 235, 241, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 64, 92, 121, 100 % );
     background:                  rgba ( 247, 249, 251, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 34, 59, 84, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 247, 249, 251, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 247, 249, 251, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-hopscotch.rasi b/themes/base16-hopscotch.rasi
index 9a14a0e..12e39bd 100644
--- a/themes/base16-hopscotch.rasi
+++ b/themes/base16-hopscotch.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Hopscotch ROFI Color theme
- * User: Jan T. Sott
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 185, 181, 184, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 221, 70, 76, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 18, 144, 191, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 213, 211, 213, 100 % );
     lightbg:                     rgba ( 67, 59, 66, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 185, 181, 184, 100 % );
     background:                  rgba ( 50, 41, 49, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 213, 211, 213, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 50, 41, 49, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 50, 41, 49, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-icy.rasi b/themes/base16-icy.rasi
index a6b8e6c..1b3f4a0 100644
--- a/themes/base16-icy.rasi
+++ b/themes/base16-icy.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Icy Dark ROFI Color theme
- * User: icyphox (https://icyphox.ga)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: icyphox (https://icyphox.ga)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 9, 91, 103, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 22, 193, 217, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 188, 212, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 12, 124, 140, 100 % );
     lightbg:                     rgba ( 3, 22, 25, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 9, 91, 103, 100 % );
     background:                  rgba ( 2, 16, 18, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 12, 124, 140, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 2, 16, 18, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 2, 16, 18, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-irblack.rasi b/themes/base16-irblack.rasi
index bb5f639..9c237b4 100644
--- a/themes/base16-irblack.rasi
+++ b/themes/base16-irblack.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 IR Black ROFI Color theme
- * User: Timothée Poisot (http://timotheepoisot.fr)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Timothée Poisot (http://timotheepoisot.fr)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 181, 179, 170, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 108, 96, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 150, 203, 254, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 217, 215, 204, 100 % );
     lightbg:                     rgba ( 36, 36, 34, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 181, 179, 170, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 217, 215, 204, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-isotope.rasi b/themes/base16-isotope.rasi
index 370a116..eb31da6 100644
--- a/themes/base16-isotope.rasi
+++ b/themes/base16-isotope.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Isotope ROFI Color theme
- * User: Jan T. Sott
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 208, 208, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 0, 0, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 102, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 64, 64, 64, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 208, 208, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-macintosh.rasi b/themes/base16-macintosh.rasi
index 0f727d8..476b8c5 100644
--- a/themes/base16-macintosh.rasi
+++ b/themes/base16-macintosh.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Macintosh ROFI Color theme
- * User: Rebecca Bettencourt (http://www.kreativekorp.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Rebecca Bettencourt (http://www.kreativekorp.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 192, 192, 192, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 221, 9, 7, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 0, 211, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 192, 192, 192, 100 % );
     lightbg:                     rgba ( 64, 64, 64, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 192, 192, 192, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 192, 192, 192, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-marrakesh.rasi b/themes/base16-marrakesh.rasi
index 8d0b876..552e90d 100644
--- a/themes/base16-marrakesh.rasi
+++ b/themes/base16-marrakesh.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Marrakesh ROFI Color theme
- * User: Alexandre Gavioli (http://github.com/Alexx2/)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Alexandre Gavioli (http://github.com/Alexx2/)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 148, 142, 72, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 195, 83, 89, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 71, 124, 161, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 204, 195, 122, 100 % );
     lightbg:                     rgba ( 48, 46, 0, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 148, 142, 72, 100 % );
     background:                  rgba ( 32, 22, 2, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 204, 195, 122, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 32, 22, 2, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 32, 22, 2, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-materia.rasi b/themes/base16-materia.rasi
index 0b66a14..6c05541 100644
--- a/themes/base16-materia.rasi
+++ b/themes/base16-materia.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Materia ROFI Color theme
- * User: Defman21
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Defman21
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 205, 211, 222, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 236, 95, 103, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 137, 221, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 213, 219, 229, 100 % );
     lightbg:                     rgba ( 44, 57, 63, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 205, 211, 222, 100 % );
     background:                  rgba ( 38, 50, 56, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 213, 219, 229, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 38, 50, 56, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 38, 50, 56, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-material-darker.rasi b/themes/base16-material-darker.rasi
index 81920c0..ffa2b25 100644
--- a/themes/base16-material-darker.rasi
+++ b/themes/base16-material-darker.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Material Darker ROFI Color theme
- * User: Nate Peterson
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Nate Peterson
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 238, 255, 255, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 240, 113, 120, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 130, 170, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 238, 255, 255, 100 % );
     lightbg:                     rgba ( 48, 48, 48, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 238, 255, 255, 100 % );
     background:                  rgba ( 33, 33, 33, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 238, 255, 255, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 33, 33, 33, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 33, 33, 33, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-material-lighter.rasi b/themes/base16-material-lighter.rasi
index b7f80fa..5f3da04 100644
--- a/themes/base16-material-lighter.rasi
+++ b/themes/base16-material-lighter.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Material Lighter ROFI Color theme
- * User: Nate Peterson
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Nate Peterson
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 128, 203, 196, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 83, 112, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 97, 130, 184, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 128, 203, 196, 100 % );
     lightbg:                     rgba ( 231, 234, 236, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 128, 203, 196, 100 % );
     background:                  rgba ( 250, 250, 250, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 128, 203, 196, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 250, 250, 250, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 250, 250, 250, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-material-palenight.rasi b/themes/base16-material-palenight.rasi
index 2cc20c5..ac6396a 100644
--- a/themes/base16-material-palenight.rasi
+++ b/themes/base16-material-palenight.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Material Palenight ROFI Color theme
- * User: Nate Peterson
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Nate Peterson
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 149, 157, 203, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 240, 113, 120, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 130, 170, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 149, 157, 203, 100 % );
     lightbg:                     rgba ( 68, 66, 103, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 149, 157, 203, 100 % );
     background:                  rgba ( 41, 45, 62, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 149, 157, 203, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 41, 45, 62, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 41, 45, 62, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-material.rasi b/themes/base16-material.rasi
index e627c8d..9c8d077 100644
--- a/themes/base16-material.rasi
+++ b/themes/base16-material.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Material ROFI Color theme
- * User: Nate Peterson
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Nate Peterson
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 238, 255, 255, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 240, 113, 120, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 130, 170, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 238, 255, 255, 100 % );
     lightbg:                     rgba ( 46, 60, 67, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 238, 255, 255, 100 % );
     background:                  rgba ( 38, 50, 56, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 238, 255, 255, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 38, 50, 56, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 38, 50, 56, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-mellow-purple.rasi b/themes/base16-mellow-purple.rasi
index ebb946d..e6a30db 100644
--- a/themes/base16-mellow-purple.rasi
+++ b/themes/base16-mellow-purple.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Mellow Purple ROFI Color theme
- * User: gidsi
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: gidsi
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 255, 238, 255, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 0, 217, 233, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 85, 0, 104, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 255, 238, 255, 100 % );
     lightbg:                     rgba ( 26, 9, 45, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 255, 238, 255, 100 % );
     background:                  rgba ( 30, 5, 40, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 255, 238, 255, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 30, 5, 40, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 30, 5, 40, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-mexico-light.rasi b/themes/base16-mexico-light.rasi
index 11ae009..e366a6c 100644
--- a/themes/base16-mexico-light.rasi
+++ b/themes/base16-mexico-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Mexico Light ROFI Color theme
- * User: Sheldon Johnson
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Sheldon Johnson
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 56, 56, 56, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 171, 70, 66, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 124, 175, 194, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 40, 40, 40, 100 % );
     lightbg:                     rgba ( 232, 232, 232, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 56, 56, 56, 100 % );
     background:                  rgba ( 248, 248, 248, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 40, 40, 40, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 248, 248, 248, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 248, 248, 248, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-mocha.rasi b/themes/base16-mocha.rasi
index d7ffa50..df78d3b 100644
--- a/themes/base16-mocha.rasi
+++ b/themes/base16-mocha.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Mocha ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 200, 198, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 203, 96, 119, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 138, 179, 181, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 233, 225, 221, 100 % );
     lightbg:                     rgba ( 83, 70, 54, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 200, 198, 100 % );
     background:                  rgba ( 59, 50, 40, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 233, 225, 221, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 59, 50, 40, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 59, 50, 40, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-monokai.rasi b/themes/base16-monokai.rasi
index 9d54b53..7d0e3b5 100644
--- a/themes/base16-monokai.rasi
+++ b/themes/base16-monokai.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Monokai ROFI Color theme
- * User: Wimer Hazenberg (http://www.monokai.nl)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Wimer Hazenberg (http://www.monokai.nl)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 248, 248, 242, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 249, 38, 114, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 102, 217, 239, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 245, 244, 241, 100 % );
     lightbg:                     rgba ( 56, 56, 48, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 248, 248, 242, 100 % );
     background:                  rgba ( 39, 40, 34, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 245, 244, 241, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 39, 40, 34, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 39, 40, 34, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-nord.rasi b/themes/base16-nord.rasi
index e51e26b..9853182 100644
--- a/themes/base16-nord.rasi
+++ b/themes/base16-nord.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Nord ROFI Color theme
- * User: arcticicestudio
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: arcticicestudio
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 229, 233, 240, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 136, 192, 208, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 235, 203, 139, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 236, 239, 244, 100 % );
     lightbg:                     rgba ( 59, 66, 82, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 229, 233, 240, 100 % );
     background:                  rgba ( 46, 52, 64, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 236, 239, 244, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 46, 52, 64, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 46, 52, 64, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-ocean.rasi b/themes/base16-ocean.rasi
index 80990ae..169259f 100644
--- a/themes/base16-ocean.rasi
+++ b/themes/base16-ocean.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Ocean ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 192, 197, 206, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 191, 97, 106, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 143, 161, 179, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 223, 225, 232, 100 % );
     lightbg:                     rgba ( 52, 61, 70, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 192, 197, 206, 100 % );
     background:                  rgba ( 43, 48, 59, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 223, 225, 232, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 43, 48, 59, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 43, 48, 59, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-oceanicnext.rasi b/themes/base16-oceanicnext.rasi
index 8a3d95f..76a46f7 100644
--- a/themes/base16-oceanicnext.rasi
+++ b/themes/base16-oceanicnext.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 OceanicNext ROFI Color theme
- * User: https://github.com/voronianski/oceanic-next-color-scheme
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: https://github.com/voronianski/oceanic-next-color-scheme
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 192, 197, 206, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 236, 95, 103, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 102, 153, 204, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 205, 211, 222, 100 % );
     lightbg:                     rgba ( 52, 61, 70, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 192, 197, 206, 100 % );
     background:                  rgba ( 27, 43, 52, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 205, 211, 222, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 27, 43, 52, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 27, 43, 52, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-one-light.rasi b/themes/base16-one-light.rasi
index fbc6a7b..7f309f4 100644
--- a/themes/base16-one-light.rasi
+++ b/themes/base16-one-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 One Light ROFI Color theme
- * User: Daniel Pfeifer (http://github.com/purpleKarrot)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Daniel Pfeifer (http://github.com/purpleKarrot)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 56, 58, 66, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 202, 18, 67, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 64, 120, 242, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 32, 34, 39, 100 % );
     lightbg:                     rgba ( 240, 240, 241, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 56, 58, 66, 100 % );
     background:                  rgba ( 250, 250, 250, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 32, 34, 39, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 250, 250, 250, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 250, 250, 250, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-onedark.rasi b/themes/base16-onedark.rasi
index 92f6911..d29d419 100644
--- a/themes/base16-onedark.rasi
+++ b/themes/base16-onedark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 OneDark ROFI Color theme
- * User: Lalit Magant (http://github.com/tilal6991)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Lalit Magant (http://github.com/tilal6991)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 171, 178, 191, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 224, 108, 117, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 97, 175, 239, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 182, 189, 202, 100 % );
     lightbg:                     rgba ( 53, 59, 69, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 171, 178, 191, 100 % );
     background:                  rgba ( 40, 44, 52, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 182, 189, 202, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 40, 44, 52, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 40, 44, 52, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-paraiso.rasi b/themes/base16-paraiso.rasi
index 7d9daef..76625d9 100644
--- a/themes/base16-paraiso.rasi
+++ b/themes/base16-paraiso.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Paraiso ROFI Color theme
- * User: Jan T. Sott
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 163, 158, 155, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 239, 97, 85, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 6, 182, 239, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 185, 182, 176, 100 % );
     lightbg:                     rgba ( 65, 50, 63, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 163, 158, 155, 100 % );
     background:                  rgba ( 47, 30, 46, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 185, 182, 176, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 47, 30, 46, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 47, 30, 46, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-phd.rasi b/themes/base16-phd.rasi
index a2c50f1..fc51b25 100644
--- a/themes/base16-phd.rasi
+++ b/themes/base16-phd.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 PhD ROFI Color theme
- * User: Hennig Hasemann (http://leetless.de/vim.html)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Hennig Hasemann (http://leetless.de/vim.html)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 184, 187, 194, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 208, 115, 70, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 82, 153, 191, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 219, 221, 224, 100 % );
     lightbg:                     rgba ( 42, 52, 72, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 184, 187, 194, 100 % );
     background:                  rgba ( 6, 18, 41, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 219, 221, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 6, 18, 41, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 6, 18, 41, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-pico.rasi b/themes/base16-pico.rasi
index 7003cb1..eba0108 100644
--- a/themes/base16-pico.rasi
+++ b/themes/base16-pico.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Pico ROFI Color theme
- * User: PICO-8 (http://www.lexaloffle.com/pico-8.php)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: PICO-8 (http://www.lexaloffle.com/pico-8.php)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 95, 87, 79, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 0, 77, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 131, 118, 156, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 194, 195, 199, 100 % );
     lightbg:                     rgba ( 29, 43, 83, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 95, 87, 79, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 194, 195, 199, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-pop.rasi b/themes/base16-pop.rasi
index 958ffd9..0bd2b49 100644
--- a/themes/base16-pop.rasi
+++ b/themes/base16-pop.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Pop ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 208, 208, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 235, 0, 138, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 14, 90, 148, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 32, 32, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 208, 208, 100 % );
     background:                  rgba ( 0, 0, 0, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 0, 0, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-porple.rasi b/themes/base16-porple.rasi
index a0c8a29..7cdd987 100644
--- a/themes/base16-porple.rasi
+++ b/themes/base16-porple.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Porple ROFI Color theme
- * User: Niek den Breeje (https://github.com/AuditeMarlow)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Niek den Breeje (https://github.com/AuditeMarlow)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 216, 216, 216, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 248, 69, 71, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 132, 133, 206, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 232, 232, 100 % );
     lightbg:                     rgba ( 51, 51, 68, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 216, 216, 216, 100 % );
     background:                  rgba ( 41, 44, 54, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 232, 232, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 41, 44, 54, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 41, 44, 54, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-railscasts.rasi b/themes/base16-railscasts.rasi
index 8fb14cb..e4b1afc 100644
--- a/themes/base16-railscasts.rasi
+++ b/themes/base16-railscasts.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Railscasts ROFI Color theme
- * User: Ryan Bates (http://railscasts.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Ryan Bates (http://railscasts.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 230, 225, 220, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 218, 73, 57, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 109, 156, 190, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 244, 241, 237, 100 % );
     lightbg:                     rgba ( 39, 41, 53, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 230, 225, 220, 100 % );
     background:                  rgba ( 43, 43, 43, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 244, 241, 237, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 43, 43, 43, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 43, 43, 43, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-rebecca.rasi b/themes/base16-rebecca.rasi
index 55519d6..9489aec 100644
--- a/themes/base16-rebecca.rasi
+++ b/themes/base16-rebecca.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Rebecca ROFI Color theme
- * User: Victor Borja (http://github.com/vic) based on Rebecca Theme (http://github.com/vic/rebecca-theme)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Victor Borja (http://github.com/vic) based on Rebecca Theme (http://github.com/vic/rebecca-theme)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 241, 239, 248, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 160, 160, 197, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 45, 224, 167, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 204, 204, 255, 100 % );
     lightbg:                     rgba ( 102, 51, 153, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 241, 239, 248, 100 % );
     background:                  rgba ( 41, 42, 68, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 204, 204, 255, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 41, 42, 68, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 41, 42, 68, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-seti.rasi b/themes/base16-seti.rasi
index fa65296..2256733 100644
--- a/themes/base16-seti.rasi
+++ b/themes/base16-seti.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Seti UI ROFI Color theme
- * User: 
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: 
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 214, 214, 214, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 205, 63, 69, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 85, 181, 219, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 238, 238, 238, 100 % );
     lightbg:                     rgba ( 40, 42, 43, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 214, 214, 214, 100 % );
     background:                  rgba ( 21, 23, 24, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 238, 238, 238, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 21, 23, 24, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 21, 23, 24, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-shapeshifter.rasi b/themes/base16-shapeshifter.rasi
index 2a0d388..64b79e1 100644
--- a/themes/base16-shapeshifter.rasi
+++ b/themes/base16-shapeshifter.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Shapeshifter ROFI Color theme
- * User: Tyler Benziger (http://tybenz.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Tyler Benziger (http://tybenz.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 16, 32, 21, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 233, 47, 47, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 59, 72, 227, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 4, 4, 4, 100 % );
     lightbg:                     rgba ( 224, 224, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 16, 32, 21, 100 % );
     background:                  rgba ( 249, 249, 249, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 4, 4, 4, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 249, 249, 249, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 249, 249, 249, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-solarflare.rasi b/themes/base16-solarflare.rasi
index 438c262..420aa42 100644
--- a/themes/base16-solarflare.rasi
+++ b/themes/base16-solarflare.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Solar Flare ROFI Color theme
- * User: Chuck Harmston (https://chuck.harmston.ch)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chuck Harmston (https://chuck.harmston.ch)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 166, 175, 184, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 239, 82, 83, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 51, 181, 225, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 233, 237, 100 % );
     lightbg:                     rgba ( 34, 46, 56, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 166, 175, 184, 100 % );
     background:                  rgba ( 24, 38, 47, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 233, 237, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 24, 38, 47, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 24, 38, 47, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-solarized-dark.rasi b/themes/base16-solarized-dark.rasi
index 98c9c7a..11edd8f 100644
--- a/themes/base16-solarized-dark.rasi
+++ b/themes/base16-solarized-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Solarized Dark ROFI Color theme
- * User: Ethan Schoonover (http://ethanschoonover.com/solarized)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 147, 161, 161, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 238, 232, 213, 100 % );
     lightbg:                     rgba ( 7, 54, 66, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 147, 161, 161, 100 % );
     background:                  rgba ( 0, 43, 54, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 238, 232, 213, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 0, 43, 54, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 0, 43, 54, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-solarized-light.rasi b/themes/base16-solarized-light.rasi
index e632bf5..00f37ce 100644
--- a/themes/base16-solarized-light.rasi
+++ b/themes/base16-solarized-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Solarized Light ROFI Color theme
- * User: Ethan Schoonover (http://ethanschoonover.com/solarized)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 88, 110, 117, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 7, 54, 66, 100 % );
     lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 88, 110, 117, 100 % );
     background:                  rgba ( 253, 246, 227, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 7, 54, 66, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 253, 246, 227, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 253, 246, 227, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-spacemacs.rasi b/themes/base16-spacemacs.rasi
index 53e7d09..a96b992 100644
--- a/themes/base16-spacemacs.rasi
+++ b/themes/base16-spacemacs.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Spacemacs ROFI Color theme
- * User: Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 163, 163, 163, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 242, 36, 31, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 79, 151, 215, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 232, 232, 232, 100 % );
     lightbg:                     rgba ( 40, 40, 40, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 163, 163, 163, 100 % );
     background:                  rgba ( 31, 32, 34, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 232, 232, 232, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 31, 32, 34, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 31, 32, 34, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-summerfruit-dark.rasi b/themes/base16-summerfruit-dark.rasi
index b35abfa..701d2ae 100644
--- a/themes/base16-summerfruit-dark.rasi
+++ b/themes/base16-summerfruit-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Summerfruit Dark ROFI Color theme
- * User: Christopher Corley (http://christop.club/)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Christopher Corley (http://christop.club/)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 208, 208, 208, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 0, 134, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 55, 119, 230, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 32, 32, 32, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 208, 208, 208, 100 % );
     background:                  rgba ( 21, 21, 21, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 21, 21, 21, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 21, 21, 21, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-summerfruit-light.rasi b/themes/base16-summerfruit-light.rasi
index 5e4a3a3..a2affe8 100644
--- a/themes/base16-summerfruit-light.rasi
+++ b/themes/base16-summerfruit-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Summerfruit Light ROFI Color theme
- * User: Christopher Corley (http://christop.club/)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Christopher Corley (http://christop.club/)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 16, 16, 16, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 255, 0, 134, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 55, 119, 230, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 21, 21, 21, 100 % );
     lightbg:                     rgba ( 224, 224, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 16, 16, 16, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 21, 21, 21, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-tomorrow-night.rasi b/themes/base16-tomorrow-night.rasi
index b4ac8b7..6f63242 100644
--- a/themes/base16-tomorrow-night.rasi
+++ b/themes/base16-tomorrow-night.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Tomorrow Night ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 197, 200, 198, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 204, 102, 102, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 129, 162, 190, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 224, 224, 224, 100 % );
     lightbg:                     rgba ( 40, 42, 46, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 197, 200, 198, 100 % );
     background:                  rgba ( 29, 31, 33, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 224, 224, 224, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 29, 31, 33, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 29, 31, 33, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-tomorrow.rasi b/themes/base16-tomorrow.rasi
index 7841f5b..fceeacc 100644
--- a/themes/base16-tomorrow.rasi
+++ b/themes/base16-tomorrow.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Tomorrow ROFI Color theme
- * User: Chris Kempson (http://chriskempson.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Chris Kempson (http://chriskempson.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 77, 77, 76, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 200, 40, 41, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 66, 113, 174, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 40, 42, 46, 100 % );
     lightbg:                     rgba ( 224, 224, 224, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 77, 77, 76, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 40, 42, 46, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-tube.rasi b/themes/base16-tube.rasi
index 62c6f56..567d2ea 100644
--- a/themes/base16-tube.rasi
+++ b/themes/base16-tube.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 London Tube ROFI Color theme
- * User: Jan T. Sott
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jan T. Sott
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 217, 216, 216, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 238, 46, 36, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 0, 157, 220, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 231, 231, 232, 100 % );
     lightbg:                     rgba ( 28, 63, 149, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 217, 216, 216, 100 % );
     background:                  rgba ( 35, 31, 32, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 231, 231, 232, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 35, 31, 32, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 35, 31, 32, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-twilight.rasi b/themes/base16-twilight.rasi
index 1bf964a..6c45fe1 100644
--- a/themes/base16-twilight.rasi
+++ b/themes/base16-twilight.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Twilight ROFI Color theme
- * User: David Hart (https://github.com/hartbit)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: David Hart (https://github.com/hartbit)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 167, 167, 167, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 207, 106, 76, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 117, 135, 166, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 195, 195, 195, 100 % );
     lightbg:                     rgba ( 50, 53, 55, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 167, 167, 167, 100 % );
     background:                  rgba ( 30, 30, 30, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 195, 195, 195, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 30, 30, 30, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 30, 30, 30, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-unikitty-dark.rasi b/themes/base16-unikitty-dark.rasi
index d8b27da..a2a14ac 100644
--- a/themes/base16-unikitty-dark.rasi
+++ b/themes/base16-unikitty-dark.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Unikitty Dark ROFI Color theme
- * User: Josh W Lewis (@joshwlewis)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Josh W Lewis (@joshwlewis)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 188, 186, 190, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 216, 19, 127, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 121, 106, 245, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 216, 215, 218, 100 % );
     lightbg:                     rgba ( 74, 70, 77, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 188, 186, 190, 100 % );
     background:                  rgba ( 46, 42, 49, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 216, 215, 218, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 46, 42, 49, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 46, 42, 49, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-unikitty-light.rasi b/themes/base16-unikitty-light.rasi
index 4ceae01..08d7908 100644
--- a/themes/base16-unikitty-light.rasi
+++ b/themes/base16-unikitty-light.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Unikitty Light ROFI Color theme
- * User: Josh W Lewis (@joshwlewis)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Josh W Lewis (@joshwlewis)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 108, 105, 110, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 216, 19, 127, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 119, 93, 255, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 79, 75, 81, 100 % );
     lightbg:                     rgba ( 225, 225, 226, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 108, 105, 110, 100 % );
     background:                  rgba ( 255, 255, 255, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 79, 75, 81, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 255, 255, 255, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 255, 255, 255, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-woodland.rasi b/themes/base16-woodland.rasi
index 3c38f2d..43d7c3c 100644
--- a/themes/base16-woodland.rasi
+++ b/themes/base16-woodland.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Woodland ROFI Color theme
- * User: Jay Cornwall (https://jcornwall.com)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Jay Cornwall (https://jcornwall.com)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 202, 188, 177, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 211, 92, 92, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 136, 164, 211, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 215, 200, 188, 100 % );
     lightbg:                     rgba ( 48, 43, 37, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 202, 188, 177, 100 % );
     background:                  rgba ( 35, 30, 24, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 215, 200, 188, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 35, 30, 24, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 35, 30, 24, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-xcode-dusk.rasi b/themes/base16-xcode-dusk.rasi
index 7acb1d1..811dd04 100644
--- a/themes/base16-xcode-dusk.rasi
+++ b/themes/base16-xcode-dusk.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 XCode Dusk ROFI Color theme
- * User: Elsa Gonsiorowski (https://github.com/gonsie)
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: Elsa Gonsiorowski (https://github.com/gonsie)
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 147, 149, 153, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 178, 24, 137, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 121, 14, 173, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 169, 170, 174, 100 % );
     lightbg:                     rgba ( 61, 64, 72, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 147, 149, 153, 100 % );
     background:                  rgba ( 40, 43, 53, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 169, 170, 174, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 40, 43, 53, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 40, 43, 53, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }
diff --git a/themes/base16-zenburn.rasi b/themes/base16-zenburn.rasi
index 922d148..401d9ca 100644
--- a/themes/base16-zenburn.rasi
+++ b/themes/base16-zenburn.rasi
@@ -1,37 +1,40 @@
 /**
  * Base16 Zenburn ROFI Color theme
- * User: elnawe
- * Copyright: Andrea Scarpino
+ *
+ * Authors
+ *  Scheme: elnawe
+ *  Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista)
  */
+
 * {
-    selected-normal-foreground:  @lightbg;
-    foreground:                  rgba ( 220, 220, 204, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: @lightbg;
     red:                         rgba ( 220, 163, 163, 100 % );
-    selected-urgent-foreground:  @background;
     blue:                        rgba ( 124, 184, 187, 100 % );
-    urgent-foreground:           @red;
-    alternate-urgent-background: @lightbg;
-    active-foreground:           @blue;
+    lightfg:                     rgba ( 192, 192, 192, 100 % );
     lightbg:                     rgba ( 64, 64, 64, 100 % );
-    selected-active-foreground:  @background;
-    alternate-active-background: @lightbg;
+    foreground:                  rgba ( 220, 220, 204, 100 % );
     background:                  rgba ( 63, 63, 63, 100 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 192, 192, 192, 100 % );
-    selected-normal-background:  @lightfg;
-    border-color:                @foreground;
-    spacing:                     2;
+    background-color:            rgba ( 63, 63, 63, 0 % );
     separatorcolor:              @foreground;
-    urgent-background:           @background;
+    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;
-    alternate-urgent-foreground: @red;
-    background-color:            rgba ( 63, 63, 63, 0 % );
-    alternate-active-foreground: @blue;
+    normal-foreground:           @foreground;
+    normal-background:           @background;
+    active-foreground:           @blue;
     active-background:           @background;
-    selected-active-background:  @blue;
+    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;
@@ -39,28 +42,28 @@ window {
     padding:          5;
 }
 mainbox {
-    border:  0;
-    padding: 0;
+    border:           0;
+    padding:          0;
 }
 message {
-    border:       1px dash 0px 0px ;
-    border-color: @separatorcolor;
-    padding:      1px ;
+    border:           1px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    padding:          1px ;
 }
 textbox {
-    text-color: @foreground;
+    text-color:       @foreground;
 }
 listview {
-    fixed-height: 0;
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
-    spacing:      2px ;
-    scrollbar:    true;
-    padding:      2px 0px 0px ;
+    fixed-height:     0;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
+    spacing:          2px ;
+    scrollbar:        true;
+    padding:          2px 0px 0px ;
 }
 element {
-    border:  0;
-    padding: 1px ;
+    border:           0;
+    padding:          1px ;
 }
 element normal.normal {
     background-color: @normal-background;
@@ -99,45 +102,45 @@ element alternate.active {
     text-color:       @alternate-active-foreground;
 }
 scrollbar {
-    width:        4px ;
-    border:       0;
-    handle-color: @normal-foreground;
-    handle-width: 8px ;
-    padding:      0;
+    width:            4px ;
+    border:           0;
+    handle-color:     @normal-foreground;
+    handle-width:     8px ;
+    padding:          0;
 }
 sidebar {
-    border:       2px dash 0px 0px ;
-    border-color: @separatorcolor;
+    border:           2px dash 0px 0px ;
+    border-color:     @separatorcolor;
 }
 button {
-    spacing:    0;
-    text-color: @normal-foreground;
+    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 ];
+    spacing:          0px;
+    text-color:       @normal-foreground;
+    padding:          1px ;
+    children:         [ prompt,textbox-prompt-colon,entry,case-indicator ];
 }
 case-indicator {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 entry {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 prompt {
-    spacing:    0;
-    text-color: @normal-foreground;
+    spacing:          0;
+    text-color:       @normal-foreground;
 }
 textbox-prompt-colon {
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3000em 0.0000em 0.0000em ;
-    text-color: inherit;
+    expand:           false;
+    str:              ":";
+    margin:           0px 0.3000em 0.0000em 0.0000em ;
+    text-color:       inherit;
 }