bin/cavactl

@@ -67,27 +67,11 @@ sd ".*bar_spacing .*" "bar_spacing = ${1}" ${CFGFILE}
 reload_config
 }
 
-info () {
+
-case "$LANG" in
+
-	pl*)
+
-    INFO_HEAD="Porady dla Cava"
+
-    INFO_TXT="\nCava jest uruchomiona w przezroczystym oknie...\n\
+
-Możesz je więc <b>przesuwać</b> lub <b>zmieniać rozmiar</b> tak jak każde inne okno\n\
-<i>Przesuwanie</i>: przytrzymaj <b>Alt</b> i przeciągnij\n\
-<i>Zmiana rozmiaru</i>: przytrzymaj <b>Alt</b> i przeciągnij prawym przyciskiem myszy\n\n    \
-Użyj strzałek <b> </b>, aby zmienić szerokość słupków"
-	;;
-	*)
-	INFO_HEAD="Cava tips & tricks"
-    INFO_TXT="\nCava runs inside transparent window...\n\
-So you can <b>move</b> or <b>resize</b> it like any other window\n\
-<i>Move</i>: hold <b>Alt</b> and drag\n\
-<i>Resize</i>: hold <b>Alt</b> and drag with right mouse button\n\n    \
-Use arrows <b> </b> to change bar width"
-	;;
-esac
-notify-send.sh -i amarok_playcount -u critical "$INFO_HEAD" "$INFO_TXT"
-}
 
 case "$1" in
 	mode) mode "$2";;
@@ -101,6 +85,6 @@ case "$1" in
 	reload_colors)reload_colors;;
 	bar_width)bar_width "$2";;
 	bar_spacing)bar_spacing "$2";;
-	info) info;;
+	
 	*):;;
 esac

bin/checkupdates.sh

@@ -7,8 +7,6 @@
 CNF_DIR="$HOME/.config/colorizer/conky"
 CNF_FILE="$CNF_DIR/conky.cfg"
 source <(grep = $CNF_FILE)
-PKGS=$(checkupdates | wc -l)
-mb-setvar updates=${PKGS}
 
 case "$LANG" in
     pl*)
@@ -51,7 +49,7 @@ esac
 
 
 if [ -f /tmp/"$CONKYPID" ]; then
-    PKGS=$(checkupdates | wc -l)
+    PKGS=$(pamac checkupdates --no-aur -q| wc -l)
     if [ "$PKGS" != "0" ]; then
         if [[ "$update_notifications" == "true" ]];then
         notify-send.sh -u critical -i mbcc "$AVAIL_UPDATES" "$PKGS_TO_UPDATE $PKGS" -o "$YAY_UPD:terminator -T '$YAY_UPD' -e yay" \

bin/colorizer

@@ -23,12 +23,28 @@ CUSTOM_COMMANDS_FILE="$CNF_DIR/custom.csv"
 
 if [ ! -f $CNF_FILE ]; then
 cat <<EOF > ${CNF_FILE}
+# Autogenerate color themes on wallpaper change? yes or no
+wall2themes=no
+# OB window decoration preferred color style: dark, light or none
+wall2themes_ob=light
+# conky preffered bg color dark, light or none (none = not generate/change colorscheme)
+wall2themes_conky=dark
+# Menu prefferred bg color dark, light or none (not generate/change colorscheme)
+wall2themes_menu=light
+# Accent color dark, light or none
+wall2themes_accent=dark
+# PyRadio preferred bg color dark, light or none (not generate/change colorscheme)
+wall2themes_pyradio=dark
 # User wallpaper dir
 user_wallpapers_dir=~/wallpapers
 # Show related tools (show or hide)
 related_tools=hide
 # Colorizer size: full or compact
 colorizer_size=full
+# Action for rootmenucolors: accent or select
+rootcolors=select
+# Different colors for each/some Conkys: yes or no
+conky_diff_colors=no
 # Gradients: change openbox theme? (active window titlebar)
 gradient_obtheme=yes
 # Gradients: change menu/panels background?
@@ -47,11 +63,35 @@ case "$LANG" in
     CURRENTCONF="Obecna konfiguracja"
     MODULES="Moduły"
     FONTS="Konfiguruj <b>Czcionki</b>"
-    OBTHEME="Motyw <b>Openbox</b>"
+    OBTHEME="Motyw Openbox"
-    MENUPANELS="<b>Menu</b> i Panele boczne"
+    MENUPANELS="Menu i Panele"
-    COLORIZER_CONKY="<b>Conky</b> Manager i Colorizer"
     CAVA="Cava - wizualizacja dźwięku"
     TERMINALTHEME="Motyw terminala"
+    WALLCOLORS="Kolory z tapety"
+    ACCENTINFO="<i>ustaw kolor akcentu...</i>"
+    SELECT_ACTION="<i>wybierz działanie...</i>"
+    COLOR="Kolor"
+    SETACCENT="Ustaw kolor akcentu"
+    ACTIVE_WIN="<i>aktywne okno...</i>"
+    OB_ACTIVE_BG="Tło paska tytułowego"
+    OB_ACTIVE_BGTO="Tło paska tytułowego 2 <i>(dla gradientu)</i>"
+    OB_ACTIVE_TEXT="Tytuł aktywnego okna"
+    OB_ACTIVE_BORDER="Obramowanie"
+    INACTIVE_WIN="<i>nieaktywne okno...</i>"
+    OB_INACTIVE_BG="Tło paska tytułowego"
+    OB_INACTIVE_BGTO="Tło paska tytułowego 2 <i>(dla gradientu)</i>"
+    OB_INACTIVE_TEXT="Tytuł nieaktywnego okna"
+    OB_INACTIVE_BORDER="Obramowanie"
+    CONKY_BGCOLOR_ALL="Kolor tła (wszystkie)"
+    RUNNING_CONKYS="<i>działające Conky...</i>"
+    BGCOLOR_OF="Kolor tła dla"
+    MENU_BGCOLOR="Kolor tła menu"
+    MENU_SEP_BG="Kolor tła separatora/nagłówka"
+    MENU_ACTIVE_BG="Kolor aktywnej pozycji (akcent)"
+    MENU_ITEM_FG="Kolor elementu menu"
+    MENU_BORDER="Kolor obramowania menu"
+    
+    ACCENT_COLORS="Popularne kolory akcentu"
     EDIT_PALETTE="Edytuj paletę kolorów"
     RANDWALL="Ustaw losową tapetę"
     SYSWALLPAPER="Tapety <b>systemowe</b>"
@@ -64,6 +104,12 @@ case "$LANG" in
     SETTINGS_AND_HELP="Pomoc i Ustawienia"
     SETTINGS="Ustawienia"
     COLORIZER_SETTINGS="Ustawienia Colorizera"
+    AUTOGEN_THEMES="Autogenerowanie motywów?"
+    GENERATETHEMES="Generować motywy po zmianie tapety?"
+    GENOB="Pokolorować Dekoracje Okien?"
+    GENMENU="Pokolorować menu i panele?"
+    GENCONKY="Pokolorować Conky?"
+    GENPYRADIO="Pokolorować PyRadio?"
     GRADIENTS_ACT="Działanie gradientów w menu gł."
     EDITCONF="Edytuj plik konfiguracyjny"
     RESET="Resetuj ustawienia Colorizera"
@@ -92,6 +138,10 @@ case "$LANG" in
     CHANGE="Zmień"
     USERDIR_NOT_EXIST="kalalog nie istnieje"
     CREATE_USERDIR="Utwórz katalog"
+    ROOTMENU_COLORS_ACTION="Akcja dla kolorów w menu głównym"
+    ACCENT="<b>accent</b> - zmień kolor akcentu"
+    SELECT="<b>select</b> - wybierz akcję..."
+    DIFF_CONKY_COLORS="Różne kolory dla Conky"
     HELP="Okno główne i Pomoc"
     RESET_COLORS="Resetuj kolory"
     RESET_CHOOSE="Resetuj..."
@@ -110,11 +160,35 @@ case "$LANG" in
     CURRENTCONF="Current configuration"
     MODULES="Modules"
     FONTS="Configure <b>Fonts</b>"
-    OBTHEME="<b>Openbox</b> Theme"
+    OBTHEME="Openbox Theme"
-    MENUPANELS="<b>Menus/SidePanels</b>"
+    MENUPANELS="Menus/Panels"
-    COLORIZER_CONKY="<b>Conky</b> Manager &amp; Colorizer"
     CAVA="Cava - Audio Visualizer"
     TERMINALTHEME="Terminal color scheme"
+    WALLCOLORS="Wallpaper Colors"
+    ACCENTINFO="<i>click to set accent color</i>"
+    SELECT_ACTION="<i>select action...</i>"
+    COLOR="Color"
+    SETACCENT="Set accent color"
+    ACTIVE_WIN="<i>active window...</i>"
+    OB_ACTIVE_BG="Background"
+    OB_ACTIVE_BGTO="Background 2 <i>(for gradients)</i>"
+    OB_ACTIVE_TEXT="Title text color"
+    OB_ACTIVE_BORDER="Border"
+    INACTIVE_WIN="<i>inactive window...</i>"
+    OB_INACTIVE_BG="Background"
+    OB_INACTIVE_BGTO="Background 2 <i>(for gradients)</i>"
+    OB_INACTIVE_TEXT="Title text color"
+    OB_INACTIVE_BORDER="Border"
+    CONKY_BGCOLOR_ALL="Background color (all)"
+    RUNNING_CONKYS="<i>running Conkys...</i>"
+    BGCOLOR_OF="Background color for"
+    MENU_BGCOLOR="Menu Background"
+    MENU_SEP_BG="Separator/Title Background"
+    MENU_ACTIVE_BG="Active item Background (accent)"
+    MENU_ITEM_FG="Item Foreground"
+    MENU_BORDER="Menu Border Color"
+    ACCENT_COLORS="Popular accent colors"
+    EDIT_PALETTE="Edit color palette"
     RANDWALL="Set random wallpaper"
     SYSWALLPAPER="<b>System</b> Wallpapers"
     USERWALLPAPER="<b>User</b> Wallpapers"
@@ -126,6 +200,12 @@ case "$LANG" in
     SETTINGS_AND_HELP="Settings and Help"
     SETTINGS="Settings"
     COLORIZER_SETTINGS="Colorizer Settings"
+    AUTOGEN_THEMES="Autogenerate themes?"
+    GENERATETHEMES="Generate themes on wallpaper change?"
+    GENOB="Colorize Window Decorations?"
+    GENMENU="Colorize Menus and Panels?"
+    GENCONKY="Colorize Conky?"
+    GENPYRADIO="Colorize PyRadio?"
     GRADIENTS_ACT="Gradients in Rootmenu actions"
     EDITCONF="Edit config file"
     RESET="Reset to defaults"
@@ -144,7 +224,7 @@ case "$LANG" in
     SHOW="show"
     HIDE="hide"
     EDIT_RELATED="Edit related tools"
-    RESET_RELATED="Reset related tools"
+    RESET_RELATED="Restet related tools"
     LXAPPEARANCE="GTK theme and icons"
     THEMEMANAGER="Theme manager"
     WALLPAPERS="Wallpapers directories"
@@ -154,6 +234,9 @@ case "$LANG" in
     CHANGE="Change"
     USERDIR_NOT_EXIST="directory does not exist"
     CREATE_USERDIR="Create directory"
+    ROOTMENU_COLORS_ACTION="Rootmenu Colors Action"
+    ACCENT="<b>accent</b> - change accent color"
+    SELECT="<b>select</b> - select action from submenu"
     DIFF_CONKY_COLORS="Different colors for each Conky"
     HELP="Main Window and Help"
     RESET_COLORS="Reset Colors"
@@ -181,7 +264,7 @@ fi
 
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
@@ -208,15 +291,23 @@ mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c
 
 
 out+=("^sep(Mabox Colorizer)")
+out+=("  $SETTINGS,^checkout(settings)")
+LNG=${LANG:0:2}
+if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then
+out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Colorizer'")
+else
+out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
+fi
+out+=("^sep()")
 out+=("  $COLORIZE,^pipe(randomizer c)")
 out+=("^sep($MODULES)")
 out+=("<big></big>   $FONTS,colorizer-fonts -s")
 out+=("^sep()")
 out+=("$OBTHEME,colorizer-ob -s")
 
-#out+=("TINT2,colorizer-tint2 -s")
+#out+=("TINT2,^pipe(colorizer-tint2)")
 out+=("$MENUPANELS,colorizer-menus -s")
-out+=("$COLORIZER_CONKY,colorizer-conky -s")
+out+=("Conky Manager,colorizer-conky -s")
 out+=("^sep()")
 #out+=("Systray HW monitor,^pipe(colorizer-phwmon)")
 
@@ -231,14 +322,212 @@ out+=("$CAVA,colorizer-cava -s")
 #fi
 
 
+out+=("^sep($WALLCOLORS)")
+out+=("北  $REGENERATE,^checkout(regen)")
+    out2+=("^tag(regen)")
+    out2+=("^sep($REGENERATEALL)")
+    out2+=("   $ASCONFIGURED,w2theme colorize;colorizer -s")
+    out2+=("   $REVERSE,w2theme reverse;colorizer -s")
+    #out2+=("^sep($CURRENTCONF)")
+    #out2+=("$MENUPANELS [ <b>${wall2themes_menu}</b> ],^checkout(mp)")
+    #out2+=("Conky [ <b>${wall2themes_conky}</b> ],^checkout(conky)")
+    #out2+=("PyRadio [ <b>${wall2themes_pyradio}</b> ],^checkout(pyradio)")
 
+[[ $rootcolors = select ]]&& out+=("^sep($SELECT_ACTION)")||out+=("^sep($ACCENTINFO)")
+n=0
+for i in "${w[@]}"
+do
+if [ $rootcolors = select ];then
+((n+=1))
+out+=("<tt><small>$i</small> <span bgcolor='$i'>                      </span></tt>,^checkout(${i:1}${n}")
+out2+=("^tag(${i:1}${n})")
+out2+=("^sep(<tt>$COLOR <span bgcolor='$i'>    </span> <small>$i</small> <span bgcolor='$i'>    </span></tt>)")
+out2+=("$SETACCENT,w2theme accent '${i}';colorizer -s")
+out2+=("^sep(<big>OpenBox</big>)")
+out2+=("^sep(<small>$ACTIVE_WIN</small>)")
+out2+=("$OB_ACTIVE_BG,obtctl clractivebg '${i}';colorizer -s")
+out2+=("$OB_ACTIVE_BGTO,obtctl clractivebgto '${i}';colorizer -s")
+out2+=("$OB_ACTIVE_TEXT,obtctl activetextcolor '${i}';colorizer -s")
+out2+=("$OB_ACTIVE_BORDER,obtctl activeborderColor '${i}';colorizer -s")
+out2+=("^sep(<small>$INACTIVE_WIN</small>)")
+out2+=("$OB_INACTIVE_BG,obtctl clrnormalbg '${i}';colorizer -s")
+out2+=("$OB_INACTIVE_BGTO,obtctl clrnormalbgto '${i}';colorizer -s")
+out2+=("$OB_INACTIVE_TEXT,obtctl inactivetextcolor '${i}';colorizer -s")
+out2+=("$OB_INACTIVE_BORDER,obtctl inactiveborderColor '${i}';colorizer -s")
+
+out2+=("^sep(<big>$MENUPANELS</big>)")
+out2+=("$MENU_BGCOLOR,jgctl color_menu_bg '${i}';colorizer -s")
+out2+=("$MENU_SEP_BG,jgctl color_title_bg '${i}';colorizer -s")
+out2+=("$MENU_ITEM_FG,jgctl color_norm_fg '${i}';colorizer -s")
+out2+=("$MENU_ACTIVE_BG,jgctl color_sel_bg '${i}';colorizer -s")
+out2+=("$MENU_BORDER,jgctl color_menu_border '${i}';colorizer -s")
+
+out2+=("^sep(<big>Conky</big>)")
+out2+=("$CONKY_BGCOLOR_ALL,conkyctl win_bgcolor_all '${i}';colorizer -s")
+    # array with running conkies - only filenames with full path
+    readarray -t running < <(pgrep -af "conky.*mbcolor" | cut -d' ' -f4)
+
+if [[ ${#running[@]} > 0 ]];then
+        out2+=("^sep(<small>$RUNNING_CONKYS</small>)")
+        for c in ${running[@]};do
+            filename=${c##*/}
+            name=${filename%%_mb*}
+            title=${name//_/ }
+            out2+=("$BGCOLOR_OF ${title^},conkyctl win_bgcolor '${i}' '${c}';colorizer -s")
+        done   
+fi
+
+else
+    out+=("<tt><small>$i</small> <span bgcolor='$i'>                      </span></tt>,w2theme accent '${i}';colorizer -s")
+fi
+
+done
+out+=("^sep()")
+out+=("$ACCENT_COLORS,^checkout(acccolors)")
+out2+=("^tag(acccolors)")
+out2+=("^sep(Ubuntu)")
+for i in ${ubuntu[@]};do 
+if [ $rootcolors = select ];then
+((n+=1))
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>                      </span></tt>,^checkout(${i:1}${n}")
+out3+=("^tag(${i:1}${n})")
+out3+=("^sep(<tt>$COLOR <span bgcolor='$i'>    </span> <small>$i</small> <span bgcolor='$i'>    </span></tt>)")
+out3+=("$SETACCENT,w2theme accent '${i}';colorizer -s")
+out3+=("^sep(<big>OpenBox</big>)")
+out3+=("^sep(<small>$ACTIVE_WIN</small>)")
+out3+=("$OB_ACTIVE_BG,obtctl clractivebg '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BGTO,obtctl clractivebgto '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_TEXT,obtctl activetextcolor '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BORDER,obtctl activeborderColor '${i}';colorizer -s")
+out3+=("^sep(<small>$INACTIVE_WIN</small>)")
+out3+=("$OB_INACTIVE_BG,obtctl clrnormalbg '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BGTO,obtctl clrnormalbgto '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_TEXT,obtctl inactivetextcolor '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BORDER,obtctl inactiveborderColor '${i}';colorizer -s")
+
+out3+=("^sep(<big>$MENUPANELS</big>)")
+out3+=("$MENU_BGCOLOR,jgctl color_menu_bg '${i}';colorizer -s")
+out3+=("$MENU_SEP_BG,jgctl color_title_bg '${i}';colorizer -s")
+out3+=("$MENU_ITEM_FG,jgctl color_norm_fg '${i}';colorizer -s")
+out3+=("$MENU_ACTIVE_BG,jgctl color_sel_bg '${i}';colorizer -s")
+out3+=("$MENU_BORDER,jgctl color_menu_border '${i}';colorizer -s")
+
+out3+=("^sep(<big>Conky</big>)")
+out3+=("$CONKY_BGCOLOR_ALL,conkyctl win_bgcolor_all '${i}';colorizer -s")
+    # array with running conkies - only filenames with full path
+    readarray -t running < <(pgrep -af "conky.*mbcolor" | cut -d' ' -f4)
+
+if [[ ${#running[@]} > 0 ]];then
+        out3+=("^sep(<small>$RUNNING_CONKYS</small>)")
+        for c in ${running[@]};do
+            filename=${c##*/}
+            name=${filename%%_mb*}
+            title=${name//_/ }
+            out3+=("$BGCOLOR_OF ${title^},conkyctl win_bgcolor '${i}' '${c}';colorizer -s")
+        done   
+fi
+else
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>             </span></tt>,w2theme accent '${i}';colorizer -s")
+fi
+done
+out2+=("^sep(Mint)")
+for i in ${mint[@]};do 
+if [ $rootcolors = select ];then
+((n+=1))
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>                      </span></tt>,^checkout(${i:1}${n}")
+out3+=("^tag(${i:1}${n})")
+out3+=("^sep(<tt>$COLOR <span bgcolor='$i'>    </span> <small>$i</small> <span bgcolor='$i'>    </span></tt>)")
+out3+=("$SETACCENT,w2theme accent '${i}';colorizer -s")
+out3+=("^sep(<big>OpenBox</big>)")
+out3+=("^sep(<small>$ACTIVE_WIN</small>)")
+out3+=("$OB_ACTIVE_BG,obtctl clractivebg '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BGTO,obtctl clractivebgto '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_TEXT,obtctl activetextcolor '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BORDER,obtctl activeborderColor '${i}';colorizer -s")
+out3+=("^sep(<small>$INACTIVE_WIN</small>)")
+out3+=("$OB_INACTIVE_BG,obtctl clrnormalbg '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BGTO,obtctl clrnormalbgto '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_TEXT,obtctl inactivetextcolor '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BORDER,obtctl inactiveborderColor '${i}';colorizer -s")
+
+out3+=("^sep(<big>$MENUPANELS</big>)")
+out3+=("$MENU_BGCOLOR,jgctl color_menu_bg '${i}';colorizer -s")
+out3+=("$MENU_SEP_BG,jgctl color_title_bg '${i}';colorizer -s")
+out3+=("$MENU_ITEM_FG,jgctl color_norm_fg '${i}';colorizer -s")
+out3+=("$MENU_ACTIVE_BG,jgctl color_sel_bg '${i}';colorizer -s")
+out3+=("$MENU_BORDER,jgctl color_menu_border '${i}';colorizer -s")
+
+out3+=("^sep(<big>Conky</big>)")
+out3+=("$CONKY_BGCOLOR_ALL,conkyctl win_bgcolor_all '${i}';colorizer -s")
+    # array with running conkies - only filenames with full path
+    readarray -t running < <(pgrep -af "conky.*mbcolor" | cut -d' ' -f4)
+
+if [[ ${#running[@]} > 0 ]];then
+        out3+=("^sep(<small>$RUNNING_CONKYS</small>)")
+        for c in ${running[@]};do
+            filename=${c##*/}
+            name=${filename%%_mb*}
+            title=${name//_/ }
+            out3+=("$BGCOLOR_OF ${title^},conkyctl win_bgcolor '${i}' '${c}';colorizer -s")
+        done   
+fi
+else
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>             </span></tt>,w2theme accent '${i}';colorizer -s")
+fi
+done
+out2+=("^sep(Plasma)")
+for i in ${plasma[@]};do
+if [ $rootcolors = select ];then
+((n+=1))
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>                      </span></tt>,^checkout(${i:1}${n}")
+out3+=("^tag(${i:1}${n})")
+out3+=("^sep(<tt>$COLOR <span bgcolor='$i'>    </span> <small>$i</small> <span bgcolor='$i'>    </span></tt>)")
+out3+=("$SETACCENT,w2theme accent '${i}';colorizer -s")
+out3+=("^sep(<big>OpenBox</big>)")
+out3+=("^sep(<small>$ACTIVE_WIN</small>)")
+out3+=("$OB_ACTIVE_BG,obtctl clractivebg '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BGTO,obtctl clractivebgto '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_TEXT,obtctl activetextcolor '${i}';colorizer -s")
+out3+=("$OB_ACTIVE_BORDER,obtctl activeborderColor '${i}';colorizer -s")
+out3+=("^sep(<small>$INACTIVE_WIN</small>)")
+out3+=("$OB_INACTIVE_BG,obtctl clrnormalbg '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BGTO,obtctl clrnormalbgto '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_TEXT,obtctl inactivetextcolor '${i}';colorizer -s")
+out3+=("$OB_INACTIVE_BORDER,obtctl inactiveborderColor '${i}';colorizer -s")
+
+out3+=("^sep(<big>$MENUPANELS</big>)")
+out3+=("$MENU_BGCOLOR,jgctl color_menu_bg '${i}';colorizer -s")
+out3+=("$MENU_SEP_BG,jgctl color_title_bg '${i}';colorizer -s")
+out3+=("$MENU_ITEM_FG,jgctl color_norm_fg '${i}';colorizer -s")
+out3+=("$MENU_ACTIVE_BG,jgctl color_sel_bg '${i}';colorizer -s")
+out3+=("$MENU_BORDER,jgctl color_menu_border '${i}';colorizer -s")
+
+out3+=("^sep(<big>Conky</big>)")
+out3+=("$CONKY_BGCOLOR_ALL,conkyctl win_bgcolor_all '${i}';colorizer -s")
+    # array with running conkies - only filenames with full path
+    readarray -t running < <(pgrep -af "conky.*mbcolor" | cut -d' ' -f4)
+
+if [[ ${#running[@]} > 0 ]];then
+        out3+=("^sep(<small>$RUNNING_CONKYS</small>)")
+        for c in ${running[@]};do
+            filename=${c##*/}
+            name=${filename%%_mb*}
+            title=${name//_/ }
+            out3+=("$BGCOLOR_OF ${title^},conkyctl win_bgcolor '${i}' '${c}';colorizer -s")
+        done   
+fi
+else
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>             </span></tt>,w2theme accent '${i}';colorizer -s")
+fi
+done
 
 ### TODO Rework below as submenu(edit palette and present palette with HTML helper- to keep it on desktop, allowing to copy colors from it)
 
 ##out+=("^sep()")
 ##out+=("  $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr")
 
-
+# Przerobić na submenu
+if [[ "$wall2themes" == "yes" ]];then
 out+=("^sep($RANDWALL)")
 syswallp=$(shopt -s nullglob ; set -- /usr/share/backgrounds/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#)
 out+=("  $SYSWALLPAPER (<small>${syswallp}</small>),nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s")
@@ -248,6 +537,7 @@ out+=("  $SYSWALLPAPER (<small>${syswallp}</small>),nitrogen --random /usr/sh
 	fi
 	out+=("^sep()")
 	out+=("$WALLPAPERS,^checkout(wallpapersettings)")
+fi
 
 if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then
 	[[ "$gradient_obtheme" == "yes" ]] && OBGRAD="OB" || OBGRAD=""
@@ -256,15 +546,6 @@ if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then
 	out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span bgcolor='#5da97b'> </span><span bgcolor='#72ad77'> </span><span bgcolor='#84b171'> </span><span bgcolor='#95b66c'> </span><span bgcolor='#a5ba66'> </span><span bgcolor='#b5be61'> </span><span bgcolor='#c3c15a'> </span><span bgcolor='#d1c753'> </span><span bgcolor='#dfc94c'> </span><span bgcolor='#edce44'> </span><span bgcolor='#f4d03f'> </span></tt>  $PRE_GRADIENTS,^pipe(mbgrad)")
 fi
 
-out+=("^sep($SETTINGS)")
-out+=("  $SETTINGS,^checkout(settings)")
-LNG=${LANG:0:2}
-if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then
-out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Colorizer'")
-else
-out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
-fi
-
 ### RESET ACTIONS (replaced by Randomizer)
 #out+=("^sep($RESET_COLORS)")
 #out+=("$RESET_CHOOSE,^checkout(resetroot)")
@@ -285,7 +566,51 @@ fi
 ###
 
 out2+=("^tag(settings)")
+out2+=("^sep($AUTOGEN_THEMES)")
+[[ "$wall2themes" = "yes" ]] && out2+=("<big></big>  $AUTOGEN_THEMES,mb-setvar wall2themes=no $CNF_FILE;colorizer -s") || out2+=("<big></big>  $AUTOGEN_THEMES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s")
 
+out2+=("^sep()")
+
+out2+=("$OBTHEME [ <b>${wall2themes_ob}</b> ],^checkout(ob)")
+out3+=("^tag(ob)")
+out3+=("^sep($GENOB)")
+out3+=("$NO,mb-setvar wall2themes_ob=none $CNF_FILE;colorizer -s")
+out3+=("^sep()")
+out3+=("$LIGHTBG,mb-setvar wall2themes_ob=light $CNF_FILE;colorizer -s")
+out3+=("$DARKBG,mb-setvar wall2themes_ob=dark $CNF_FILE;colorizer -s")
+
+
+out2+=("$MENUPANELS [ <b>${wall2themes_menu}</b> ],^checkout(mp)")
+out3+=("^tag(mp)")
+out3+=("^sep($GENMENU)")
+out3+=("$NO,mb-setvar wall2themes_menu=none $CNF_FILE;colorizer -s")
+out3+=("^sep()")
+out3+=("$LIGHTBG,mb-setvar wall2themes_menu=light $CNF_FILE;colorizer -s")
+out3+=("$DARKBG,mb-setvar wall2themes_menu=dark $CNF_FILE;colorizer -s")
+
+
+out2+=("Conky [ <b>${wall2themes_conky}</b> ],^checkout(conky)")
+out3+=("^tag(conky)")
+out3+=("^sep($GENCONKY)")
+out3+=("$NO,mb-setvar wall2themes_conky=none $CNF_FILE;colorizer -s")
+out3+=("^sep()")
+out3+=("$LIGHTBG,mb-setvar wall2themes_conky=light $CNF_FILE;colorizer -s")
+out3+=("$DARKBG,mb-setvar wall2themes_conky=dark $CNF_FILE;colorizer -s")
+#out2+=("$DIFF_CONKY_COLORS [ <b>$conky_diff_colors</b> ],^checkout(conkycolors)")
+#out3+=("^tag(conkycolors)")
+#out3+=("^sep($DIFF_CONKY_COLORS)")
+#out3+=("$YES,mb-setvar conky_diff_colors=yes $CNF_FILE;colorizer -s")
+#out3+=("$NO,mb-setvar conky_diff_colors=no $CNF_FILE;colorizer -s")
+
+
+out2+=("PyRadio [ <b>${wall2themes_pyradio}</b> ],^checkout(pyradio)")
+out3+=("^tag(pyradio)")
+out3+=("^sep($GENPYRADIO)")
+out3+=("$NO,mb-setvar wall2themes_pyradio=none $CNF_FILE;colorizer -s")
+out3+=("^sep()")
+out3+=("$LIGHTBG,mb-setvar wall2themes_pyradio=light $CNF_FILE;colorizer -s")
+out3+=("$DARKBG,mb-setvar wall2themes_pyradio=dark $CNF_FILE;colorizer -s")
+#out2+=("^sep()")
 
 #out2+=("$WALLPAPERS,^checkout(wallpapersettings)")
 out3+=("^tag(wallpapersettings)")
@@ -337,6 +662,11 @@ out2+=("^sep($OTHER_SETTINGS)")
 #out2+=("$ADDLAUNCHER,cp /usr/share/applications/colorizer.desktop ~/.config/tint2/launcherapps/;killall -SIGUSR1 tint2;colorizer -s")
 #fi
 
+out2+=("$ROOTMENU_COLORS_ACTION [ <b>$rootcolors</b> ],^checkout(rootcolors)")
+out3+=("^tag(rootcolors)")
+out3+=("^sep($ROOTMENU_COLORS_ACTION)")
+out3+=("$ACCENT,mb-setvar rootcolors=accent $CNF_FILE;colorizer -s")
+out3+=("$SELECT,mb-setvar rootcolors=select $CNF_FILE;colorizer -s")
 out2+=("$HEIGHT [ <b>${colorizer_size}</b> ],^checkout(csize)")
 out3+=("^tag(csize)")
 out3+=("^sep($HEIGHT)")
@@ -406,11 +736,28 @@ if [[ "$1" == "-s" ]]; then
     
     mkconfigfile
 #THUMB="$(DISPLAY=:0 scrot -t 220x100 -o $HOME/.config/mabox/colorizer.png -e 'echo $m')"
-
+ case "$LANG" in
+        pl*) THGEN="generuj motywy:";;
+        *)   THGEN="auto theming:";;
+ esac
+if [ "$wall2themes" = "yes" ]; then
+    FGCOL="limegreen"
+    case "$LANG" in
+        pl*) STATE="on";;
+        *) STATE="on";;
+    esac
+else
+    FGCOL="red"
+    case "$LANG" in
+        pl*) STATE="off";;
+        *) STATE="off";;
+    esac
+fi
 cat <<EOF > ${MENU_ITEMS}
 @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB}
-
+@rect,,$((jgtools_padding)),$((jgtools_padding + 4)),270,20,0,left,top,#222222 20,#222222 70,
 @rect,,$((jgtools_padding)),$((jgtools_padding + 114)),270,32,0,left,top,#222222 20,#222222 70,
+@text,,$((jgtools_padding + 12)),$((jgtools_padding)),270,30,0,left,top,#FFFFFF ,${WINCLR}, <span size='10400' font_family='Ubuntu'><small>${THGEN}</small> <span fgcolor='$FGCOL'><b>$STATE</b></span></span>
 @text,,$((jgtools_padding + 168)),$((jgtools_padding + 116)),120,30,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Colorizer</b></span>
 $(printf '%s\n' "${dots[@]}")
 #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 34)),270,120,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer.png

bin/colorizer-cava

@@ -25,7 +25,7 @@ CFGFILE=~/.config/cava/config
 # get wallpaper color palette
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
@@ -44,6 +44,12 @@ fi
 case "$LANG" in
     pl*)
     INFO="Cava porady"
+    INFO_HEAD="Porady dla Cava"
+    INFO_TXT="\n1. Cava jest uruchomiona w przezroczystym oknie...\n \
+Możesz je więc <b>przesuwać</b> lub <b>zmieniać rozmiar</b> tak jak każde inne okno\n \
+<i>Przesuwanie</i>: przytrzymaj <b>Alt</b> i przeciągnij\n \
+<i>Zmiana rozmiaru</i>: przytrzymaj <b>Alt</b> i przeciągnij prawym przyciskiem myszy\n\n \
+2. Użyj strzałek <b> </b>, aby zmienić szerokość słupków"
     COLORIZE_CAVA="Pokoloruj Cava"
     COLOR="Jednolity kolor"
     REVERSE_GRADIENT="Odwróć kolory gradientu"
@@ -68,6 +74,12 @@ case "$LANG" in
     ;;
     *)
     INFO="CaVa tips &amp; tricks"
+    INFO_HEAD="Cava tips & tricks"
+    INFO_TXT="\n1. Cava runs inside transparent window...\n \
+So you can <b>move</b> or <b>resize</b> it like any other window\n \
+<i>Move</i>: hold <b>Alt</b> and drag\n \
+<i>Resize</i>: hold <b>Alt</b> and drag with right mouse button\n\n \
+2. Use arrows <b> </b> to change bar width"
     COLORIZE_CAVA="Colorize Cava"
     COLOR="Solid Color"
     REVERSE_GRADIENT="Reverse gradient's colors"
@@ -145,7 +157,7 @@ FGT=$(pastel textcolor ${FGC}|pastel format hex)
     out+=("󰑓   $RELOAD,cavactl reload;$me")
     out+=("󰑓   $RELOAD_COLORS,cavactl reload_colors;$me")
     out+=("^sep()")
-    out+=("   $INFO,cavactl info")
+    out+=("   $INFO,notify-send.sh -i music -u critical '$INFO_HEAD' '$INFO_TXT'")
     
 
 ### RUN
@@ -181,7 +193,7 @@ if [[ "$1" == "-s" ]]; then
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}

bin/colorizer-conky

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #    colorizer - set of tools for Mabox (auto)theming
-#    Copyright (C) 2022-2024 Daniel Napora    <napcok@gmail.com>
+#    Copyright (C) 2022-2023 Daniel Napora    <napcok@gmail.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv"
-USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv"
+USERSCHEMES="$HOME/.config/colorizer/conky/userschemes.csv"
 
 
 me="colorizer-conky -s"
@@ -53,7 +53,7 @@ fi
 ### Wallpaper colors
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
 n=${#HOME}
@@ -85,8 +85,6 @@ case "$LANG" in
     APPLY_SCHEME="Zastosuj"
     DELETE="Usuń"
     DELETE_SCHEME="Usuń schemat kolorów"
-    MONOCHROMATIC="Monochromatyczny"
-    CHOOSE_AND_PICK="Wybierz wariant i pobierz kolor..."
     GENERATEFROMWP="Generuj z kolorów tapety"
     LIGHTBG="Jasne tło"
     DARKBG="Ciemne tło"
@@ -124,7 +122,6 @@ case "$LANG" in
     RESETCOLORS="Przywróć domyślne kolory"
     AREYOUSURE="Czy aby napewno?"
     _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
-    _LEFTSIDEPANEL="Lewy panel boczny"
     ;;
     *)
     COLORIZECONKY="Conky Manager"
@@ -143,8 +140,6 @@ case "$LANG" in
     APPLY_SCHEME="Apply colorscheme"
     DELETE="Delete"
     DELETE_SCHEME="Delete colorscheme"
-    MONOCHROMATIC="Monochromatic"
-    CHOOSE_AND_PICK="Choose variant and pick color..."
     GENERATEFROMWP="Generate from wallpaper colors"
     LIGHTBG="Light Background"
     DARKBG="Dark Background"
@@ -182,7 +177,6 @@ case "$LANG" in
     RESETCOLORS="Restore default colors"
     AREYOUSURE="Are you sure?"
     _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -211,8 +205,7 @@ getvalues () {
     read BORD <<< "$(grep draw_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)"
     read STIP <<< "$(grep stippled_borders ${BASECONKY} | cut -d'=' -f2 | cut -d"," -f1)"
     
-    #currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
+    currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
-    cursettings="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|${WINTRANS}|${OUTLINE}|${SHADES}|${BORD}|${STIP}|"
 }
     
 if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
@@ -220,7 +213,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
     getvalues
     if [ ! -f "$USERSCHEMES" ]; then
 	mkdir -p "$HOME/.config/colorizer/conky/"
-	echo "WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name" > "$USERSCHEMES"
+	echo "WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |scheme_name" > "$USERSCHEMES"
 	fi
     
     
@@ -275,7 +268,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
     fi
     if [[ ${#notstarted[@]} > 0 ]];then
         out+=("^sep($MORECONKIES)")
-        if [[ "$ALLSUPP" < 12 ]];then
+        if [[ "$ALLSUPP" < 15 ]];then
             out+=("^sep(<small><i>$CLICKTOSTART</i></small>)")
             for c in ${notstarted[@]};do
                 filename=${c##*/}
@@ -321,49 +314,41 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
     out+=("^sep($GLOBALSETTINGS)")
     out+=("  $MOVEABLEALL,conkyctl makemoveableall")
     out+=("^sep()")
-    [[ "$WINTRANS" = true ]] && bga=1 || bga=100
+    out+=("<big><span bgcolor='$WINCLR'>   <span fgcolor='$CLR'></span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span>   </span></big> $REGENERATE,^checkout(regenconky)")
-    out+=("<big><span bgcolor='$WINCLR' bgalpha='${bga}%'>   <span fgcolor='$CLR'></span> <span fgcolor='$CLR0'></span> <span fgcolor='$CLR1'></span> <span fgcolor='$CLR2'></span>   </span></big> $REGENERATE,^checkout(regenconky)")
     out2+=("^tag(regenconky)")
     out2+=("^sep($REGENERATE)")
-    out2+=("^sep($MONOCHROMATIC)")
-	out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
-	out2+=("<big></big>   $DARKBG...,conkyctl mono pick dark")
-	out2+=("<big></big>   $LIGHTBG...,conkyctl mono pick light")
-    
-    out2+=("^sep($GENERATEFROMWP)")
-    out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'>  $LIGHTBG  <span fgcolor='${w[4]}'></span> <span fgcolor='${w[5]}'></span>  </span></big>,w2theme conky light;$me")
-    out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'>  $DARKBG  <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span>  </span></big>,w2theme conky dark;$me")
-    
     out2+=("^sep($SYSTEM_SCHEMES)")
 	n=1
-	while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
+	while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
 	do
 	((n=n+1))
-    [[ "$wintrans" = true ]] && bga=1 || bga=100
+    
-    out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,conkyctl applyscheme_all sys ${n};$me")
+    out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,conkyctl applyscheme_all sys ${n};$me")
     done < <(tail -n +2 "$SYSSCHEMES")
   
     out2+=("^sep($YOUR_SCHEMES)")
-    out2+=("<big></big>   $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}';$me")
+    out2+=("<big></big>   $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}';$me")
 	out2+=("<big></big>   $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
 	out2+=("^sep()")
     
     n=1
-	while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
+	while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
 	do
 	((n=n+1))
-    [[ "$wintrans" = true ]] && bga=1 || bga=100
+    
-    out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,^checkout(sch${n})")
+    out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,^checkout(sch${n})")
     #echo "${own_window_colour}|${default_color}|${color0}|${color1}|${color2}|${themename}" >> "$USERSCHEMES"
     out3+=("^tag(sch${n}")
 	out3+=("^sep($COLORSCHEME: ${scheme_name})")
-	out3+=("<big></big>   $APPLY_SCHEME <big><span bgcolor='$winclr'  bgalpha='${bga}%'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,conkyctl applyscheme_all usr ${n};$me")
+	out3+=("<big></big>   $APPLY_SCHEME <big><span bgcolor='$winclr'>    <span fgcolor='$clr'>󰯲</span>  <span fgcolor='$clr0'>󰝥</span>  <span fgcolor='$clr1'>󰲠</span>  <span fgcolor='$clr2'>󰲢</span>    </span></big>,conkyctl applyscheme_all usr ${n};$me")
 	out3+=("^sep($DELETE)")
 	out3+=("<big>󰗨</big>    $DELETE_SCHEME ${scheme_name},conkyctl delscheme ${n};$me")
 	done < <(tail -n +2 "$USERSCHEMES")
 
 
-    
+    out2+=("^sep($GENERATEFROMWP)")
+    out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'>  $LIGHTBG  <span fgcolor='${w[4]}'></span> <span fgcolor='${w[5]}'></span>  </span></big>,w2theme conky light;$me")
+    out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'>  $DARKBG  <span fgcolor='${w[-4]}'></span> <span fgcolor='${w[-5]}'></span>  </span></big>,w2theme conky dark;$me")
    
     out+=("^sep()")
   
@@ -418,7 +403,6 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
     [[ "$STIP" == 4 ]] && out2+=("<big>綠</big>  4 px,conkyctl stippled_borders_all 4;$me") || out2+=("<big>祿</big>  4 px,conkyctl stippled_borders_all 4;$me")
     
      out+=("^sep()")
-    pgrep -af "conky/sysinfo_mbcolor" > /dev/null || out+=("<big><span bgcolor='red' fgcolor='white'>    README <small>(important info)</small>    </span></big>,conkyctl baseconky_info")
     if [ "$WINTRANS" == false ];then
         out+=("<span bgcolor='$WINCLR'>   </span><span weight='bold' ${BG} fgcolor='$WINCLR'>  AbCd  </span>  $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')")
     else
@@ -479,7 +463,6 @@ if [[ "$1" == "-s" ]]; then
 
     out+=("^sep()")
     out+=(" ${arrow_string_left}    $_COLORIZER_ROOT,colorizer -s")
-    out+=(" ${arrow_string_left} ${arrow_string_left}    $_LEFTSIDEPANEL,mb-jgtools places")
 
     if [[ "$colorizer_size" == "full" ]];then
     eval $(xdotool getdisplaygeometry --shell)
@@ -501,7 +484,7 @@ if [[ "$1" == "-s" ]]; then
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}
@@ -520,7 +503,7 @@ if [[ "$1" == "-s" ]]; then
 
 cat <<EOF > ${MENU_ITEMS}
 @icon,,$((jgtools_padding)),$((jgtools_padding)),270,150,4,left,top,,,${THUMB}
-@rect,,$((jgtools_padding)),$((jgtools_padding + 116)),270,28,0,left,top,#222222 20,#222222 70,
+@rect,,$((jgtools_padding)),$((jgtools_padding + 112)),270,34,0,left,top,#222222 20,#222222 70,
 #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png
 @text,,$((jgtools_padding + 80)),$((jgtools_padding + 116)),190,30,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Conky</b> Manager &amp; Colorizer</span>
 @rect,,$((jgtools_padding + 239)),$((jgtools_padding + 2)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60,

bin/colorizer-fonts

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #    colorizer - set of tools for Mabox (auto)theming
-#    Copyright (C) 2022-2024 Daniel Napora    <napcok@gmail.com>
+#    Copyright (C) 2022-2023 Daniel Napora    <napcok@gmail.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -70,7 +70,6 @@ case "$LANG" in
 	_USE="Użyj czcionki"
 	_FOR="dla..."
 	_COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
-    _LEFTSIDEPANEL="Lewy panel boczny"
     ;;
     *)
 	_INCREASE_ALL="Increase all"
@@ -108,7 +107,6 @@ case "$LANG" in
 	_USE="Use"
 	_FOR="font for ..."
 	_COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -352,7 +350,6 @@ if [[ "$1" == "-s" ]]; then
 
     out+=("^sep()")
     out+=(" ${arrow_string_left}    $_COLORIZER_ROOT,colorizer -s")
-    out+=(" ${arrow_string_left} ${arrow_string_left}    $_LEFTSIDEPANEL,mb-jgtools places")
     
     if [[ "$colorizer_size" == "full" ]];then
     eval $(xdotool getdisplaygeometry --shell)
@@ -375,7 +372,7 @@ if [[ "$1" == "-s" ]]; then
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}

bin/colorizer-menus

@@ -25,7 +25,7 @@ USERSCHEMES="$HOME/.config/colorizer/menus/userschemes.csv"
 ### Wallpaper colors
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
 n=${#HOME}
@@ -67,7 +67,6 @@ case "$LANG" in
     pl*)
     MENU_THEME="Motyw menu"
     QUICK_TWEAKS="Ustawienia główne"
-    OVERALL_STYLE="Ogólny styl"
     SCHEMES="Motywy kolorystycznie"
     SYSTEM_SCHEMES="Systemowe"
     YOUR_SCHEMES="Moje motywy"
@@ -89,8 +88,6 @@ case "$LANG" in
     WIDE="szerokie"
     NORMAL="normalne"
     TIGHT="wąskie"
-    MONOCHROMATIC="Monochromatyczny"
-    CHOOSE_AND_PICK="Wybierz wariant i pobierz kolor..."
     GENERATEFROMWP="<i>Generuj z kolorów tapety...</i>"
     LIGHTBG="Jasne tło"
     DARKBG="Ciemne tło"
@@ -147,12 +144,10 @@ case "$LANG" in
     FILE="plik"
     SET_RANDOM="Ustaw losowy motyw menu"
     _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
-    _LEFTSIDEPANEL="Lewy panel boczny"
     ;;
     *)
     MENU_THEME="Menu theme"
     QUICK_TWEAKS="Global Settings/Quick Tweaks"
-    OVERALL_STYLE="Overall style"
     SCHEMES="Color Schemes"
     SYSTEM_SCHEMES="System colorschemes"
     YOUR_SCHEMES="My colorschemes"
@@ -174,8 +169,6 @@ case "$LANG" in
     WIDE="wide"
     NORMAL="normal"
     TIGHT="tight"
-    MONOCHROMATIC="Monochromatic"
-    CHOOSE_AND_PICK="Choose variant and pick color..."
     GENERATEFROMWP="<i>Generate from wallpaper colors...</i>"
     LIGHTBG="Light Background"
     DARKBG="Dark Background"
@@ -232,7 +225,6 @@ case "$LANG" in
     FILE="file"
     SET_RANDOM="Set random menu theme"
     _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -269,91 +261,89 @@ if [ ! -f "$USERSCHEMES" ]; then
 fi
 
 out+=("^sep($MENU_THEME: <i>${jgmenu_theme}</i>)")
-out+=("<big></big>   $QUICK_TWEAKS,^checkout(tweaks)")
+out+=("$QUICK_TWEAKS,^checkout(tweaks)")
+out2+=("^tag(tweaks)")
 
-	out2+=("^tag(tweaks)")
+out2+=("^sep(Overall style)")
-	out2+=("^sep($OVERALL_STYLE)")
+
-	######
+######
-	out2+=("$BORDER [ <b>${jgtools_border:-0}px</b> ],^checkout(mborder)")
+out2+=("$BORDER [ <b>${jgtools_border:-0}px</b> ],^checkout(mborder)")
-	out2+=("$PADDING [ <b>${jgtools_padding:-0}px</b> ],^checkout(mpadding)")
+out2+=("$PADDING [ <b>${jgtools_padding:-0}px</b> ],^checkout(mpadding)")
-	#out2+=("$RADIUS [ <b>${jgtools_radius:-0}</b> ],^checkout(mradius)")
+#out2+=("$RADIUS [ <b>${jgtools_radius:-0}</b> ],^checkout(mradius)")
-	out2+=("$SUBSPACING [ <b>${submenu_spacing:-0}px</b> ],^checkout(subspacing)")
+out2+=("$SUBSPACING [ <b>${submenu_spacing:-0}px</b> ],^checkout(subspacing)")
-	out2+=("^sep()")
+out2+=("^sep()")
-	out2+=("$LINE_HEIGHT [ <b>$item_height_factor%</b> ],^checkout(lineheight)")
+out2+=("$LINE_HEIGHT [ <b>$item_height_factor%</b> ],^checkout(lineheight)")
-	out2+=("^sep()")
+out2+=("^sep()")
-	out2+=("$ARROW_STRING [ <b>$arrow_string</b> ],^checkout(arrow)")
+out2+=("$ARROW_STRING [ <b>$arrow_string</b> ],^checkout(arrow)")
-	out2+=("$ARROW_STRING_LEFT [ <b>$arrow_string_left</b> ],^checkout(arrowleft)")
+out2+=("$ARROW_STRING_LEFT [ <b>$arrow_string_left</b> ],^checkout(arrowleft)")
 
 
-		out3+=("^tag(mborder)")
+out3+=("^tag(mborder)")
-		out3+=("^sep($BORDER)")
+out3+=("^sep($BORDER)")
-		for i in 0 1 2 3 4 5 6 8 10 12; do [[ "$jgtools_border" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%3s</tt></b>,%s" "$i" "jgctl border ${i}")") || out3+=("<big>祿</big>   $(printf "<tt>%3s</tt>,%s" "$i" "jgctl border ${i}")");done
+for i in 0 1 2 3 4 5 6 8 10 12; do [[ "$jgtools_border" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%3s</tt></b>,%s" "$i" "mb-setvar jgtools_border=${i};$me")") || out3+=("<big>祿</big>   $(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done
 
-		out3+=("^tag(mpadding)")
+out3+=("^tag(mpadding)")
-		out3+=("^sep($PADDING)")
+out3+=("^sep($PADDING)")
-		for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do [[ "$jgtools_padding" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%3s</tt></b>,%s" "$i" "jgctl padding ${i}")") || out3+=("<big>祿</big>   $(printf "<tt>%3s</tt>,%s" "$i" "jgctl padding ${i}")");done
+for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do [[ "$jgtools_padding" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%3s</tt></b>,%s" "$i" "mb-setvar jgtools_padding=${i};$me")") || out3+=("<big>祿</big>   $(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar jgtools_padding=${i};$me")");done
 
-		out3+=("^tag(subspacing)")
+#out3+=("^tag(mradius)")
-		out3+=("^sep($SUBSPACING)")
+#out3+=("^sep($RADIUS)")
-		for i in -20 -12 -10 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do [[ "$submenu_spacing" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%4s</tt></b>,%s" "$i" "mb-setvar submenu_spacing=${i};$me")") || out3+=("<big>祿</big>   $(printf "<tt>%4s</tt>,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done
+#for i in 0 1 2 3 4 6 8 12 14 16 18 20 40; do out3+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done
 
-		out3+=("^tag(lineheight)")
+out3+=("^tag(subspacing)")
-		out3+=("^sep($LINE_HEIGHT)")
+out3+=("^sep($SUBSPACING)")
+for i in -20 -12 -10 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do [[ "$submenu_spacing" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%4s</tt></b>,%s" "$i" "mb-setvar submenu_spacing=${i};$me")") || out3+=("<big>祿</big>   $(printf "<tt>%4s</tt>,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done
+
+out3+=("^tag(lineheight)")
+out3+=("^sep($LINE_HEIGHT)")
     for i in 160 180 200 220 240 280 300; do [[ "$item_height_factor" == $i ]] && out3+=("<big>綠</big>   $(printf "<b><tt>%4s%%</tt></b>,%s" "$i" "mb-setvar item_height_factor=${i};$me")") || out3+=("<big>祿</big>   $(printf "<tt>%4s%%</tt>,%s" "$i" "mb-setvar item_height_factor=${i};$me")");done
     
-		out3+=("^tag(arrow)")
+out3+=("^tag(arrow)")
-		out3+=("^sep($ARROW_STRING)")
+out3+=("^sep($ARROW_STRING)")
-		for i in "" "" "" "" "" "" "󰔰" "󰮺" "" "壟" "" "" "" "" "" "󰋇" "..." ":." "." "+" "^" "-" "_" "" "" "󰞔" "" ""; do [[ "$arrow_string" == $i ]] && out3+=("<tt>&gt;&gt;  </tt>$i<tt>  &lt;&lt;</tt>,$me") || out3+=("<tt>    </tt>$i,mb-setvar arrow_string=${i};$me");done
+for i in "" "" "" "" "" "" "󰔰" "󰮺" "" "壟" "" "" "" "" "" "󰋇" "..." ":." "." "+" "^" "-" "_" "" "" "󰞔" "" ""; do [[ "$arrow_string" == $i ]] && out3+=("<tt>&gt;&gt;  </tt>$i<tt>  &lt;&lt;</tt>,$me") || out3+=("<tt>    </tt>$i,mb-setvar arrow_string=${i};$me");done
 
-		out3+=("^tag(arrowleft)")
+out3+=("^tag(arrowleft)")
-		out3+=("^sep($ARROW_STRING_LEFT)")
+out3+=("^sep($ARROW_STRING_LEFT)")
-		for i in "" "" "" "" "" "" "󰶢" "󰮹" "" "鹿" "" "" "" "" "" "󰩔"; do [[ "$arrow_string_left" == $i ]] && out3+=("<tt>&gt;&gt;  </tt>$i<tt>  &lt;&lt;</tt>,$me") || out3+=("<tt>    </tt>$i,mb-setvar arrow_string_left=${i};$me");done
+for i in "" "" "" "" "" "" "󰶢" "󰮹" "" "鹿" "" "" "" "" "" "󰩔"; do [[ "$arrow_string_left" == $i ]] && out3+=("<tt>&gt;&gt;  </tt>$i<tt>  &lt;&lt;</tt>,$me") || out3+=("<tt>    </tt>$i,mb-setvar arrow_string_left=${i};$me");done
 
-	out2+=("^sep()")
+out2+=("^sep()")
-	out2+=("$MBG_OPACITY,^checkout(mbgopacity")
+out2+=("$MBG_OPACITY,^checkout(mbgopacity")
-		out3+=("^tag(mbgopacity)")
+out3+=("^tag(mbgopacity)")
-		out3+=("^sep(mbgopacity)")
+out3+=("^sep(mbgopacity)")
-		out3+=("100% Opaque,jgctl tweak opacity 100;$me")
+out3+=("100% Opaque,jgctl tweak opacity 100;$me")
-		out3+=("90%,jgctl tweak opacity 90;$me")
+out3+=("90%,jgctl tweak opacity 90;$me")
-		out3+=("80%,jgctl tweak opacity 80;$me")
+out3+=("80%,jgctl tweak opacity 80;$me")
-		out3+=("60%,jgctl tweak opacity 60;$me")
+out3+=("60%,jgctl tweak opacity 60;$me")
-		out3+=("50%,jgctl tweak opacity 50;$me")
+out3+=("50%,jgctl tweak opacity 50;$me")
-		out3+=("40%,jgctl tweak opacity 40;$me")
+out3+=("40%,jgctl tweak opacity 40;$me")
-		out3+=("30%,jgctl tweak opacity 30;$me")
+out3+=("30%,jgctl tweak opacity 30;$me")
-		out3+=("20%,jgctl tweak opacity 20;$me")
+out3+=("20%,jgctl tweak opacity 20;$me")
-		out3+=("10%,jgctl tweak opacity 10;$me")
+out3+=("10%,jgctl tweak opacity 10;$me")
-		out3+=("0% Fully transparent,jgctl tweak opacity 0;$me")
+out3+=("0% Fully transparent,jgctl tweak opacity 0;$me")
 
-	out2+=("^sep()")
+out2+=("^sep()")
-	out2+=("Solid Color,jgctl tweak solid;$me")
+out2+=("Solid Color,jgctl tweak solid;$me")
-	out2+=("Gradient,jgctl tweak gradient;$me")
+out2+=("Gradient,jgctl tweak gradient;$me")
 
 
-	out2+=("^sep($SIZING)")
+out2+=("^sep($SIZING)")
-	out2+=("$WIDE,jgctl tweak sizing wide;$me")
+out2+=("$WIDE,jgctl tweak sizing wide;$me")
-	out2+=("$NORMAL,jgctl tweak sizing normal;$me")
+out2+=("$NORMAL,jgctl tweak sizing normal;$me")
-	out2+=("$TIGHT,jgctl tweak sizing tight;$me")
+out2+=("$TIGHT,jgctl tweak sizing tight;$me")
 
 
 
-#### COLOR SCHEMES  
+#### COLOR SCHEMES
-out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgcolor='${SFG}'></span> <span fgcolor='${SBG}'></span> </span></big> $SCHEMES,^checkout(schemes)")
+out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span>  <span fgcolor='${SFG}'></span>  <span fgcolor='${SBG}'></span> </span></big> $SCHEMES,^checkout(schemes)")
-	out2+=("^tag(schemes)")
+out2+=("^tag(schemes)")
-	out2+=("^sep($SCHEMES)")
+out2+=("^sep($SCHEMES)")
-	out2+=("^sep($MONOCHROMATIC)")
+out2+=("^sep($SYSTEM_SCHEMES)")
-	out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
-	out2+=("<big></big>   $LIGHTBG...,jgctl mono pick light")
-	out2+=("<big></big>   $DARKBG...,jgctl mono pick dark")
-	out2+=("^sep($GENERATEFROMWP)")
-	out2+=("<big><span bgcolor='${w[-3]}'>     <span bgcolor='${w[-5]}'>     <span bgcolor='${w[-1]}' fgcolor='${w[1]}'>    $LIGHTBG   </span>     </span>     </span></big>,w2theme menu light;$me")
-	out2+=("<big><span bgcolor='${w[1]}'>     <span bgcolor='${w[4]}'>     <span bgcolor='${w[2]}' fgcolor='${w[-2]}'>    $DARKBG   </span>     </span>     </span></big>,w2theme menu dark;$me")
-	out2+=("^sep($SYSTEM_SCHEMES)")
 
-	n=1
+n=1
-	while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
+while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
-	do
+do
-	((n=n+1))
+((n=n+1))
-	case "$grad" in
+case "$grad" in
     none)icon="󰄱";;
     top)icon="";;
     right)icon="";;
@@ -363,19 +353,19 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
     top_right)icon="";;
     bottom_left)icon="";;
     bottom_right)icon="";;
-	esac
+esac
-	out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='${mbg}' fgcolor='${nfg}'>  <small>item</small>          <span bgcolor='${tbg}' fgcolor='${tfg}'> <small><b>title</b></small> </span> <span bgcolor='${sbg}' fgcolor='${sfg}'> <small>[ sel ]</small> </span>  <span bgcolor='${mbgt}'> <small>${icon}</small> </span></span></big>,jgctl applyscheme sys $n;$me")
+out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='${mbg}' fgcolor='${nfg}'>  <small>item</small>          <span bgcolor='${tbg}' fgcolor='${tfg}'> <small><b>title</b></small> </span> <span bgcolor='${sbg}' fgcolor='${sfg}'> <small>[ sel ]</small> </span>  <span bgcolor='${mbgt}'> <small>${icon}</small> </span></span></big>,jgctl applyscheme sys $n;$me")
-	done < <(tail -n +2 "$SYSSCHEMES")
+done < <(tail -n +2 "$SYSSCHEMES")
 
-	out2+=("^sep($YOUR_SCHEMES)")
+out2+=("^sep($YOUR_SCHEMES)")
-	out2+=("<big></big>   $SAVE_CURRSCHEME,jgctl savescheme '${currcolors}';$me")
+out2+=("<big></big>   $SAVE_CURRSCHEME,jgctl savescheme '${currcolors}';$me")
-	out2+=("<big></big>   $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
+out2+=("<big></big>   $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
-	out2+=("^sep()")
+out2+=("^sep()")
-	n=1
+n=1
-	while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
+while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
-	do
+do
-	((n=n+1))
+((n=n+1))
-	case "$grad" in
+case "$grad" in
     none)icon="󰄱";;
     top)icon="";;
     right)icon="";;
@@ -385,70 +375,22 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
     top_right)icon="";;
     bottom_left)icon="";;
     bottom_right)icon="";;
-	esac
+esac
-	out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='${mbg}' fgcolor='${nfg}'>  <small>item</small>          <span bgcolor='${tbg}' fgcolor='${tfg}'> <small><b>title</b></small> </span> <span bgcolor='${sbg}' fgcolor='${sfg}'> <small>[ sel ]</small> </span> <span bgcolor='${mbgt}'> <small>${icon}</small> </span></span></big>,^checkout(sch${n})")
+out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='${mbg}' fgcolor='${nfg}'>  <small>item</small>          <span bgcolor='${tbg}' fgcolor='${tfg}'> <small><b>title</b></small> </span> <span bgcolor='${sbg}' fgcolor='${sfg}'> <small>[ sel ]</small> </span> <span bgcolor='${mbgt}'> <small>${icon}</small> </span></span></big>,^checkout(sch${n})")
-	out3+=("^tag(sch${n}")
+out3+=("^tag(sch${n}")
-	out3+=("^sep($COLORSCHEME: ${scheme_name})")
+out3+=("^sep($COLORSCHEME: ${scheme_name})")
-	out3+=("<big></big>   $APPLY_SCHEME,jgctl applyscheme usr ${n};$me")
+out3+=("<big></big>   $APPLY_SCHEME,jgctl applyscheme usr ${n};$me")
-	out3+=("^sep($DELETE)")
+out3+=("^sep($DELETE)")
-	out3+=("<big>󰗨</big>    $DELETE_SCHEME ${scheme_name},jgctl delscheme ${n};$me")
+out3+=("<big>󰗨</big>    $DELETE_SCHEME ${scheme_name},jgctl delscheme ${n};$me")
-	done < <(tail -n +2 "$USERSCHEMES")
+done < <(tail -n +2 "$USERSCHEMES")
 
 
-out+=("^sep($FONTS)")
-out+=("<big>󰛖</big>   $TITLE [ <b>$menu_sep_font_family $menu_sep_font_size</b> ],^checkout(mtitlefont)")
-out+=("<big>󰛖</big>   $ITEM [ <b>$menu_font_family $menu_font_size</b> ],^checkout(mitemfont)")
 
-	# Item font submenu
+out2+=("^sep($GENERATEFROMWP)")
-	out2+=("^tag(mitemfont)")
+out2+=("<big><span bgcolor='${w[-3]}'>     <span bgcolor='${w[-5]}'>     <span bgcolor='${w[-1]}' fgcolor='${w[1]}'>    $LIGHTBG   </span>     </span>     </span></big>,w2theme menu light;$me")
-	out2+=("^sep($ITEM_FONT)")
+out2+=("<big><span bgcolor='${w[1]}'>     <span bgcolor='${w[4]}'>     <span bgcolor='${w[2]}' fgcolor='${w[-2]}'>    $DARKBG   </span>     </span>     </span></big>,w2theme menu dark;$me")
-	out2+=("<big>󰛖</big>   $FONT_CUSTOM,mb-setfont menu_item;$me")
-	out2+=("^sep($FONT_SIZE)")
-	out2+=("<big>󰧴</big>   $INCREASE <b>$((menu_font_size+1)) px</b>,mb-setvar menu_font_size=$((menu_font_size+1));$me")
-	out2+=("<big>󰧳</big>   $DECREASE <b>$((menu_font_size-1)) px</b>,mb-setvar menu_font_size=$((menu_font_size-1));$me")
-	out2+=("^sep()")
-	sizes=(14 13 12 11 10 9 8)
-	for i in "${sizes[@]}"
-		do
-		[[ "$menu_font_size" == "$i" ]] && out2+=("<big>綠</big>  <b>$i px</b>,$me") || out2+=("<big>祿</big>  $i px,mb-setvar menu_font_size=$i;$me")
-	done
 
-	if [ -f "$HOME/.config/mabox/fonts.list" ];then
-				mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list)
-	else
-				mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list)
-				cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/
-	fi
 
-	if [ "${#favfonts[@]}" -gt 0 ];then
-		out2+=("^sep($FONT_FAMILY)")
-		for fon in "${favfonts[@]}";do
-		[[ "$menu_font_family" == "$fon" ]] && out2+=("<big>綠</big>  <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big>  <span font_family=\"${fon}\">${fon}</span>,mb-setvar \"menu_font_family='${fon}'\";$me")
-		done
-	fi
-
-	out2+=("^tag(mtitlefont)")
-	out2+=("^sep($TITLE_FONT)")
-	out2+=("<big>󰛖</big>   $FONT_CUSTOM,mb-setfont menu_sep;$me")
-
-	out2+=("^sep($FONT_SIZE)")
-	out2+=("<big>󰧴</big>   $INCREASE <b>$((menu_sep_font_size+1)) px</b>,mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me")
-	out2+=("<big>󰧳</big>   $DECREASE <b>$((menu_sep_font_size-1)) px</b>,mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me")
-	out2+=("^sep()")
-	sizes=(14 13 12 11 10 9 8)
-	for i in "${sizes[@]}"
-		do
-		[[ "$menu_sep_font_size" == "$i" ]] && out2+=("<big>綠</big>  <b>$i px</b>,$me") || out2+=("<big>祿</big>  $i px,mb-setvar menu_sep_font_size=$i;$me")
-	done
-
-	if [ "${#favfonts[@]}" -gt 0 ];then
-		out2+=("^sep($FONT_FAMILY)")
-		for fon in "${favfonts[@]}";do
-		[[ "$menu_sep_font_family" == "$fon" ]] && out2+=("<big>綠</big>  <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big>  <span font_family=\"${fon}\">${fon}</span>,mb-setvar \"menu_sep_font_family='${fon}'\";$me")
-		done
-	fi
-
-### MENU
 out+=("^sep(Menu)")
 out+=("<tt><small>$(printf '%3s' "$MBGA")</small> <span bgcolor='$MBG' bgalpha='${MBGA/#[0]/1}%'>     </span><span bgcolor='$MBG'> </span></tt>   $COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg '${COLOR_MENU_BG}' '$me')")
 out+=("<tt><small>$(printf '%3s' "$MBGTA")</small> <span bgcolor='$MBGT' bgalpha='${MBGTA/#[0]/1}%'>     </span><span bgcolor='$MBGT'> </span></tt>   $COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to '${COLOR_MENU_BG_TO}' '$me')")
@@ -470,11 +412,94 @@ case "$GRADIENT" in
 esac
 
 out+=("<big>$icon</big>   $GRADIENT_POS [ <b>$GRADIENT</b> ],^checkout(gradientpos)")
-out+=("<big></big>   $GRADIENT_REVERSE,jgctl gradient '${MBGT}' '${MBG}';$me")
+
+out+=("<big>凌</big>   $GRADIENT_REVERSE,jgctl gradient '${MBGT}' '${MBG}';$me")
+
 out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span bgcolor='#5da97b'> </span><span bgcolor='#72ad77'> </span><span bgcolor='#84b171'> </span><span bgcolor='#95b66c'> </span><span bgcolor='#a5ba66'> </span><span bgcolor='#b5be61'> </span><span bgcolor='#c3c15a'> </span><span bgcolor='#d1c753'> </span><span bgcolor='#dfc94c'> </span><span bgcolor='#edce44'> </span><span bgcolor='#f4d03f'> </span></tt>  $PRE_GRADIENTS,^pipe(mbgrad menu)")
 
-### TITLE/SEPARATOR
+
+out+=("^sep($ITEM)")
+
+out+=("<tt><small>$(printf '%3s' "$NFGA")</small> <span weight='bold' fgcolor='$NFG' fgalpha='${NFGA/#[0]/1}%'> AbCd </span></tt>   $COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg '${COLOR_NORM_FG}' '$me')")
+
+
+out+=("^sep()")
+[[ ! -z "$NORMBG" ]] && out+=("<tt><small>$(printf '%3s' "$NORMBGA")</small> <span bgcolor='${NORMBG}' bgalpha='${NORMBGA/#[0]/1}%'>     </span><span bgcolor='${NORMBG}'> </span></tt>   $COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg '${COLOR_NORM_BG}' '$me')" "^sep()")
+out+=("$I_BORDER [ <b>$IBORDER</b> ] $I_RADIUS [ <b>$IRADIUS</b> ],^checkout(itemborder_radius)")
+
+out+=("^sep($SEL_ITEM)")
+out+=("<tt><small>$(printf '%3s' "$SBGA")</small> <span bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%'>     </span><span bgcolor='$SBG'> </span></tt>   $COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg '${COLOR_SEL_BG}' '$me')")
+out+=("<tt><small>$(printf '%3s' "$SFGA")</small> <span weight='bold' bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%' fgcolor='$SFG' fgalpha='${SFGA/#[0]/1}%'> AbCd </span></tt>   $COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg '${COLOR_SEL_FG}' '$me')")
+if [[ "$IBORDER" != "0" ]];then
+out+=("<tt><small>$(printf '%3s' "$SBORDERA")</small> <span bgcolor='$SBORDER' bgalpha='${SBORDERA/#[0]/1}%'>     </span><span bgcolor='$SBORDER'> </span></tt>   $COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border '${COLOR_SEL_BORDER}' '$me')")
+fi
+out+=("^sep()")
+out+=("Apply <big><span bgcolor='${SBG}' fgcolor='${SFG}'>     accent     </span></big> preset,^checkout(sel_accents)")
+
+out2+=("^tag(sel_accents)")
+out2+=("^sep(Accent presets)")
+while IFS="," read -r BG FG BGNAME FGNAME
+do
+[[ "$BGNAME" == "" ]] && BGNAME=${BG}
+[[ "$FGNAME" == "" ]] && FGNAME=${FG}
+out2+=("<big><span bgcolor='${FG}'>    <span bgcolor='${BG}' fgcolor='${FG}'><small><tt>$(printf '%*s' 25 "${FGNAME} on ${BGNAME}")</tt></small>   </span> </span></big>,jgctl accent '${BG}' '${FG}';$me")
+out21+=("<big><span bgcolor='${BG}'>    <span bgcolor='${FG}' fgcolor='${BG}'><small><tt>$(printf '%*s' 25 "${BGNAME} on ${FGNAME}")</tt></small>   </span> </span></big>,jgctl accent '${FG}' '${BG}';$me")
+done < <(tail -n +2 /usr/share/mabox-colorizer/readable_colors.csv)
+out2+=("${out21[@]}")
+
+# Item font submenu
+out2+=("^tag(mitemfont)")
+out2+=("^sep($ITEM_FONT)")
+out2+=("<big>󰛖</big>   $FONT_CUSTOM,mb-setfont menu_item;$me")
+out2+=("^sep($FONT_SIZE)")
+out2+=("<big>󰧴</big>   $INCREASE <b>$((menu_font_size+1)) px</b>,mb-setvar menu_font_size=$((menu_font_size+1));$me")
+out2+=("<big>󰧳</big>   $DECREASE <b>$((menu_font_size-1)) px</b>,mb-setvar menu_font_size=$((menu_font_size-1));$me")
+out2+=("^sep()")
+sizes=(14 13 12 11 10 9 8)
+for i in "${sizes[@]}"
+	do
+	[[ "$menu_font_size" == "$i" ]] && out2+=("<big>綠</big>  <b>$i px</b>,$me") || out2+=("<big>祿</big>  $i px,mb-setvar menu_font_size=$i;$me")
+done
+
+if [ -f "$HOME/.config/mabox/fonts.list" ];then
+			mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list)
+else
+			mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list)
+			cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/
+fi
+  
+if [ "${#favfonts[@]}" -gt 0 ];then
+	out2+=("^sep($FONT_FAMILY)")
+    for fon in "${favfonts[@]}";do
+    [[ "$menu_font_family" == "$fon" ]] && out2+=("<big>綠</big>  <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big>  <span font_family=\"${fon}\">${fon}</span>,mb-setvar \"menu_font_family='${fon}'\";$me")
+    done
+fi
+
+
 out+=("^sep($SEPARATOR_TITLE)")
+
+
+out2+=("^tag(mtitlefont)")
+out2+=("^sep($TITLE_FONT)")
+out2+=("<big>󰛖</big>   $FONT_CUSTOM,mb-setfont menu_sep;$me")
+
+out2+=("^sep($FONT_SIZE)")
+out2+=("<big>󰧴</big>   $INCREASE <b>$((menu_sep_font_size+1)) px</b>,mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me")
+out2+=("<big>󰧳</big>   $DECREASE <b>$((menu_sep_font_size-1)) px</b>,mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me")
+out2+=("^sep()")
+sizes=(14 13 12 11 10 9 8)
+for i in "${sizes[@]}"
+	do
+	[[ "$menu_sep_font_size" == "$i" ]] && out2+=("<big>綠</big>  <b>$i px</b>,$me") || out2+=("<big>祿</big>  $i px,mb-setvar menu_sep_font_size=$i;$me")
+done
+
+if [ "${#favfonts[@]}" -gt 0 ];then
+    out2+=("^sep($FONT_FAMILY)")
+    for fon in "${favfonts[@]}";do
+    [[ "$menu_sep_font_family" == "$fon" ]] && out2+=("<big>綠</big>  <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big>  <span font_family=\"${fon}\">${fon}</span>,mb-setvar \"menu_sep_font_family='${fon}'\";$me")
+    done
+fi
+  
 out+=("<tt><small>$(printf '%3s' "$TBGA")</small> <span bgcolor='$TBG' bgalpha='${TBGA}%'>     </span><span bgcolor='$TBG'> </span></tt>   $COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg '${COLOR_TITLE_BG}' '$me')")
 out+=("<tt><small>$(printf '%3s' "$TFGA")</small> <span weight='bold' bgcolor='$TBG' bgalpha='${TBGA/#[0]/1}%' fgcolor='$TFG' fgalpha='${TFGA}%'> AbCd </span></tt>   $COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg '${COLOR_TITLE_FG}' '$me')")
 out+=("<tt><small>$(printf '%3s' "$TBORDERA")</small> <span bgcolor='$TBORDER' bgalpha='${TBORDERA/#[0]/1}%'>     </span><span bgcolor='$TBORDER'> </span></tt>   $COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border '${COLOR_TITLE_BORDER}' '$me')")
@@ -491,34 +516,9 @@ out+=("^sep()")
 out+=("<tt><small>$(printf '%3s' "$SEPFGA")</small> <span fgcolor='$SEPFG' fgalpha='${SEPFGA/#[0]/1}%'>------</span></tt>   ${COLOR_SEP_FG},^pipe(mbclr '$SEPFG' jgctl color_sep_fg '${COLOR_SEP_FG}' '$me')")
 
 
-### SELECTED ITEM (ACCENT)
+out+=("^sep($FONTS)")
-out+=("^sep($SEL_ITEM)")
+out+=("<big>󰛖</big>   $TITLE [ <b>$menu_sep_font_family $menu_sep_font_size</b> ],^checkout(mtitlefont)")
-out+=("<tt><small>$(printf '%3s' "$SBGA")</small> <span bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%'>     </span><span bgcolor='$SBG'> </span></tt>   $COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg '${COLOR_SEL_BG}' '$me')")
+out+=("<big>󰛖</big>   $ITEM [ <b>$menu_font_family $menu_font_size</b> ],^checkout(mitemfont)")
-out+=("<tt><small>$(printf '%3s' "$SFGA")</small> <span weight='bold' bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%' fgcolor='$SFG' fgalpha='${SFGA/#[0]/1}%'> AbCd </span></tt>   $COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg '${COLOR_SEL_FG}' '$me')")
-if [[ "$IBORDER" != "0" ]];then
-out+=("<tt><small>$(printf '%3s' "$SBORDERA")</small> <span bgcolor='$SBORDER' bgalpha='${SBORDERA/#[0]/1}%'>     </span><span bgcolor='$SBORDER'> </span></tt>   $COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border '${COLOR_SEL_BORDER}' '$me')")
-fi
-out+=("^sep()")
-out+=("Apply <big><span bgcolor='${SBG}' fgcolor='${SFG}'>     accent     </span></big> preset,^checkout(sel_accents)")
-
-	out2+=("^tag(sel_accents)")
-	out2+=("^sep(Accent presets)")
-	while IFS="," read -r BG FG BGNAME FGNAME
-	do
-	[[ "$BGNAME" == "" ]] && BGNAME=${BG}
-	[[ "$FGNAME" == "" ]] && FGNAME=${FG}
-	out2+=("<big><span bgcolor='${FG}'>    <span bgcolor='${BG}' fgcolor='${FG}'><small><tt>$(printf '%*s' 25 "${FGNAME} on ${BGNAME}")</tt></small>   </span> </span></big>,jgctl accent '${BG}' '${FG}';$me")
-	out21+=("<big><span bgcolor='${BG}'>    <span bgcolor='${FG}' fgcolor='${BG}'><small><tt>$(printf '%*s' 25 "${BGNAME} on ${FGNAME}")</tt></small>   </span> </span></big>,jgctl accent '${FG}' '${BG}';$me")
-	done < <(tail -n +2 /usr/share/mabox-colorizer/readable_colors.csv)
-	out2+=("${out21[@]}")
-
-### ITEM
-out+=("^sep($ITEM)")
-out+=("<tt><small>$(printf '%3s' "$NFGA")</small> <span weight='bold' fgcolor='$NFG' fgalpha='${NFGA/#[0]/1}%'> AbCd </span></tt>   $COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg '${COLOR_NORM_FG}' '$me')")
-out+=("^sep()")
-[[ ! -z "$NORMBG" ]] && out+=("<tt><small>$(printf '%3s' "$NORMBGA")</small> <span bgcolor='${NORMBG}' bgalpha='${NORMBGA/#[0]/1}%'>     </span><span bgcolor='${NORMBG}'> </span></tt>   $COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg '${COLOR_NORM_BG}' '$me')" "^sep()")
-out+=("$I_BORDER [ <b>$IBORDER</b> ] $I_RADIUS [ <b>$IRADIUS</b> ],^checkout(itemborder_radius)")
-
 
 
 
@@ -560,10 +560,14 @@ out2+=("^sep()")
 [[ "$IRADIUS" == 6 ]] && out2+=("<big>綠</big>   6 px,jgctl item_radius 6;$me") || out2+=("<big>祿</big>   6 px,jgctl item_radius 6;$me")
 
 
-#out+=("^sep($MORE_MENU_SETTINGS)")
+out+=("^sep($MORE_MENU_SETTINGS)")
-#out+=("   $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c")
+out+=("   $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c")
 #out+=("$GLOBAL_MENU_SETTINGS,^pipe(jgmenusettings-pipe -r)")
 
+
+### We don't need many menu themes anymore
+#out+=("   $SET_RANDOM,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
+
 ### RUN
 if [[ "$1" == "-s" ]]; then
     . /usr/share/mb-jgtools/pipemenu-standalone.cfg
@@ -575,7 +579,6 @@ if [[ "$1" == "-s" ]]; then
 
     out+=("^sep()")
     out+=(" ${arrow_string_left}    $_COLORIZER_ROOT,colorizer -s")
-    out+=(" ${arrow_string_left} ${arrow_string_left}    $_LEFTSIDEPANEL,mb-jgtools places")
 
     if [[ "$colorizer_size" == "full" ]];then
     eval $(xdotool getdisplaygeometry --shell)
@@ -598,7 +601,7 @@ if [[ "$1" == "-s" ]]; then
 JGWIDTH=$((jgtools_padding + 270 + jgtools_padding))
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}

bin/colorizer-ob

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #    colorizer - set of tools for Mabox (auto)theming
-#    Copyright (C) 2022-2024 Daniel Napora    <napcok@gmail.com>
+#    Copyright (C) 2022-2023 Daniel Napora    <napcok@gmail.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -20,26 +20,6 @@ MBCOLORSDIR="$HOME"/.themes/MBcolors/openbox-3/
 GRADIENT_FILE="$HOME"/.config/colorizer/gradients_all.inc
 MORE_GRADIENT_FILE="$HOME"/.config/colorizer/gradients_menu.inc
 
-SYSTHEMES="/usr/share/mabox-colorizer/colorschemes/ob.csv"
-USERTHEMES="$HOME/.config/colorizer/openbox/userthemes.csv"
-
-### Wallpaper colors
-WALLPALDIR="$HOME/.cache/colorizer/palettes"
-mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
-NAME=${WALLPATH////_}
-if [[ "${NAME}" =~ ^_home_.* ]]; then
-n=${#HOME}
-((n++))
-NAME=${NAME:${n}}
-fi
-
-if [ ! -f "$WALLPALDIR/$NAME.clr" ]; then
-convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$NAME.clr"
-fi
-mapfile -t w < "$WALLPALDIR/$NAME.clr"
-
-
 if [ ! -f "$GRADIENT_FILE" ]; then
 cp /usr/share/mabox-colorizer/gradients.inc "$GRADIENT_FILE"
 fi
@@ -57,33 +37,14 @@ me="colorizer-ob -s"
 
 case "$LANG" in
     pl*)
-    QUICK_TWEAKS="Ustawienia główne"
-    OVERALL_STYLE="Ogólny styl"
-    THEMES="Motywy"
-    SYSTEM_THEMES="Systemowe"
-    YOUR_THEMES="Moje motywy"
-    SAVE_CURRTHEME="Zapisz aktualną kobfigurację jako..."
-    OPEN_THEMEFILE="Odwórz plik z motywami w edytorze"
-    THEME="Motyw"
-    APPLY="Zastosuj"
-    APPLY_THEME="Pełny motyw (kolory, czcionki i rozmiar)"
-    APPLY_SCHEME="Tylko kolory"
-    DELETE="Usuń"
-    DELETE_THEME="Usuń motyw"
     OBTHEME_LBL="Motyw OpenBox"
-    MONOCHROMATIC="Monochromatyczny"
-    CHOOSE_AND_PICK="Wybierz wariant i pobierz kolor..."
     GENERATEFROMWP="Generuj z kolorów tapety..."
-    LIGHTBG=" Jasne tło"
+    LIGHTBG="Jasne"
-    DARKBG="Ciemne tło"
+    DARKBG="Ciemne"
-    RANDOMIZE="Generuj losowo"
     TITLEBAR="Pasek tytułowy"
-    ACTIVE_WINDOW="Aktywne okno"
-    INACTIVE_WINDOW="Nieaktywne okno"
     TITLEBAR_FONT="Czcionka"
     ACTIVE_BG="Tło aktywnego okna"
     INACTIVE_BG="Tło nieaktywnego okna"
-    TEXT_COLOR="Kolor tekstu"
     TITLEBAR_TEXT="Tekst paska tytułowego"
     FONT="Czcionka"
     FONTSIZE="Rozmiar czcionki"
@@ -110,7 +71,7 @@ case "$LANG" in
     FLAT="płaski - <b>flat</b>"
     RAISED="uniesiony - <b>raised</b>"
     SUNKEN="wklęsły - <b>sunken</b>"
-    BUTTONS_LBL="Przyciski"
+    BUTTONS="Przyciski"
     BUTTONS_LAYOUT="Układ przycisków"
     LEGEND="Legenda"
     GRADIENT_TYPE="Typ Gradientu"
@@ -140,35 +101,15 @@ case "$LANG" in
     UNLOCK="odblokuj swoją kreatywność..."
     SWITCH_TO_MBCOLORS="Przełącz na <b>MBColors</b>"
     _COLORIZER_ROOT="<b>Colorizer</b> - menu główne"
-    _LEFTSIDEPANEL="Lewy panel boczny"
     ;;
     *)
-    QUICK_TWEAKS="Global Settings/Quick Tweaks"
-    OVERALL_STYLE="Overall style"
-    THEMES="Themes"
-    SYSTEM_THEMES="System themes"
-    YOUR_THEMES="My Themes"
-    SAVE_CURRTHEME="Save current setup as..."
-    OPEN_THEMEFILE="Open themes file in editor"
-    THEME="Theme"
-    APPLY="Apply"
-    APPLY_THEME="Full theme (colors,fonts and sizing)"
-    APPLY_SCHEME="Colors only"
-    DELETE="Delete"
-    DELETE_THEME="Delete theme"
     OBTHEME_LBL="OpenBox theme"
-    MONOCHROMATIC="Monochromatic"
-    CHOOSE_AND_PICK="Choose variant and pick color..."
     GENERATEFROMWP="Generate from wallpaper colors..."
-    LIGHTBG="Light Background"
+    LIGHTBG="Light"
-    DARKBG="Dark Background"
+    DARKBG="Dark"
-    RANDOMIZE="Generate randomly"
     TITLEBAR="Title Bar"
-    ACTIVE_WINDOW="Active Window"
-    INACTIVE_WINDOW="Inactive Window"
     ACTIVE_BG="Active Background"
     INACTIVE_BG="Inactive Background"
-    TEXT_COLOR="Text color"
     TITLEBAR_TEXT="Title Bar Text"
     TITLEBAR_FONT="Title Bar Font"
     FONT="Font"
@@ -196,7 +137,7 @@ case "$LANG" in
     FLAT="flat"
     RAISED="raised"
     SUNKEN="sunken"
-    BUTTONS_LBL="Buttons"
+    BUTTONS="Buttons"
     BUTTONS_LAYOUT="Buttons Layout"
     LEGEND="Legend"
     GRADIENT_TYPE="Gradient type"
@@ -207,13 +148,13 @@ case "$LANG" in
     PYRAMID="Pyramid"
     SOLID_COLOR="Solid color (no gradient)"
     PRE_GRADIENTS="Predefined gradients"
-    GRADIENT_REVERSE="Reverse Gradient Colors"
+    GRADIENT_REVERSE="Reverse Gradient"
     ACTIVE_BG_TO="Active Background to"
     INACTIVE_BG_TO="Inactive Background to"
     BORDER="Window Border"
     BORDER_PX="Border (px)"
     ACTIVE_BORDER="Active Border"
-    INACTIVE_BORDER="Inactive Border"
+    INACTIVE_BORDER="Inactiva Border"
     HANDLEWIDTH="Handle Width"
     ACTIVEHANDLE="Active Handle"
     YES="Yes"
@@ -226,7 +167,6 @@ case "$LANG" in
     UNLOCK="Unlock your creativity..."
     SWITCH_TO_MBCOLORS="Switch to <b>MBColors</b>"
     _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -244,27 +184,7 @@ getvalues () {
     read TXTJUST <<< "$(grep text.justify ${THEMERC} | cut -d':' -f2)"
     read HANDLE <<< "$(grep handle.width ${THEMERC} | cut -d':' -f2)"
     read BORD <<< "$(grep border.width ${THEMERC} | cut -d':' -f2)"
-    #read BEVEL REST <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)"
+    read WINRAISED REST <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)"
-    read TITLEBG <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)"
-    case "${TITLEBG,,}" in
-		*flat*) BEVEL="flat";;
-		*raised*) BEVEL="raised";;
-		*sunken*) BEVEL="sunken";;
-	esac
-    case "${TITLEBG,,}" in
-		*solid*) GRAD=Solid;;
-		*splitvertical*) GRAD=SplitVertical;;
-		*vertical*) GRAD=Vertical;;
-		*mirrorhorizontal*) GRAD=MirrorHorizontal;;
-		*horizontal*) GRAD=Horizontal;;
-		*crossdiagonal*) GRAD=CrossDiagonal;;
-		*diagonal*) GRAD=Diagonal;;
-		*pyramid*) GRAD=Pyramid;;
-    
-    esac
-    but=$(<"$MBCOLORSDIR/.buttons")
-    BUTTONS=${but:-tiny}
-    #notify-send.sh "Buttons" "$BUTTONS"
     read AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
     if [ "$ABG" == "$AHBG" ];then
     AHANDLE="yes"
@@ -282,9 +202,7 @@ getvaluesrc() {
     FNAME=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:name'  "$cfg")
     NDSLIMC=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:titleLayout'  "$cfg")
     WEIGHT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:weight'  "$cfg")
-    WEIGHT_INACT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:weight'  "$cfg")
     SLANT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:slant'  "$cfg")   
-    SLANT_INACT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:slant'  "$cfg")
 }
 
 
@@ -323,121 +241,39 @@ if [[ -f "$THEMERC" ]] && [[ "$OBTHEME" = "MBcolor"* ]]; then
 getvalues
 getvaluesrc
 
-currvalues=("${ABG}|${ABGTO}|${AFG}|${ALINE}|${NBG}|${NBGTO}|${NFG}|${NLINE}|${GRAD,,}|${TXTJUST}|${PHEIGHT}|${PWIDTH}|${HANDLE}|${BORD}|${BEVEL}|${BUTTONS}|${FSIZE}|${FNAME}|${NDSLIMC}|${WEIGHT}|${SLANT}|")
-
-#notify-send.sh "$BEVEL" "${currvalues}"
-
-if [ ! -f "$USERTHEMES" ]; then
-	mkdir -p "$HOME/.config/colorizer/openbox/"
-	echo "  ABG  | ABGTO |  AFG  | ALINE |  NBG  | NBGTO |  NFG  | NLINE |  GRAD  |TXTJUST|PHEIGHT|PWIDTH|HANDLE|BORD|BEVEL|BUTTONS|FSIZE|FNAME|NDSLIMC|WEIGHT|SLANT|scheme_name" > "$USERTHEMES"
-fi
-
 #out+=("^sep($OBTHEME_LBL: <i>$OBTHEME</i>)")
 
-out+=("<big></big>   $QUICK_TWEAKS,^checkout(tweaks)")
-
-	out2+=("^tag(tweaks)")
-	out2+=("^sep(Overall style)")
-	out2+=("Large,obtctl tweak large;$me")
-	out2+=("Big,obtctl tweak big;$me")
-	out2+=("Normal,obtctl tweak normal;$me")
-	out2+=("Small,obtctl tweak small;$me")
-	out2+=("Tiny,obtctl tweak tiny;$me")
-	out2+=("^sep()")
-	out2+=("<big></big>   $RANDOMIZE,obtctl randomizer;$me")
-	out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"")
-	[[ "$BEVEL" == "flat" ]] && out2+=("<big>綠</big>  $FLAT,obtctl raised 0;$me") || out2+=("<big>祿</big>  $FLAT,obtctl raised 0;$me") 
-	[[ "$BEVEL" == "raised" ]] && out2+=("<big>綠</big>  $RAISED,obtctl raised 1;$me") || out2+=("<big>祿</big>  $RAISED,obtctl raised 1;$me")
-	[[ "$BEVEL" == "sunken" ]] && out2+=("<big>綠</big>  $SUNKEN,obtctl raised 2;$me") || out2+=("<big>祿</big>  $SUNKEN,obtctl raised 2;$me")
-	out2+=("^sep($GRADIENT_TYPE)")
-	[[ "$GRAD" == Solid ]] && out2+=("<big>綠</big>  $SOLID_COLOR,obtctl gradient_type solid;$me") || out2+=("<big>祿</big>  $SOLID_COLOR,obtctl gradient_type solid;$me")
-	out2+=("^sep()")
-	[[ "$GRAD" == Vertical ]] && out2+=("<big>綠</big>  $VERTICAL,obtctl gradient_type vertical;$me") || out2+=("<big>祿</big>  $VERTICAL,obtctl gradient_type vertical;$me")
-	[[ "$GRAD" == Horizontal ]] && out2+=("<big>綠</big>  $HORIZONTAL,obtctl gradient_type horizontal;$me") || out2+=("<big>祿</big>  $HORIZONTAL,obtctl gradient_type horizontal;$me")
-	[[ "$GRAD" == MirrorHorizontal ]] && out2+=("<big>綠</big>  $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") || out2+=("<big>祿</big>  $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me")
-	[[ "$GRAD" == SplitVertical ]] && out2+=("<big>綠</big>  $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") || out2+=("<big>祿</big>  $SPLITVERTICAL,obtctl gradient_type splitvertical;$me")
-	[[ "$GRAD" == Diagonal ]] && out2+=("<big>綠</big>  $DIAGONAL,obtctl gradient_type diagonal;$me") || out2+=("<big>祿</big>  $DIAGONAL,obtctl gradient_type diagonal;$me")
-	[[ "$GRAD" == CrossDiagonal ]] && out2+=("<big>綠</big>  $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") || out2+=("<big>祿</big>  $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me")
-	[[ "$GRAD" == Pyramid ]] && out2+=("<big>綠</big>  $PYRAMID,obtctl gradient_type pyramid;$me") || out2+=("<big>祿</big>  $PYRAMID,obtctl gradient_type pyramid;$me")
-
-#### COLOR SCHEMES  
-out+=("<big><span fgcolor='${ABGTO}'></span> <span fgcolor='${ABG}'></span> <span fgcolor='${ABGTO}'></span></big> $THEMES,^checkout(schemes)")
-	out2+=("^tag(schemes)")
-	out2+=("^sep($THEMES)")
-	out2+=("^sep($MONOCHROMATIC)")
-	out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
-	out2+=("<big></big>   $LIGHTBG...,obtctl mono pick light")
-	out2+=("<big></big>   $DARKBG...,obtctl mono pick dark")
-	out2+=("^sep(<i>$GENERATEFROMWP</i>)")
-    out2+=("<big><span bgcolor='${w[-2]}' fgcolor='#222222'>  <span bgcolor='${w[-4]}'>   </span>  $LIGHTBG  <span bgcolor='${w[-4]}'>   </span>  </span></big>,w2theme ob light;$me")
-    out2+=("<big><span bgcolor='${w[2]}' fgcolor='#E5E5E5'>  <span bgcolor='${w[4]}'>   </span>  $DARKBG   <span bgcolor='${w[4]}'>   </span>  </span></big>,w2theme ob dark;$me")
-	out2+=("^sep()")
-	out2+=("<big></big>   $RANDOMIZE,obtctl randomizer;$me")
-	
-	out2+=("^sep($SYSTEM_THEMES)")
-	n=1
-	while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name
-	do
-	((n=n+1))
-	out2+=("<big><span bgcolor='${abg}' fgcolor='${afg}'><span bgcolor='${abgto}'>   </span><small>   <tt>$(printf '%-20s' "${scheme_name}")</tt>   </small><span bgcolor='${abgto}'>   </span></span> <span bgcolor='${nbgto}'>  </span><span bgcolor='${nbg}' fgcolor='${nfg}'><small>  <tt><i>inactive</i></tt>  </small></span><span bgcolor='${nbgto}'>  </span></big>,^checkout(schsys${n})")
-	out3+=("^tag(schsys${n}")
-	out3+=("^sep($THEME: ${scheme_name})")
-	out3+=("^sep($APPLY)")
-	out3+=("\"\"\"<big></big>   $APPLY_THEME\"\"\",obtctl applytheme sys ${n};$me")
-	out3+=("^sep()")
-	out3+=("<big></big>   $APPLY_SCHEME    <big><span bgcolor='${abgto}'>   </span><span bgcolor='${abg}'>             </span><span bgcolor='${abgto}'>   </span></big>,obtctl applyscheme sys ${n};$me")
-	done < <(tail -n +2 "$SYSTHEMES")
-	out2+=("^sep($YOUR_THEMES)")
-	out2+=("<big></big>   $SAVE_CURRTHEME,obtctl savetheme '${currvalues}';$me")
-	out2+=("<big></big>   $OPEN_THEMEFILE,xdg-open $USERTHEMES")
-	out2+=("^sep()")
-	n=1
-	while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name
-	do
-	((n=n+1))
-	out2+=("<big><span bgcolor='${abg}' fgcolor='${afg}'><span bgcolor='${abgto}'>   </span><small>   <tt>$(printf '%-20s' "${scheme_name}")</tt>   </small><span bgcolor='${abgto}'>   </span></span> <span bgcolor='${nbgto}'>  </span><span bgcolor='${nbg}' fgcolor='${nfg}'><small>  <tt><i>inactive</i></tt>  </small></span><span bgcolor='${nbgto}'>  </span></big>,^checkout(sch${n})")
-	out3+=("^tag(sch${n}")
-	out3+=("^sep($THEME: ${scheme_name})")
-	out3+=("^sep($APPLY)")
-	out3+=("\"\"\"<big></big>   $APPLY_THEME\"\"\",obtctl applytheme usr ${n};$me")
-	out3+=("^sep()")
-	out3+=("<big></big>   $APPLY_SCHEME    <big><span bgcolor='${abgto}'>   </span><span bgcolor='${abg}'>             </span><span bgcolor='${abgto}'>   </span></big>,obtctl applyscheme usr ${n};$me")
-	out3+=("^sep($DELETE)")
-	out3+=("<big>󰗨</big>    $DELETE_THEME: <i>${scheme_name}</i>,obtctl delscheme ${n};$me")
-	done < <(tail -n +2 "$USERTHEMES")
-	
-
-
 out+=("^sep($TITLEBAR)")
-out+=("<big>󰛖</big>   $TITLEBAR_FONT [ <b> ${FNAME} ${FSIZE} </b> ],^checkout(titletext)")
+out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'> <b>AbCd</b> </span></tt>   $TITLEBAR_TEXT,^checkout(titletext)")
-out+=("<big>󰧈</big>   $PADDING [ <b>$PHEIGHT $PWIDTH</b> ],^checkout(padding)")
+out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'><small>     </small></span></tt>   $BUTTONS,^checkout(tbuttons)")
-out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'><small>     </small></span></tt>   $BUTTONS_LBL,^checkout(tbuttons)")
-out+=("^sep($ACTIVE_WINDOW)")
-out+=("<tt><span bgcolor='$ABG'>      </span></tt>   $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg '${ACTIVE_BG}' '$me')")
-[[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$ABG'>  </span><span bgcolor='$ABGTO'>    </span></tt>   $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')")
-out+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'>  <b>title</b>  </span></tt>   $TEXT_COLOR,^pipe(mbclr '$AFG' obtctl activetextcolor '${TEXT} ${ACTIVE_FG}' '$me')")
-out+=("^sep($INACTIVE_WINDOW)")
-out+=("<tt><span bgcolor='$NBG'>      </span></tt>   $INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg '${INACTIVE_BG}' '$me')")
-[[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$NBG'>  </span><span bgcolor='$NBGTO'>    </span></tt>   $INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto '${INACTIVE_BG_TO}' '$me')")
-out+=("<tt><span bgcolor='$NBG' fgcolor='$NFG'>  <b>title</b>  </span></tt>   $TEXT_COLOR,^pipe(mbclr '$NFG' obtctl inactivetextcolor '${TEXT} ${INACTIVE_FG}' '$me')")
 out+=("^sep()")
-[[ "$WEIGHT_INACT" =~ .*"old" ]] && out+=("<big></big>   <b>$BOLD</b>,obtctl fontweight_inactive Normal;$me") || out+=("<big></big>   <b>$BOLD</b>,obtctl fontweight_inactive Bold;$me")
+out+=("<tt><span bgcolor='$ABG'>      </span></tt>   $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg_only '${ACTIVE_BG}' '$me')")
-[[ "$SLANT_INACT" =~ .*"talic" ]] && out+=("<big></big>   <i>$ITALIC</i>,obtctl fontslant_inactive Normal;$me") || out+=("<big></big>   <i>$ITALIC</i>,obtctl fontslant_inactive Italic;$me")
+[[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$ABG'>  </span><span bgcolor='$ABGTO'>    </span></tt>   $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')")
+out+=("^sep()")
+
+out+=("<tt><span bgcolor='$NBG'>      </span></tt>   $INACTIVE_BG,^pipe(mbclr '$NBG' obtctl clrnormalbg_only '${INACTIVE_BG}' '$me')")
+[[ ! -z "$ABGTO" ]] && out+=("<tt><span bgcolor='$NBG'>  </span><span bgcolor='$NBGTO'>    </span></tt>   $INACTIVE_BG_TO,^pipe(mbclr '$NBGTO' obtctl clrnormalbgto '${INACTIVE_BG_TO}' '$me')")
+
+out+=("^sep()")
+out+=("$PADDING [ <b>$PHEIGHT $PWIDTH</b> ],^checkout(padding)")
+out+=("\"\"\"$RAISED_OR_FLAT? [ <b>$WINRAISED</b> ]\"\"\",^checkout(raised)")
 
 out+=("^sep(Gradient)")
-out+=("<big>󰹸</big>   $GRADIENT_TYPE [ <b>${GRAD}</b> ],^checkout(gradient)")
+out+=("$GRADIENT_TYPE [ <b>${REST##* }</b> ],^checkout(gradient)")
 out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span bgcolor='#5da97b'> </span><span bgcolor='#72ad77'> </span><span bgcolor='#84b171'> </span><span bgcolor='#95b66c'> </span><span bgcolor='#a5ba66'> </span><span bgcolor='#b5be61'> </span><span bgcolor='#c3c15a'> </span><span bgcolor='#d1c753'> </span><span bgcolor='#dfc94c'> </span><span bgcolor='#edce44'> </span><span bgcolor='#f4d03f'> </span></tt>  $PRE_GRADIENTS,^pipe(mbgrad ob)")
-out+=("<big></big>   $GRADIENT_REVERSE,obtctl activegradient '${ABGTO}' '${ABG}';$me")
+out+=("凌   $GRADIENT_REVERSE,obtctl activegradient '${ABGTO}' '${ABG}';$me")
 
 out+=("^sep($BORDER)")
-out+=("<tt><span bgcolor='$ALINE'>      </span></tt>   $ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor '${ACTIVE_BORDER}' '$me')")
+out+=("<tt><span bgcolor='$ALINE'>      </span></tt>   $ACTIVE_BORDER,^pipe(mbclr '$ALINE' obtctl activeborderColor '${ACTIVE_BORDER_COLOR}' '$me')")
-out+=("<tt><span bgcolor='$NLINE'>      </span></tt>   $INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor '${INACTIVE_BORDER}' '$me')")
+out+=("<tt><span bgcolor='$NLINE'>      </span></tt>   $INACTIVE_BORDER,^pipe(mbclr '$NLINE' obtctl inactiveborderColor '${INACTIVE_BORDER_COLOR}' '$me')")
-out+=("<big>󰝣</big>   $BORDER [ <b>$BORD</b> ],^checkout(border)")
+out+=("$BORDER [ <b>$BORD</b> ],^checkout(border)")
 out+=("$HANDLEWIDTH [ <b>$HANDLE</b> ],^checkout(handlewidth)")
-#out+=("$ACTIVEHANDLE? [ <b>$AHANDLE</b> ],^checkout(handle)")
+out+=("$ACTIVEHANDLE? [ <b>$AHANDLE</b> ],^checkout(handle)")
-
 
 
+out+=("^sep(<i>$GENERATEFROMWP</i>)")
+    out+=("$LIGHTBG,w2theme ob light;$me")
+    out+=("$DARKBG,w2theme ob dark;$me")
 
 if [ -f "${THEMERC}.bak" ]; then
 
@@ -445,7 +281,7 @@ out+=("^sep($RESET)")
 out+=("󰁯  $RESET_THEME,^checkout(resettheme)")
     out2+=("^tag(resettheme)")
     out2+=("^sep($AREYOUSURE)")
-    out2+=("$YES,obtctl resetMBcolors;$me")
+    out2+=("$YES,obtctl reset;$me")
 fi
 #out+=("Edit...,xdg-open ${THEMERC}")
 
@@ -458,7 +294,7 @@ fi
 #done
 #TBUTTONS
 out2+=("^tag(tbuttons)")
-out2+=("^sep($BUTTONS_LBL)")
+out2+=("^sep($BUTTONS)")
 out2+=("Tiny,obtctl buttons tiny;$me")
 out2+=("Normal,obtctl buttons normal;$me")
 out2+=("Bold,obtctl buttons bold;$me")
@@ -466,14 +302,8 @@ out2+=("Dots,obtctl buttons dots;$me")
 out2+=("^sep()")
 out2+=("Big 12px,obtctl buttons big-12;$me")
 out2+=("Big 14px,obtctl buttons big-14;$me")
-out2+=("^sep($TEXTALIGN)")
-[[ "$TXTJUST" = left ]] && out2+=("<big>綠  </big>  $LEFT,obtctl textjustify left;$me")||out2+=("<big>祿  </big>  $LEFT,obtctl textjustify left;$me")
-[[ "$TXTJUST" = center ]] && out2+=("<big>綠  </big>     $CENTER,obtctl textjustify center;$me")||out2+=("<big>祿  </big>     $CENTER,obtctl textjustify center;$me")
-[[ "$TXTJUST" = right ]] && out2+=("<big>綠  </big>         $RIGHT,obtctl textjustify right;$me")||out2+=("<big>祿  </big>         $RIGHT,obtctl textjustify right;$me")
-
 out2+=("^sep($BUTTONS_LAYOUT)")
 [[ "$NDSLIMC" == NDSLIMC ]] && out2+=("<big>綠</big>  <tt>full          </tt> <b>NDSLIMC</b> (default),obtctl ndslimc NDSLIMC;$me") || out2+=("<big>祿</big>  <tt>full          </tt> <b>NDSLIMC</b> (default),obtctl ndslimc NDSLIMC;$me")
-[[ "$NDSLIMC" == DSLIMC ]] && out2+=("<big>綠</big>  <tt>full (no icon)</tt> <b>DSLIMC</b>,obtctl ndslimc DSLIMC;$me") || out2+=("<big>祿</big>  <tt>full (no icon)</tt> <b>DSLIMC</b>,obtctl ndslimc DSLIMC;$me")
 [[ "$NDSLIMC" == NLIMC ]] && out2+=("<big>綠</big>  <tt>mini          </tt> <b>NLIMC</b>,obtctl ndslimc NLIMC;$me") || out2+=("<big>祿</big>  <tt>mini          </tt> <b>NLIMC</b>,obtctl ndslimc NLIMC;$me")
 [[ "$NDSLIMC" == LIMC ]] && out2+=("<big>綠</big>  <tt>mini (no icon)</tt> <b>LIMC</b>,obtctl ndslimc LIMC;$me") || out2+=("<big>祿</big>  <tt>mini (no icon)</tt> <b>LIMC</b>,obtctl ndslimc LIMC;$me")
 [[ "$NDSLIMC" == CMIL ]] && out2+=("<big>綠</big>  <tt>crazy         </tt> <b>CMIL</b>,obtctl ndslimc CMIL;$me") || out2+=("<big>祿</big>  <tt>crazy         </tt> <b>CMIL</b>,obtctl ndslimc CMIL;$me")
@@ -485,9 +315,18 @@ out2+=("^sep(M:<small> Maximize</small>)")
 out2+=("^sep(C:<small> Close</small>)")
 out2+=("^sep(S:<small> Shade (Roll up)</small>)")
 out2+=("^sep(D:<small> Omnipresent (On all desktops)</small>)")
+out2+=("^sep($TEXTALIGN)")
+[[ "$TXTJUST" = left ]] && out2+=("<big>綠  </big>  $LEFT,obtctl textjustify left;$me")||out2+=("<big>祿  </big>  $LEFT,obtctl textjustify left;$me")
+[[ "$TXTJUST" = center ]] && out2+=("<big>綠  </big>     $CENTER,obtctl textjustify center;$me")||out2+=("<big>祿  </big>     $CENTER,obtctl textjustify center;$me")
+[[ "$TXTJUST" = right ]] && out2+=("<big>綠  </big>         $RIGHT,obtctl textjustify right;$me")||out2+=("<big>祿  </big>         $RIGHT,obtctl textjustify right;$me")
 
 #TEXT
 out2+=("^tag(titletext)")
+out2+=("^sep(TEXT_COLOR)")
+out2+=("<tt><span bgcolor='$ABG' fgcolor='$AFG'>   <b>active title</b>   </span></tt>   $ACTIVE_FG,^pipe(mbclr '$AFG' obtctl activetextcolor '${TEXT} ${ACTIVE_FG}' '$me')")
+out2+=("<tt><span bgcolor='$NBG' fgcolor='$NFG'>  <b>inactive title</b>  </span></tt>   $INACTIVE_FG,^pipe(mbclr '$NFG' obtctl inactivetextcolor '${TEXT} ${INACTIVE_FG}' '$me')")
+
+
 out2+=("^sep($TITLEBAR_FONT)")
 out2+=("$FONT... [ <b> ${FNAME} ${FSIZE} </b> ],mb-setfont obtitle;$me")
 out2+=("^sep($FONTSIZE)")
@@ -578,32 +417,36 @@ out2+=("10,obtctl borderWidth 10;$me")
 out2+=("12,obtctl borderWidth 12;$me")
 out2+=("16,obtctl borderWidth 16;$me")
 out2+=("20,obtctl borderWidth 20;$me")
-
+#RAISED
+out2+=("^tag(raised)")
+out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"")
+out2+=("$FLAT,obtctl raised 0;$me")
+out2+=("$RAISED,obtctl raised 1;$me")
+out2+=("$SUNKEN,obtctl raised 2;$me")
 #GRADIENT
 out2+=("^tag(gradient)")
 out2+=("^sep($GRADIENT_TYPE)")
-[[ "$GRAD" == Solid ]] && out2+=("<big>綠</big>  $SOLID_COLOR,obtctl gradient_type solid;$me") || out2+=("<big>祿</big>  $SOLID_COLOR,obtctl gradient_type solid;$me")
+out2+=("$SOLID_COLOR,obtctl gradient_type solid;$me")
 out2+=("^sep()")
-[[ "$GRAD" == Vertical ]] && out2+=("<big>綠</big>  $VERTICAL,obtctl gradient_type vertical;$me") || out2+=("<big>祿</big>  $VERTICAL,obtctl gradient_type vertical;$me")
+out2+=("$VERTICAL,obtctl gradient_type vertical;$me")
-[[ "$GRAD" == Horizontal ]] && out2+=("<big>綠</big>  $HORIZONTAL,obtctl gradient_type horizontal;$me") || out2+=("<big>祿</big>  $HORIZONTAL,obtctl gradient_type horizontal;$me")
+out2+=("$HORIZONTAL,obtctl gradient_type horizontal;$me")
-[[ "$GRAD" == MirrorHorizontal ]] && out2+=("<big>綠</big>  $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") || out2+=("<big>祿</big>  $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me")
+out2+=("$MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me")
-[[ "$GRAD" == SplitVertical ]] && out2+=("<big>綠</big>  $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") || out2+=("<big>祿</big>  $SPLITVERTICAL,obtctl gradient_type splitvertical;$me")
+out2+=("$SPLITVERTICAL,obtctl gradient_type splitvertical;$me")
-[[ "$GRAD" == Diagonal ]] && out2+=("<big>綠</big>  $DIAGONAL,obtctl gradient_type diagonal;$me") || out2+=("<big>祿</big>  $DIAGONAL,obtctl gradient_type diagonal;$me")
+out2+=("$DIAGONAL,obtctl gradient_type diagonal;$me")
-[[ "$GRAD" == CrossDiagonal ]] && out2+=("<big>綠</big>  $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") || out2+=("<big>祿</big>  $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me")
+out2+=("$CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me")
-[[ "$GRAD" == Pyramid ]] && out2+=("<big>綠</big>  $PYRAMID,obtctl gradient_type pyramid;$me") || out2+=("<big>祿</big>  $PYRAMID,obtctl gradient_type pyramid;$me")
+out2+=("$PYRAMID,obtctl gradient_type pyramid;$me")
 
 #HANDLE
-#out2+=("^tag(handle)")
+out2+=("^tag(handle)")
-#out2+=("^sep($ACTIVEHANDLE)")
+out2+=("^sep($ACTIVEHANDLE)")
-#out2+=("$NO,obtctl activehandle no;$me")
+out2+=("$NO,obtctl activehandle no;$me")
-#out2+=("$YES,obtctl activehandle yes;$me")
+out2+=("$YES,obtctl activehandle yes;$me")
-#out2+=("$GRIPONLY,obtctl activehandle grip;$me")
+out2+=("$GRIPONLY,obtctl activehandle grip;$me")
-#HANDLE WIDTH
+#HANDLE
 out2+=("^tag(handlewidth)")
 out2+=("^sep($HANDLEWIDTH)")
 out2+=("0,obtctl handlewidth 0;$me")
 out2+=("^sep()")
-out2+=("1,obtctl handlewidth 1;$me")
 out2+=("2,obtctl handlewidth 2;$me")
 out2+=("3,obtctl handlewidth 3;$me")
 out2+=("4,obtctl handlewidth 4;$me")
@@ -669,7 +512,6 @@ source $HOME/.config/colorizer/colorizer.conf
 
 out+=("^sep()")
 out+=(" ${arrow_string_left}    $_COLORIZER_ROOT,colorizer -s")
-out+=(" ${arrow_string_left} ${arrow_string_left}    $_LEFTSIDEPANEL,mb-jgtools places")
 
 
     if [[ "$colorizer_size" == "full" ]];then
@@ -694,7 +536,7 @@ JGWIDTH=$((jgtools_padding + 270 + jgtools_padding))
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
 # WALLPAPER IMAGE
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 THUMBDIR="$HOME/.cache/colorizer/thumbs"
 mkdir -p ${THUMBDIR}
 NAME=${WALLPATH////_}
@@ -718,7 +560,6 @@ cat <<EOF > ${MENU_ITEMS}
 @text,,$((jgtools_padding + 138)),$((jgtools_padding + 120)),130,30,0,left,top,#FFFFFF ,${WINCLR},<span size='10400' font_family='Ubuntu'><b>Colorizer</b> Openbox</span>
 $(printf '%s\n' "${out[@]}")
 $(printf '%s\n' "${out2[@]}")
-$(printf '%s\n' "${out3[@]}")
 EOF
 
 jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null
@@ -728,4 +569,3 @@ exit 0
 fi
 printf '%s\n' "${out[@]}"
 printf '%s\n' "${out2[@]}"
-printf '%s\n' "${out3[@]}"

bin/colorizer-pyradio

@@ -33,7 +33,7 @@ THEMERC=~/.config/pyradio/themes/mbcolors.pyradio-theme
 # get wallpaper color palette
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
@@ -210,7 +210,7 @@ if [[ "$1" == "-s" ]]; then
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}

bin/conkyctl

@@ -282,19 +282,6 @@ restartone () {
     kill ${1}
     startone ${1} 
 }
-toggleone () {
-	if pgrep -u $USER -af "conky .*${1}" >/dev/null; then
-    kill "${1}"
-    else
-    CCFG=$(ls ~/.config/conky/${1}*.conkyrc)
-    #notify-send.sh "Conky" "$CCFG"
-		if test -f "$CCFG";
-		then
-			startone "$CCFG"
-		fi
-    #conky -c "${i}" &
-    fi
-}
 makemoveableall () {
     wmctrl -k on
     sd "own_window_type.*$" "own_window_type = 'normal'," ${CONKYDIR}/*mbcolor.conkyrc
@@ -418,9 +405,6 @@ languages () {
     APPLY_TO_ALL="Zastosuj do wszystkich"
     NEWTHEME="Nowy motyw kolorów..."
     SAVENEWTHEME="utwórz nowy motyw..."
-    SAVE_CURRSCHEME="Zapisz aktualną kolorystykę jako..."
-    MONOCHROMATIC="Monochromatyczny"
-    CHOOSE_AND_PICK="Wybierz wariant i pobierz kolor..."
     LIGHTBG="Jasne tło"
     DARKBG="Ciemne tło"
     RESETCOLORS="Przywróć domyślne kolory"
@@ -486,9 +470,6 @@ languages () {
     APPLY_TO_ALL="Apply to All"
     NEWTHEME="New Color scheme..."
     SAVENEWTHEME="from current colors..."
-    SAVE_CURRSCHEME="Save current colors as..."
-    MONOCHROMATIC="Monochromatic"
-    CHOOSE_AND_PICK="Choose variant and pick color..."
     LIGHTBG="Light Background"
     DARKBG="Dark Background"
     RESETCOLORS="Restore default colors"
@@ -554,9 +535,6 @@ languages () {
     APPLY_TO_ALL="Apply to All"
     NEWTHEME="New Color scheme..."
     SAVENEWTHEME="from current colors..."
-    SAVE_CURRSCHEME="Save current colors as..."
-    MONOCHROMATIC="Monochromatic"
-    CHOOSE_AND_PICK="Choose variant and pick color..."
     LIGHTBG="Light Background"
     DARKBG="Dark Background"
     RESETCOLORS="Restore default colors"
@@ -594,16 +572,16 @@ single () {
     unset NOT_SUPPORTED OLD_SYNTAX
     
     SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv"
-	USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv"
+	USERSCHEMES="$HOME/.config/colorizer/conky/userschemes.csv"
 	if [ ! -f "$USERSCHEMES" ]; then
 		mkdir -p "$HOME/.config/colorizer/conky/"
-		echo "WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name" > "$USERSCHEMES"
+		echo "WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |scheme_name" > "$USERSCHEMES"
 	fi
 	
     ### Wallpaper colors
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
 n=${#HOME}
@@ -756,46 +734,6 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
     fi
     
     out+=("^sep($COLORS)")
-    # COLOR SCHEMES
-    #if [ "$WINTRANS" == false ];then
-        out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $COLORSCHEME,^checkout(regensingle)")
-        out2+=("^tag(regensingle)")
-        out2+=("^sep($MONOCHROMATIC)")
-        out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
-		out2+=("<big></big>   $DARKBG...,conkyctl monoone pick dark ${1}")
-		out2+=("<big></big>   $LIGHTBG...,conkyctl monoone pick light ${1}")
-        out2+=("^sep($GENFROMWP)")
-        out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'>  $LIGHTBG  <span fgcolor='${w[4]}'></span>  <span fgcolor='${w[5]}'></span>  </span></big>,w2theme conkyone light ${1}")
-        out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'>  $DARKBG  <span fgcolor='${w[-4]}'></span>  <span fgcolor='${w[-5]}'></span>  </span></big>,w2theme conkyone dark ${1}")
-        out2+=("^sep($APPLY_THEME)")
-        out2+=("^sep($SYSTEM_SCHEMES)")
-        n=1
-		while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
-		do
-		((n=n+1))
-		[[ "$wintrans" = true ]] && bga=1 || bga=100
-            out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'>   <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span>   </span></big>,conkyctl applyscheme sys $n ${1}")
-        done  < <(tail -n +2 "$SYSSCHEMES")
-        out2+=("^sep($YOUR_SCHEMES)")
-        if [[ "$1" =~ "sysinfo_" ]]; then
-			#currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
-			cursettings="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|${WINTRANS}|${OUTLINE}|${SHADES}|${BORD}|${STIP}|"
-			out2+=("<big></big>   $SAVE_CURRSCHEME,conkyctl savescheme '${cursettings}'" "^sep()")
-        fi
-        n=1
-		while IFS="|" read -r winclr clr clr0 clr1 clr2 wintrans outline shades bord stip scheme_name
-		do
-		((n=n+1))
-		[[ "$wintrans" = true ]] && bga=1 || bga=100
-            out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr' bgalpha='${bga}%'>   <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span>   </span></big>,conkyctl applyscheme usr $n ${1}")
-            #out2+=("<span bgcolor='$own_window_colour'>   <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span>   </span>  $schemetitle,conkyctl settheme $themefilename $1")
-                        
-        done  < <(tail -n +2 "$USERSCHEMES")
-        
-       
-      
-        out+=("^sep()")
-    #fi
       
     if [[ "$WINCLR" != "#" ]];then
         if [ "$WINTRANS" == false ];then
@@ -817,10 +755,45 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
     fi
 
    
-if [[ "$FONT" != "" ]];then
+    
+    
+     if [ "$WINTRANS" == false ];then
+        out+=("<span bgcolor='#282828'> <span fgcolor='#ebdbb2'></span> <span fgcolor='#98971a'></span> <span fgcolor='#d79921'></span> <span fgcolor='#cc241d'></span> </span> $COLORSCHEME,^checkout(regensingle)")
+        out2+=("^tag(regensingle)")
+        
+        out2+=("^sep($APPLY_THEME)")
+        out2+=("^sep($SYSTEM_SCHEMES)")
+        n=1
+		while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
+		do
+		((n=n+1))
+            out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'>   <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span>   </span></big>,conkyctl applyscheme usr $n ${1}")
+            #out2+=("<span bgcolor='$own_window_colour'>   <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span>   </span>  $schemetitle,conkyctl settheme $themefilename $1")
+                        
+        done  < <(tail -n +2 "$SYSSCHEMES")
+        out2+=("^sep($YOUR_SCHEMES)")
+        if [[ "$1" =~ "sysinfo_" ]]; then
+			currcolors="${WINCLR}|${CLR}|${CLR0}|${CLR1}|${CLR2}|"
+			out2+=("<big></big>   $SAVE_CURRSCHEME,conkyctl savescheme '${currcolors}'")
+        fi
+        n=1
+		while IFS="|" read -r winclr clr clr0 clr1 clr2 scheme_name
+		do
+		((n=n+1))
+            out2+=("<tt>$(printf '%-20s' "${scheme_name}")</tt><big><span bgcolor='$winclr'>   <span fgcolor='${clr}'></span> <span fgcolor='${clr0}'></span> <span fgcolor='${clr1}'></span> <span fgcolor='${clr2}'></span>   </span></big>,conkyctl applyscheme usr $n ${1}")
+            #out2+=("<span bgcolor='$own_window_colour'>   <span fgcolor='$default_color'></span> <span fgcolor='$color0'></span> <span fgcolor='$color1'></span> <span fgcolor='$color2'></span>   </span>  $schemetitle,conkyctl settheme $themefilename $1")
+                        
+        done  < <(tail -n +2 "$USERSCHEMES")
+        
+        out2+=("^sep($GENFROMWP)")
+        out2+=("<big><span bgcolor='${w[-1]}' fgcolor='${w[0]}'>  $LIGHTBG  <span fgcolor='${w[4]}'></span>  <span fgcolor='${w[5]}'></span>  </span></big>,w2theme conkyone light ${1}")
+        out2+=("<big><span bgcolor='${w[0]}' fgcolor='${w[-1]}'>  $DARKBG  <span fgcolor='${w[-4]}'></span>  <span fgcolor='${w[-5]}'></span>  </span></big>,w2theme conkyone dark ${1}")
+      
+        out+=("^sep()")
+    fi
+    
     if [[ "$1" != *"logo_mbcolor"* ]]; then
         if [[ "$1" != *"quoter_mbcolor"* ]]; then
-			
 			out+=("<big>󰛖</big>   $FONTS [ <b><span font_family=\"${FONT}\">$FONT</span> $FONTSIZE</b> ],^checkout(fontsingle)")
 			out2+=("^tag(fontsingle)")
 			out2+=("^sep($FONTS)")
@@ -854,7 +827,7 @@ if [[ "$FONT" != "" ]];then
         fi
         [[ "$SHADOWS" == "shadow" ]] && out+=("<big>󰄲</big>  $SHADOW,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big>  $SHADOW,conkyctl shades shadow ${1};$me")
         [[ "$SHADOWS" == "outline" ]] && out+=("<big>󰄲</big>  $OLINE,conkyctl shades no ${1};$me") || out+=("<big>󰄱</big>  $OLINE,conkyctl shades outline ${1};$me")
-        #out+=("^sep()")
+        out+=("^sep()")
     fi
     
     [[ "$BORD" == false ]] && out+=("<big>󰄱</big>  $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)") || out+=("<big>󰄲</big>  $BORDERS [ <b>$STIP</b> ],^checkout(bordersingle)")
@@ -869,7 +842,6 @@ if [[ "$FONT" != "" ]];then
     out2+=("2,conkyctl stippled_borders 2 ${1};$me")
     out2+=("3,conkyctl stippled_borders 3 ${1};$me")
     out2+=("4,conkyctl stippled_borders 4 ${1};$me")
-fi
 fi #OLD SYNTAX CHECK    
     out+=("^sep()")
     out+=("   $EDIT ${title^},xdg-open ${1}")
@@ -1001,18 +973,16 @@ cmdmenu () {
     title=${name//_/ }
     #notify-send.sh "${X} ${Y}" "${WIDTH} ${HEIGHT}"
     # if script exist run it and exit
-    if [ "$1" != "" ];then
+    if [ -f "${CONKYDIR}/menuscripts/${name}" ];then
-    if [ -x "${CONKYDIR}/menuscripts/${name}" ];then
+    bash "${CONKYDIR}/menuscripts/${name}"
-    bash -c "${CONKYDIR}/menuscripts/${name} ${1}"
     exit 0
     fi
-    fi
     # if CSV for menu exist show it
     if [ -f ${CONKYDIR}/menuscripts/${name}.csv ]; then
         LINES=$(grep  -Ev "^#|^$" ${CONKYDIR}/menuscripts/${name}.csv|wc -l)
         #notify-send.sh "$LINES"
         if [ ${LINES} == 0 ]; then
-        : # do nothing, was contextmenu
+        contextmenu
         fi
         if [ ${LINES} == 1 ]; then
 		# 1 line - execute command (one line menu make no sense)
@@ -1022,20 +992,18 @@ cmdmenu () {
 				label=${line%,*}
 			done <<< $(grep -v '^\s*$\|^#\|^\s*#' ${CONKYDIR}/menuscripts/${name}.csv)
 		#notify-send.sh "${label}" "${cmd[@]}"
-		sleep .1
 		${cmd[@]}
-		exit 0
         else
         # more than 1 lines - show menu
 		CUSTOMCOMMANDS=". ${CONKYDIR}/menuscripts/${name}.csv"
 		fi
     else
-        : # do nothing
+        contextmenu
     fi
     
    # otherwise build and show standalone menu with custom commands
    
-    sleep .1
+    sleep .2
     read WINTRANS <<< "$(grep own_window_transparent ${CONKYCFG} | cut -d'=' -f2 | cut -d"," -f1)"
     read FONTDEF <<< "$(grep "font .*=.*,$" ${CONKYCFG} | cut -d'=' -f2,3 |cut -d"'" -f2)"
     FONT=${FONTDEF%:*}
@@ -1052,7 +1020,7 @@ cmdmenu () {
     CONFIG_FILE=$(mktemp)
     MENU_ITEMS=$(mktemp)
     trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT
-    POSITION_MODE=pointer
+    POSITION_MODE=${1:-pointer}
     #POSITION_MODE=fixed
     HIDE_BACK_ITEMS=1
     menu_gradient_pos=none
@@ -1164,32 +1132,24 @@ savescheme () {
     esac
 	# ask for scheme name
 	schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry  --entry-label="$LABEL" --entry-text="$NAME") || exit 1
-	echo "${1}${schemename}" >> "$HOME/.config/colorizer/conky/c_userschemes.csv"
+	echo "${1}${schemename}" >> "$HOME/.config/colorizer/conky/userschemes.csv"
 }
 delscheme() {
-	sed -i ${1}d "$HOME/.config/colorizer/conky/c_userschemes.csv"
+	sed -i ${1}d "$HOME/.config/colorizer/conky/userschemes.csv"
 }
 
 applyscheme () {
 case "$1" in
 	sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";;
-	usr) SCHEMEFILE="$HOME/.config/colorizer/conky/c_userschemes.csv";;
+	usr) SCHEMEFILE="$HOME/.config/colorizer/conky/userschemes.csv";;
 esac
-while IFS="|" read -r own_window_colour default_color color0 color1 color2 wintrans outline shades bord stip scheme_name
+while IFS="|" read -r own_window_colour default_color color0 color1 color2 scheme_name
 do
 	win_bgcolor ${own_window_colour} ${3}
     default_color ${default_color} ${3}
     color0 ${color0} ${3}
     color1 ${color1} ${3}
     color2 ${color2} ${3}
-    transparent ${wintrans} ${3}
-    shadow="no"
-    [[ "$outline" == true ]] && shadow="outline"
-    [[ "$shades" == true ]] && shadow="shadow"
-    shades "$shadow" ${3}
-    stippled_borders ${stip} ${3}
-    draw_borders ${bord} ${3}
-    
 done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 }
 
@@ -1197,22 +1157,15 @@ done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 applyscheme_all () {
 case "$1" in
 	sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/conky.csv";;
-	usr) SCHEMEFILE="$HOME/.config/colorizer/conky/c_userschemes.csv";;
+	usr) SCHEMEFILE="$HOME/.config/colorizer/conky/userschemes.csv";;
 esac
-while IFS="|" read -r own_window_colour default_color color0 color1 color2 wintrans outline shades bord stip scheme_name
+while IFS="|" read -r own_window_colour default_color color0 color1 color2 scheme_name
 do
 	win_bgcolor_all ${own_window_colour}
     default_color_all ${default_color}
     color0_all ${color0}
     color1_all ${color1}
     color2_all ${color2}
-    transparent_all ${wintrans}
-    shadow="no"
-    [[ "$outline" == true ]] && shadow="outline"
-    [[ "$shades" == true ]] && shadow="shadow"
-    shades_all "$shadow"
-    stippled_borders_all ${stip}
-    draw_borders_all ${bord}
 done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 }
 
@@ -1225,121 +1178,6 @@ convert_from_old () {
         sleep 1
         startone ${1}
 }
-baseconky_info() {
-	#notify-send.sh -i mbcc "Important" "Baseconky info"
-	case "$LANG" in
-		pl*)
-	TITLE="Ważna informacja"
-	MSG="Podczas pracy nad nowymi schematami kolorów lub dostosowywaniem kolorów warto uruchomić Conky: Sysinfo - który jest bazowym Conky.\nJego kolory i inne zmienne są brane pod uwagę.\n\nUruchomić Sysinfo teraz?\n\n"
-	START="Tak, uruchom Sysinfo Conky"
-	NO="Nie"
-		;;
-		*)
-	TITLE="Important info"
-	MSG="When working on new color schemes or customizing colors, it's worth running Conky: Sysinfo - which is the base Conky. Its colors and other variables are taken into account by Colorizer.\n\nStart Sysinfo Conky now?\n\n"
-	START="Yes, start Sysinfo Conky"
-	NO="No"
-	;;
-	esac
-	cmd=(
-	yad --center --width=360 --borders=20 --window-icon=mbcc --image=colorizer 
-	--title "${TITLE}" 
-	--text="${MSG}" 
-	--button="${START}:1" 
-	--button="${NO}:0"
-	)
-	"${cmd[@]}"
-	exval=$?
-    #notify-send.sh -t 10000  "Exval" "${exval}"
-    case $exval in
-        1) startone "$HOME/.config/conky/sysinfo_mbcolor.conkyrc";;
-        0) : ;;
-        252): ;;
-    esac
-    colorizer-conky -s
-}
-mono () {
-lighten=(0.92 0.8 0.65 0.45 0.28)
-darken=(0.9 0.74 0.54 0.38 0.18)
-
-if [ "${1}" == pick ];then 
-	color=$(gpick -pso 2>/dev/null)
-else
-	color="${1}"
-fi
-
-if [ "${#color}" == 7 ];then
-	for i in "${lighten[@]}"
-	do
-	pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)")
-	done
-	pal+=("$color")
-
-	for i in "${darken[@]}"
-	do
-	pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)")
-	done
-else
-	exit 0
-fi
-
-#colorize Conky
-if [ "$2" == "dark" ];then
-	win_bgcolor_all "${pal[10]}"
-	default_color_all "${pal[0]}"
-	color0_all "${pal[3]}"
-	color1_all "${pal[4]}"
-	color2_all "${pal[5]}"
-else # light
-	win_bgcolor_all "${pal[4]}"
-	default_color_all "${pal[9]}"
-	color0_all "${pal[7]}"
-	color1_all "${pal[8]}"
-	color2_all "${pal[1]}"
-fi
-colorizer-conky -s 2>/dev/null
-}
-monoone () {
-lighten=(0.92 0.8 0.65 0.45 0.28)
-darken=(0.9 0.74 0.54 0.38 0.18)
-
-if [ "${1}" == pick ];then 
-	color=$(gpick -pso 2>/dev/null)
-else
-	color="${1}"
-fi
-
-if [ "${#color}" == 7 ];then
-	for i in "${lighten[@]}"
-	do
-	pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)")
-	done
-	pal+=("$color")
-
-	for i in "${darken[@]}"
-	do
-	pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)")
-	done
-else
-	exit 0
-fi
-
-# colorize one Conky
-if [ "$2" == "dark" ];then
-	win_bgcolor "${pal[10]}" "${3}"
-	default_color "${pal[0]}" "${3}"
-	color0 "${pal[3]}" "${3}"
-	color1 "${pal[4]}" "${3}"
-	color2 "${pal[5]}" "${3}"
-else # light
-	win_bgcolor "${pal[4]}" "${3}"
-	default_color "${pal[9]}" "${3}"
-	color0 "${pal[7]}" "${3}"
-	color1 "${pal[8]}" "${3}"
-	color2 "${pal[1]}" "${3}"
-fi
-}
-
 
 case "$1" in
     transparent_all) transparent_all "$2";;
@@ -1379,10 +1217,9 @@ case "$1" in
     startone) startone "$2";;
     startall) startall;;
     kill) kill "$2";;
-    toggleone) toggleone "$2";;
     restartone) restartone "$2";;
     contextmenu) contextmenu;;
-    cmdmenu) cmdmenu "$2";;
+    cmdmenu) cmdmenu;;
     cmdmenu_edit) cmdmenu_edit "$2";;
     makemoveableall) makemoveableall;;
     saveposall) saveposall;;
@@ -1394,8 +1231,5 @@ case "$1" in
     applyscheme_all) applyscheme_all "$2" "$3";;
     netdevice) netdevice ;; 
     convert_from_old) convert_from_old "$2";;
-    baseconky_info) baseconky_info;;
-    mono) mono "$2" "$3";;
-    monoone) monoone "$2" "$3" "$4";;
     *) : ;;
 esac

bin/gtkcolors.py

@@ -1,119 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Based on labwc-gtktheme.py:
-Create labwc theme based on the current Gtk theme
-
-SPDX-License-Identifier: GPL-2.0-only
-
-Copyright (C) @Misko_2083 2019
-Copyright (C) Johan Malm 2019-2022
-"""
-
-import os
-import errno
-from tokenize import tokenize, NUMBER, NAME, OP
-from io import BytesIO
-import gi
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
-
-def parse(tokens):
-    """
-    Parse css color expression token list and return red/green/blue values
-    Valid name-tokens include 'rgb' and 'rgba', whereas 'alpha', 'shade' and
-    'mix' are ignored. @other-color references are still to be implemented.
-    """
-    nr_colors_to_parse = 0
-    in_label = False
-    color = []
-    for toknum, tokval, _, _, _ in tokens:
-        if '@' in tokval:
-            in_label = True
-            continue
-        if toknum == NAME and in_label:
-            color.clear()
-            color.append(f"@{tokval}")
-            return color
-        if nr_colors_to_parse > 0:
-            if toknum == OP and tokval in ')':
-                print("warn: still parsing numbers; did not expect ')'")
-            if toknum == NUMBER:
-                color.append(tokval)
-                nr_colors_to_parse -= 1
-            continue
-        if toknum == NAME and tokval in 'rgb':
-            nr_colors_to_parse = 3
-        elif toknum == NAME and tokval in 'rgba':
-            nr_colors_to_parse = 4
-    return color
-
-def color_hex(color):
-    """ return rrggbb color hex from list [r, g, b,...] """
-    if not color:
-        return "None"
-    elif len(color) < 3:
-        return f"{color[0]}"
-    return '{:02x}{:02x}{:02x}'.format(*(int(x) for x in color[:3]))
-
-def hex_from_expr(line):
-    """ parse color expression to return hex style rrggbb """
-    tokens = tokenize(BytesIO(line.encode('utf-8')).readline)
-    color = parse(tokens)
-    return color_hex(color)
-
-def parse_section(lines, name):
-    theme = {}
-    inside = False
-    for line in lines:
-        if f"{name} {{" in line:
-            inside = True
-            continue
-        if inside:
-            if "}" in line or "{" in line:
-                inside = False
-                break
-            if 'color' not in line:
-                continue
-            key, value = line.strip().split(":", maxsplit=1)
-            theme[f'{name}.{key.replace(" ", "")}'] = hex_from_expr(value)
-    return theme
-
-def resolve_labels(theme):
-    for key, label in theme.items():
-        if '@' in label:
-            for tmp, value in theme.items():
-                if tmp == label[1:]:
-                    theme[key] = value
-                    return resolve_labels(theme)
-    return theme
-
-def main():
-    """ main """
-
-    gset = Gtk.Settings.get_default()
-    themename = gset.get_property("gtk-theme-name")
-    css = Gtk.CssProvider.get_named(themename).to_string()
-
-    lines = css.split("\n")
-    theme = {}
-
-    # Parse @define-color lines using syntax "@define-color <key> <value>"
-    for line in lines:
-        if "@define-color" not in line:
-            continue
-        x = line.split(" ", maxsplit=2)
-        theme[x[1]] = hex_from_expr(x[2])
-
-    # Add the color definitions in the headerbar{} and menu{} sections
-    theme |= parse_section(lines, "headerbar")
-    theme |= parse_section(lines, "menu")
-
-    theme = resolve_labels(theme)
-
-    for key, value in theme.items():
-        print(f"{key}: {value}")
-    return
-
-if __name__ == '__main__':
-    main()

bin/gtkctl

@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# gtkctl - GTK widget (theme), Icons settings for Mabox
-
-GTK2RC="$HOME"/.gtkrc-2.0
-GTK3RC="$HOME"/.config/gtk-3.0/settings.ini
-
-
-get_theme(){
-	GTK_THEME=( $(grep "gtk-theme-name" ${GTK2RC} | cut -d'"' -f2) )
-	echo ${GTK_THEME}
-}
-
-get_icons(){ 
-	GTK_ICON=( $(grep "gtk-icon-theme-name" ${GTK2RC} | cut -d'"' -f2) )
-	echo ${GTK_ICON}
-}
-
-
-
-theme(){
-	# set GTK theme
-	:
-}
-
-icons(){
-	# set icon theme
-	sd "^gtk-icon-theme-name=.*" "gtk-icon-theme-name=\"${1}\"" ${GTK2RC}
-	sd "^gtk-icon-theme-name=.*" "gtk-icon-theme-name=${1}" ${GTK3RC}
-	reload-gtk
-}
-
-papcolor(){
-ICON_DIR="$HOME/.local/share/icons"
-case "$1" in
-adwaita|black|blue|bluegrey|breeze|brown|carmine|cyan|darkcyan|deeporange|green|grey|indigo|magenta|nordic|orange|palebrown|paleorange|pink|red|teal|violet|white|yaru|yellow)
-;;
-*)
-exit 1
-esac
-
-if [ -f "${ICON_DIR}/Papirus-Mabox-$1/index.theme" ];then
-TITLE="Icons theme changed!"
-TEXT="Papirus folders color: <b>${1^}</b>"
-icons Papirus-Mabox-$1
-notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" "$TITLE" "$TEXT"
-
-else
-TITLE="Please wait..."
-TEXT="Preparing ${1} folder color icons"
-TITLE2="Success!"
-TEXT2="${1^} icons color variant generated successfully"
-notify-send.sh -u critical -i /usr/share/icons/Papirus/64x64/places/folder-${1}.svg -R /tmp/papicon "$TITLE" "$TEXT"
-papirus-folder-color.sh -c ${1}
-notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" -R /tmp/papicon "$TITLE2" "$TEXT2"
-icons Papirus-Mabox-$1
-
-fi
-}
-
-
-
-case "$1" in
-	get_theme)get_theme;;
-	get_icons)get_icons "$2";;
-	theme)theme "$2";;
-	icons)icons "$2";;
-	papcolor)papcolor "$2";;
-	*):;;
-esac

bin/jgctl

@@ -24,7 +24,6 @@ reset () {
 }
 resetMBcolors() {
     mb-setvar jgmenu_theme=MBcolors
-    mb-setvar item_height_factor=200
     reset
     case "$1" in
         show) 
@@ -266,53 +265,25 @@ tweak () {
 		sizing)
 			case "$2" in
 				tight)
-				mb-setvar jgtools_padding=4
+				mb-setvar jgtools_padding=0
 				mb-setvar jgtools_border=0
-				mb-setvar submenu_spacing=2
+				mb-setvar submenu_spacing=1
-				mb-setvar arrow_string=
 				;;
 				normal)
 				mb-setvar jgtools_padding=8
-				mb-setvar jgtools_border=3
+				mb-setvar jgtools_border=0
-				mb-setvar submenu_spacing=3
+				mb-setvar submenu_spacing=2
-				mb-setvar arrow_string=
 				;;
 				wide)
 				mb-setvar jgtools_padding=20
-				mb-setvar jgtools_border=6
+				mb-setvar jgtools_border=4
-				mb-setvar submenu_spacing=6
+				mb-setvar submenu_spacing=4
-				mb-setvar arrow_string=
 				;;
 			esac
 		;;
 		*):;;
 	esac
-	[[ "$3" == "menu" ]] && colorizer-menus -s 2>/dev/null
 }
-
-t_search_field () {
-	[[ $search_field == "false" ]] && mb-setvar search_field=true || mb-setvar search_field=false
-	mb-jgtools main ipc
-}
-t_apps_in_submenu () {
-	[[ $apps_in_submenu == "true" ]] && mb-setvar apps_in_submenu=false || mb-setvar apps_in_submenu=true
-	mb-jgtools main ipc
-}
-t_icons () {
-	[[ $jgmenu_use_icons == "true" ]] && mb-setvar jgmenu_use_icons=false || mb-setvar jgmenu_use_icons=true
-	mb-jgtools main ipc
-}
-border () {
-	[[ "$jgtools_padding" -lt "${1}" ]] && mb-setvar jgtools_padding=${1}
-	mb-setvar jgtools_border=${1}
-	colorizer-menus -s
-}
-padding () {
-	[[ "$jgtools_border" -gt "${1}" ]] && mb-setvar jgtools_border=${1}
-	mb-setvar jgtools_padding=${1}
-	colorizer-menus -s
-}
-
 opacity () {
   # jgctl opacity element value  
   read FUNC B COLOR OPACITY REST<<< "$(grep ${1} ${THEMERC})"
@@ -376,59 +347,6 @@ done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 delscheme() {
 	sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes.csv"
 }
-mono () {
-lighten=(0.92 0.8 0.65 0.45 0.28)
-darken=(0.9 0.74 0.54 0.38 0.18)
-
-if [ "${1}" == pick ];then 
-	color=$(gpick -pso 2>/dev/null)
-else
-	color="${1}"
-fi
-
-if [ "${#color}" == 7 ];then
-	for i in "${lighten[@]}"
-	do
-	pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)")
-	done
-	pal+=("$color")
-
-	for i in "${darken[@]}"
-	do
-	pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)")
-	done
-else
-	exit 0
-fi
-
-# colorize menu
-if [ "$2" == "dark" ];then
-	#notify-send.sh "$1" "gen_menu"
-	color_menu_bg "${pal[8]}"
-	color_menu_bg_to "${pal[7]}"
-	color_menu_border "${pal[10]}"
-	color_title_bg "${pal[9]}"
-	color_title_border "${pal[9]}"
-	color_title_fg "${pal[2]}"
-	color_norm_fg "${pal[3]}"
-	color_sel_bg "${pal[6]}"
-	color_sel_fg "${pal[1]}"
-	color_sep_fg "${pal[6]}"
-else #light
-	color_menu_bg "${pal[2]}"
-	color_menu_bg_to "${pal[3]}"
-	color_menu_border "${pal[1]}"
-	color_title_bg "${pal[3]}"
-	color_title_border "${pal[4]}"
-	color_title_fg "${pal[10]}"
-	color_norm_fg "${pal[8]}"
-	color_sel_bg "${pal[4]}"
-	color_sel_fg "${pal[10]}"
-	color_sep_fg "${pal[3]}"
-fi
-colorizer-menus -s 2>/dev/null
-}
-
 case "$1" in
     theme) theme "$2";;
     reset) reset ;;
@@ -451,14 +369,8 @@ case "$1" in
     color_sel_fg) color_sel_fg "$2";;
     color_sel_border) color_sel_border "$2";;
     accent) accent "$2" "$3";;
-    tweak) tweak "$2" "$3" "$4";;
+    tweak) tweak "$2" "$3";;
     opacity) opacity "$2" "$3";;
-    t_search_field)t_search_field;;
-    t_apps_in_submenu) t_apps_in_submenu;;
-    t_icons)t_icons;;
-    border)border "$2";;
-    padding)padding "$2";;
-    mono) mono "$2" "$3";;
     savescheme) savescheme "$2";;
     applyscheme) applyscheme "$2" "$3";;
     delscheme) delscheme "$2";;

bin/mbclr

@@ -21,6 +21,7 @@
 #notify-send.sh "mbclr" "${1}\n${2}\n${3}\n${4}\n${5}\n${6}"
 case "$LANG" in
     pl*)
+    SELECT_COLOR="Wybierz kolor"
     PICK_FROM_SCREEN="Pobierz kolor z ekranu"
     SELECT_OR_PICK="Wybierz kolor z selektora"
     OPACITY="Nieprzezroczystość"
@@ -29,39 +30,37 @@ case "$LANG" in
     LIGHTEN_DARKEN="Jaśniejsze / Ciemniejsze"
     SATURATION="Nasycenie..."
     ROTATE_HSL_HUE="Obróć kanał barwy HSL..."
-    CHANGE_COLOR="Zmień na..."
     CURRENT="obecny kolor"
-    WALLPAPER_COLORS="...kolory z tapety"
+    WALLPAPER_COLORS="Kolory z tapety"
-    GTKCOLORS="Kolory motywu GTK"
     ACCENT_COLORS="Popularne kolory akcentu"
-	GRAYS="Odcienie szarości"
+    LIGHTCOLORS="Jasne kolory..."
+    DARKCOLORS="Ciemne kolory..."
     
     ;;
     *)
+    SELECT_COLOR="Select color"
     PICK_FROM_SCREEN="Pick color from screen"
     SELECT_OR_PICK="Select or pick from screen"
     OPACITY="Opacity"
-    SHADES_OF_CURRENT="Calculate from"
+    SHADES_OF_CURRENT="Calculate from current"
     SHADES_OF="Shades of"
     LIGHTEN_DARKEN="Lighten / Darken"
     SATURATION="Saturation..."
     ROTATE_HSL_HUE="Rotate HSL hue channel..."
-    CHANGE_COLOR="Change to..."
     CURRENT="current color"
-    WALLPAPER_COLORS="...wallpaper colors"
+    WALLPAPER_COLORS="Wallpaper colors"
-    GTKCOLORS="GTK theme colors"
     ACCENT_COLORS="Popular accent colors"
-    GRAYS="Shades of Gray"
+    LIGHTCOLORS="Light colors..."
+    DARKCOLORS="Dark colors..."
     ;;
 esac
-ccol_ind="<span bgcolor='${1}'> </span>"
+
-gtkthemename=$(grep gtk-theme ~/.config/gtk-3.0/settings.ini |cut -d'=' -f2)
 
 main () {
 #read WALLPAPER<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
@@ -80,16 +79,11 @@ wallcolors+=("#2e3440" "#4c566a" "#5e81ac" "#bf616b" "#b48ead" "#a3be8c" "#ebcb8
 fi
 
 
-grays=("#000000" "#0d0d0d" "#1b1b1b" "#282828" "#363636" "#434343" "#515151" "#5e5e5e" "#6b6b6b" "#797979" "#868686" "#949494" "#a1a1a1" "#aeaeae" "#bcbcbc" "#c9c9c9" "#d7d7d7" "#e4e4e4" "#f2f2f2" "#FFFFFF")
+dark=("#000000" "#111111" "#222222" "#333333" "#444444" "#555555" "#666666")
+light=("#FFFFFF" "#EEEEEE" "#DDDDDD" "#CCCCCC" "#BBBBBB" "#AAAAAA" "#999999")
 accents=("#e93d57" "#c7162b" "#e9633a" "#e95620" "#f4a300" "#e8cc2d" "#3cd425" "#0e8420" "#00d3b7" "#18b0b0" "#3dade9" "#686b6f" "#3584e4" "#916ee4" "#b875dc" "#77216e" "#c748ba" "#e93a9a")
 
 out+=("^sep($4)")
-#TU
-out+=("<big></big>   $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}")
-out+=("<big></big>   $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}")
-
-
-
 if [[ "$2" == "jgctl" ]]; then
 . $HOME/.config/mabox/mabox.conf
 case "$jgmenu_theme" in
@@ -141,6 +135,10 @@ out2+=("<tt><small>  5</small> <span bgcolor='$1' bgalpha='5%'>         </span><
 out2+=("<tt><small>  0</small> <span bgcolor='$1' bgalpha='1%'>         </span><span bgcolor='$1'>    </span></tt>,t2ctl $3 0 ;${5}")
 fi
 
+#Current
+out+=("^sep($SELECT_COLOR)")
+out+=("   $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}")
+out+=("  $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}")
 
 CUR_FG=$(pastel textcolor $1|pastel format hex)
 out+=("^sep($SHADES_OF_CURRENT <tt><span bgcolor='$1' fgcolor='$CUR_FG'>$1</span></tt>)")
@@ -148,38 +146,35 @@ out+=("$LIGHTEN_DARKEN,^checkout(curshades)")
 out+=("$SATURATION,^checkout(saturate)")
 out+=("<big>󰑧</big>   $ROTATE_HSL_HUE,^checkout(rotate_hsl)")
 #out+=("$SHADES_OF_CURRENT <tt><span bgcolor='$1'>      </span></tt> (<small>$1</small>),^checkout(curshades)")
-out+=("^sep($CHANGE_COLOR)")
+
-#Current
+out+=("^sep()")
 out+=("<big><span bgcolor='#e93d57'> </span> <span bgcolor='#f4a300'> </span> <span bgcolor='#3cd425'> </span> <span bgcolor='#3584e4'> </span> <span bgcolor='#e93a9a'> </span></big> $ACCENT_COLORS,^checkout(accents)")
 out2+=("^tag(accents)")
 out2+=("^sep($ACCENT_COLORS)")
-for i in ${accents[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}");done
+for i in ${accents[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span></tt>,$2 $3 '${i}' ${6};${5}");done
+
 out+=("^sep()")
-
+out+=("<tt><span bgcolor='#DDDDDD'>          </span></tt>   $LIGHTCOLORS,^checkout(light)")
-mapfile -t gtkcolors < <( gtkcolors.py 2>/dev/null| grep -v None|awk '{print "#"$2}'|sort|uniq)
+out2+=("^tag(light)")
-if [ "${#gtkcolors[@]}" -gt 0 ];then
+out2+=("^sep($LIGHTCOLORS)")
-out+=("$GTKCOLORS,^checkout(gtkcols)")
+for i in "${light[@]}"
-out2+=("^tag(gtkcols)")
-out2+=("^sep($GTKCOLORS)")
-out2+=("^sep($gtkthemename)")
-for i in ${gtkcolors[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}");done
-out+=("^sep()")
-fi
-
-
-out+=("$GRAYS,^checkout(grayscol)")
-out2+=("^tag(grayscol)")
-out2+=("^sep($GRAYS)")
-for i in "${grays[@]}"
 do
-out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}")
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span></tt>,$2 $3 '${i}' ${6};${5}")
+done
+out+=("^sep()")
+out+=("<tt><span bgcolor='#222222'>          </span></tt>   $DARKCOLORS,^checkout(dark)")
+out2+=("^tag(dark)")
+out2+=("^sep($DARKCOLORS)")
+for i in "${dark[@]}"
+do
+out2+=("<tt><small>$i</small> <span bgcolor='$i'>                </span></tt>,$2 $3 '${i}' ${6};${5}")
 done
 
 
 out+=("^sep($WALLPAPER_COLORS)")
 for i in "${wallcolors[@]}"
 do
-out+=("<tt><small>$i</small> <span bgcolor='$i'>               </span>${ccol_ind}</tt>,$2 $3 '${i}' ${6};${5}")
+out+=("<tt><small>$i</small> <span bgcolor='$i'>               </span></tt>,$2 $3 '${i}' ${6};${5}")
 done
 
 
@@ -191,7 +186,7 @@ out2+=("^sep($SHADES_OF $1)")
 for i in 3 25 2 15 1 05; do
 clr=$(pastel lighten 0.$i "${1}" | pastel format hex)
 if [ "${clr}" != "#ffffff" ];then
-out2+=("<tt><small>$clr</small>   <span bgcolor='$clr'>                </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small>   <span bgcolor='$clr'>                </span></tt>,$2 $3 '${clr}' ${6};${5}")
 fi
 done
 
@@ -201,7 +196,7 @@ out2+=("^sep()")
 for i in 05 1 15 2 25 3; do
 clr=$(pastel darken 0.$i "${1}" | pastel format hex)
 if [ "${clr}" != "#000000" ];then
-out2+=("<tt><small>$clr</small>   <span bgcolor='$clr'>                </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small>   <span bgcolor='$clr'>                </span></tt>,$2 $3 '${clr}' ${6};${5}")
 fi
 done
 # Shades ENG
@@ -214,7 +209,7 @@ out2+=("^sep($SATURATION)")
 for i in 9 8 7 6 5 4 3 2 1; do
 clr=$(pastel desaturate 0.$i "${1}" | pastel format hex)
 if [ "${clr}" != "${oldclr}" ];then 
-out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span></tt>,$2 $3 '${clr}' ${6};${5}")
 oldclr=${clr}
 fi
 done
@@ -224,7 +219,7 @@ out2+=("^sep()")
 for i in 1 2 3 4 5 6 7 8 9; do
 clr=$(pastel saturate 0.$i "${1}" | pastel format hex)
 if [ "${clr}" != "${oldclr}" ];then 
-out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span>${ccol_ind}</tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span></tt>,$2 $3 '${clr}' ${6};${5}")
 oldclr=${clr}
 fi
 done
@@ -235,14 +230,14 @@ out2+=("^tag(rotate_hsl)")
 out2+=("^sep($ROTATE_HSL_HUE)")
 for i in {135..15..15};do 
 clr=$(pastel rotate -- -$i "${1}" |pastel format hex)
-out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span>${ccol_ind} <small>-$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span> <small>-$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
 done
 out2+=("^sep()")
 out2+=("<tt><span bgcolor='$1' fgcolor='$CUR_FG'>   <small>$CURRENT $1</small>       </span></tt>,$2 $3 '${1}' ${6};${5}")
 out2+=("^sep()")
 for i in {15..135..15};do 
 clr=$(pastel rotate $i "${1}" |pastel format hex)
-out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span>${ccol_ind} <small>$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
+out2+=("<tt><small>$clr</small> <span bgcolor='$clr'>                </span> <small>$i°</small></tt>,$2 $3 '${clr}' ${6};${5}")
 done
 # ROTATE HSL END
 

bin/obtctl

@@ -57,7 +57,6 @@ resetMBcolors() {
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:size' -v "9" "$cfg"
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:weight' -v "Bold" "$cfg"
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:slant' -v "Normal" "$cfg"
-    rm ${THEMERC}.bak
 }
     
 borderWidth () {
@@ -74,20 +73,16 @@ borderWidth () {
         sd "^border.width:.*$" "border.width: ${BWIDTH}" ${THEMERC}
         fi
         ;;
-        *)
+        0|1|2|3|4|5|6|7|8)
         sd "^border.width:.*$" "border.width: $1" ${THEMERC}
         ;;
     esac
 }
 activeborderColor () {
     sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC}
-    read BORD <<< "$(grep border.width ${THEMERC} | cut -d':' -f2)"
-    [[ "$BORD" == 0 ]] && borderWidth 1
 }
 inactiveborderColor () {
     sd "\.inactive.border.color:.*$" ".inactive.border.color: $1" ${THEMERC}
-    read BORD <<< "$(grep border.width ${THEMERC} | cut -d':' -f2)"
-    [[ "$BORD" == 0 ]] && borderWidth 1
 }
 paddingHeight () {
     case "$1" in
@@ -105,7 +100,7 @@ paddingHeight () {
         sd "^padding.width:.*$" "padding.width: ${PHEIGHT}" ${THEMERC}
         fi
         ;;
-        0|1|2|3|4|5|6|8|10|12|16|20)
+        0|1|2|3|4|6|8|10|12|16|20)
         sd "^padding.height:.*$" "padding.height: $1" ${THEMERC}
         sd "^padding.width:.*$" "padding.width: $1" ${THEMERC}
         ;;
@@ -184,120 +179,14 @@ random_gradient () {
     activegradient "$CLR" "$CLRTO"
 }
 activegradient () {
-    # ACTIVE
+    #notify-send.sh "zmiennne obtctl" "${1} ${2}"
-    
-    # ACTIVE GRIP and HANDLE
-    colorTo=$(pastel darken 0.1 "${1}"|pastel format hex)
-    #activehandle?
-    ###read ABG <<< "$(grep .active.title.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###read AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###if [ "$ABG" == "$AHBG" ];then
-    
-    ###fi
-    sd "\.active.grip.bg.color:.*$" ".active.grip.bg.color: ${1}" ${THEMERC}
-    sd "\.active.grip.bg.colorTo:.*$" ".active.grip.bg.colorTo: ${colorTo}" ${THEMERC}
-    sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC}
-    sd "\.active.border.color:.*$" ".active.border.color: ${1}" ${THEMERC}
-    
-    sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${colorTo}" ${THEMERC}
-    
-    
     #sd "\.active.handle.bg.color:.*$" ".active.handle.bg.color: ${1}" ${THEMERC}
     sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC}
     sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${2}" ${THEMERC}
     
-    ## split.To - only used if gradient = splitvertical
-    splitTo=$(pastel lighten 0.275 "${1}"|pastel format hex)
-    ## 1 color (top one)
-    sd "window.active.title.bg.color.splitTo:.*$" "window.active.title.bg.color.splitTo: ${splitTo}"  ${THEMERC}
-    
-    splitTo2=$(pastel lighten 0.12 "${2}"|pastel format hex)
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
-    ## 4 color (bottom one)
-    sd "window.active.title.bg.colorTo.splitTo:.*$" "window.active.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
-    
-    
     # Border color = active.title.bg.color (gradient start color)
     sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC}
     
-    #### INACTIVE
-    icolor=$(pastel mix -s RGB -f 0.3 ${1} '#000000' |pastel format hex)
-    icolorTo=$(pastel mix -s RGB -f 0.3 ${2} '#000000' |pastel format hex)
-    
-    
-    sd "^window.inactive.title.bg.color:.*$" "window.inactive.title.bg.color: ${icolor}" ${THEMERC}
-    sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${icolorTo}" ${THEMERC}
-    # Border color = active.title.bg.color (gradient start color)
-    sd "\.inactive.border.color:.*$" ".inactive.border.color: ${icolor}" ${THEMERC}
-    
-    ## INACTIVE GRIP and HANDLE
-    #normalhandle?
-    ###read IBG <<< "$(grep .inactive.title.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###read IHBG <<< "$(grep .inactive.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###if [ "$IBG" == "$IHBG" ];then
-    sd "\.inactive.handle.bg.color:.*$" ".inactive.handle.bg.color: ${icolor}" ${THEMERC}
-    sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${icolorTo}" ${THEMERC}
-    ###fi
-    sd "\.inactive.grip.bg.color:.*$" ".inactive.grip.bg.color: ${icolor}" ${THEMERC}
-    sd "\.inactive.grip.bg.colorTo:.*$" ".inactive.grip.bg.colorTo: ${icolorTo}" ${THEMERC}
-    sd "^window.inactive.title.bg.color:.*$" "window.inactive.title.bg.color: ${icolor}" ${THEMERC}
-    sd "\.inactive.border.color:.*$" ".inactive.border.color: ${icolor}" ${THEMERC}
-    sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${icolorTo}" ${THEMERC}
-    
-    ## Active handle always have inactive colors
-    sd "\.active.handle.bg.color:.*$" ".active.handle.bg.color: ${icolor}" ${THEMERC}
-    sd "\.active.handle.bg.colorTo:.*$" ".active.handle.bg.colorTo: ${icolorTo}" ${THEMERC}
-    
-    
-    # calculate color for title.fg and buttons
-    TITLE_FG=$(pastel textcolor ${2}|pastel format hex)
-    if [[ "${TITLE_FG}" == *"ffffff"* ]];then
-        TITLE_FG="#E5E5E5"
-    else
-        TITLE_FG="#222222"
-    fi
-    sd "\.active.label.text.color:.*$" ".active.label.text.color: ${TITLE_FG}" ${THEMERC}
-    
-    # Button colors
-    activebuttonscolors "${TITLE_FG}"
-    # Shadow
-    read SHADOW <<< "$(grep .active.label.text.font: ${THEMERC} | cut -d':' -f2| cut -d'=' -f2)"
-    if [ "$SHADOW" == "y" ];then
-        if [ "$TITLE_FG" == "#E5E5E5" ];then
-        shadow dark
-        else
-        shadow light
-        fi
-    fi
-}
-gradient () {
-	sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC}
-    sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${2}" ${THEMERC}
-    
-    ## split.To - only used if gradient = splitvertical
-    splitTo=$(pastel lighten 0.275 "${1}"|pastel format hex)
-    ## 1 color (top one)
-    sd "window.active.title.bg.color.splitTo:.*$" "window.active.title.bg.color.splitTo: ${splitTo}"  ${THEMERC}
-    
-    splitTo2=$(pastel lighten 0.12 "${2}"|pastel format hex)
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
-    ## 4 color (bottom one)
-    sd "window.active.title.bg.colorTo.splitTo:.*$" "window.active.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
-    
-    # Border color = active.title.bg.color (gradient start color)
-    sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC}
-    
-    #### INACTIVE
-    icolor=$(pastel darken 0.5 ${1}|pastel format hex)
-    icolorTo=$(pastel darken 0.5 ${2}|pastel format hex)
-    
-    sd "^window.inactive.title.bg.color:.*$" "window.inactive.title.bg.color: ${icolor}" ${THEMERC}
-    sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${icolorTo}" ${THEMERC}
-    # Border color = active.title.bg.color (gradient start color)
-    sd "\.inactive.border.color:.*$" ".inactive.border.color: ${icolor}" ${THEMERC}
-    
-    
-    
     # calculate color for title.fg and buttons
     TITLE_FG=$(pastel textcolor ${2}|pastel format hex)
     if [[ "${TITLE_FG}" == *"ffffff"* ]];then
@@ -319,8 +208,9 @@ gradient () {
         fi
     fi
     
+    
 }
-gradient_reverse () {
+activegradient_reverse () {
 :
 }
 activehandle () {
@@ -374,7 +264,7 @@ clractivebg_only () {
     activebuttonscolors "${TITLE_FG}"
 }
 clractivebg () {
-    colorTo=$(pastel darken 0.14 "${1}"|pastel format hex)
+    colorTo=$(pastel darken 0.1 "${1}"|pastel format hex)
     #activehandle?
     read ABG <<< "$(grep .active.title.bg.color: ${THEMERC} | cut -d':' -f2)"
     read AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
@@ -388,17 +278,6 @@ clractivebg () {
     sd "\.active.border.color:.*$" ".active.border.color: ${1}" ${THEMERC}
     
     sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${colorTo}" ${THEMERC}
-    
-    ## split.To - only used if gradient = splitvertical
-    splitTo=$(pastel lighten 0.275 "${1}"|pastel format hex)
-    ## 1 color (top one)
-    sd "window.active.title.bg.color.splitTo:.*$" "window.active.title.bg.color.splitTo: ${splitTo}"  ${THEMERC}
-    
-    splitTo2=$(pastel lighten 0.12 "${colorTo}"|pastel format hex)
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
-    ## 4 color (bottom one)
-    sd "window.active.title.bg.colorTo.splitTo:.*$" "window.active.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
-    
     #menu (Openbox menu - not really used in Mabox)
     sd "menu.title.bg.color:.*$" "menu.title.bg.color: ${1}" ${THEMERC}
     sd "menu.title.bg.colorTo:.*$" "menu.title.bg.colorTo: ${colorTo}" ${THEMERC}
@@ -426,57 +305,39 @@ clrnormalbg_only () {
 
 clrnormalbg () {
     colorTo=$(pastel darken 0.1 "${1}"|pastel format hex)
-
+    #normalhandle?
-    ###sd "\.inactive.handle.bg.color:.*$" ".inactive.handle.bg.color: ${1}" ${THEMERC}
+    read IBG <<< "$(grep .inactive.title.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${colorTo}" ${THEMERC}
+    read IHBG <<< "$(grep .inactive.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
-    sd "\.handle.bg.color:.*$" ".handle.bg.color: ${1}" ${THEMERC}
+    if [ "$IBG" == "$IHBG" ];then
-    sd "\.handle.bg.colorTo:.*$" ".handle.bg.colorTo: ${colorTo}" ${THEMERC}
+    sd "\.inactive.handle.bg.color:.*$" ".inactive.handle.bg.color: ${1}" ${THEMERC}
-
+    sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${colorTo}" ${THEMERC}
+    fi
     sd "\.inactive.grip.bg.color:.*$" ".inactive.grip.bg.color: ${1}" ${THEMERC}
     sd "\.inactive.grip.bg.colorTo:.*$" ".inactive.grip.bg.colorTo: ${colorTo}" ${THEMERC}
     sd "^window.inactive.title.bg.color:.*$" "window.inactive.title.bg.color: ${1}" ${THEMERC}
-    sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${colorTo}" ${THEMERC}
-    
-    ## split.To - only used if gradient = splitvertical
-    splitTo=$(pastel lighten 0.275 "${1}"|pastel format hex)
-    ## 1 color (top one)
-    sd "window.inactive.title.bg.color.splitTo:.*$" "window.inactive.title.bg.color.splitTo: ${splitTo}"  ${THEMERC}
-    
-    splitTo2=$(pastel lighten 0.12 "${colorTo}"|pastel format hex)
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
-    ## 4 color (bottom one)
-    sd "window.inactive.title.bg.colorTo.splitTo:.*$" "window.inactive.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
-    
-    
-    
     sd "\.inactive.border.color:.*$" ".inactive.border.color: ${1}" ${THEMERC}
+    sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${colorTo}" ${THEMERC}
 }
 
 clractivebgto () {
     sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${1}" ${THEMERC}
-    
-    splitTo2=$(pastel lighten 0.12 "${1}"|pastel format hex)
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
-    ## 4 color (bottom one)
-    sd "window.active.title.bg.colorTo.splitTo:.*$" "window.active.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
-    
     #activehandle?
-    ###read ABG <<< "$(grep .active.title.bg.color: ${THEMERC} | cut -d':' -f2)"
+    read ABG <<< "$(grep .active.title.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###read AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
+    read AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ###if [ "$ABG" == "$AHBG" ];then
+    if [ "$ABG" == "$AHBG" ];then
     sd "\.active.handle.bg.colorTo:.*$" ".active.handle.bg.colorTo: ${1}" ${THEMERC}
-    ###fi
+    fi
     sd "\.active.grip.bg.colorTo:.*$" ".active.grip.bg.colorTo: ${1}" ${THEMERC}
 }
 
 clrnormalbgto () {
     sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.title.bg.colorTo: ${1}" ${THEMERC}
-    splitTo2=$(pastel lighten 0.12 "${1}"|pastel format hex)
+    #normalhandle?
-    #splitTo2=$(pastel lighten 0.09 "${1}"|pastel format hex)
+    read IBG <<< "$(grep .inactive.title.bg.color: ${THEMERC} | cut -d':' -f2)"
-    ## 4 color (bottom one)
+    read IHBG <<< "$(grep .inactive.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
-    sd "window.active.title.bg.colorTo.splitTo:.*$" "window.active.title.bg.colorTo.splitTo: ${splitTo2}" ${THEMERC}
+    if [ "$IBG" == "$IHBG" ];then
-    
     sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${1}" ${THEMERC}
+    fi
     sd "\.inactive.grip.bg.colorTo:.*$" ".inactive.grip.bg.colorTo: ${1}" ${THEMERC}
 }
 activetextcolor () {
@@ -568,15 +429,11 @@ fontsize () {
 fontweight () {
     nspace="http://openbox.org/3.4/rc"
     cfg="$HOME/.config/openbox/rc.xml"
+    
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:weight' -v "${1}" "$cfg"
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:weight' -v "${1}" "$cfg"
     
 }
-fontweight_inactive () {
-    nspace="http://openbox.org/3.4/rc"
-    cfg="$HOME/.config/openbox/rc.xml"
-    xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:weight' -v "${1}" "$cfg"
-}
 fontweighttoggle (){
     nspace="http://openbox.org/3.4/rc"
     cfg="$HOME/.config/openbox/rc.xml"
@@ -590,15 +447,10 @@ fontweighttoggle (){
 fontslant (){
     nspace="http://openbox.org/3.4/rc"
     cfg="$HOME/.config/openbox/rc.xml"
+    
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:slant' -v "${1}" "$cfg"
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:slant' -v "${1}" "$cfg"
 }
-fontslant_inactive (){
-    nspace="http://openbox.org/3.4/rc"
-    cfg="$HOME/.config/openbox/rc.xml"
-    xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:slant' -v "${1}" "$cfg"
-}
-
 fontslanttoggle (){
     nspace="http://openbox.org/3.4/rc"
     cfg="$HOME/.config/openbox/rc.xml"
@@ -634,25 +486,19 @@ randomizer () {
     activegradient "$CLR" "$CLRTO"
     
     ### rand gradient type
-    TYPES=(solid vertical horizontal mirrorhorizontal diagonal mirrorhorizontal)
+    TYPES=(solid vertical horizontal mirrorhorizontal diagonal pyramid)
     rand=$((RANDOM%6))
     G_TYPE="${TYPES[$rand]}"
     gradient_type "${G_TYPE}"
     #rand
     
     ### Random border
-    BORDERS=(0 0 1 2 4 6)
+    BORDERS=(0 1 2 4)
-    rand=$((RANDOM%5))
+    rand=$((RANDOM%3))
     BORDER="${BORDERS[$rand]}"
     
     borderWidth "${BORDER}"
     
-    HANDLES=(0 0 2 4)
-    rand=$((RANDOM%4))
-    HANDLE="${HANDLES[$rand]}"
-    
-    handlewidth "${HANDLE}"
-    
     ### Random padding
     PADDINGS=(2 4 8 12)
     rand=$((RANDOM%4))
@@ -661,8 +507,8 @@ randomizer () {
     paddingHeight "${PADDING}"
     
     ### TITLEBAR STYLE
-    STYLES=(flat raised raised sunken)
+    STYLES=(flat raised sunken)
-    rand=$((RANDOM%4))
+    rand=$((RANDOM%3))
     STYLE="${STYLES[$rand]}"
     
     raised "${STYLE}"
@@ -712,13 +558,6 @@ randomizer () {
     
     buttons "${BUTTON}"
     
-    ### Buttons layout
-    LAYOUTS=(NDSLIMC NDSLIMC NLIMC LIMC)
-    rand=$((RANDOM%4))
-    LAYOUT="${LAYOUTS[$rand]}"
-    
-    ndslimc "${LAYOUT}"
-    
     
 #MSG="
 #Openbox Window Decoration settings
@@ -736,156 +575,7 @@ randomizer () {
 #Font: <b>${FAMILY} ${WEIGHT} ${SLANT} ${FONTSIZE}</b>
 #"
 #    notify-send.sh -R /tmp/randomizer_notify -t 10000 -i mbcc "Mabox Colorizer" "${MSG}" \
-#    -o "Regenerate:randomizer ob" -o "Customize:colorizer-ob -s" 
+    -o "Regenerate:randomizer ob" -o "Customize:colorizer-ob -s" 
-}
-
-tweak() {
-	case "$1" in
-		large)
-		fontsize 14
-		paddingHeight 8
-		buttons big-14
-		borderWidth 6
-		handlewidth 6
-		;;
-		big)
-		fontsize 12
-		paddingHeight 6
-		buttons big-12
-		borderWidth 4
-		handlewidth 4
-		;;
-		normal)
-		fontsize 11
-		paddingHeight 4
-		buttons tiny
-		borderWidth 1
-		handlewidth 3
-		;;
-		small)
-		fontsize 10
-		paddingHeight 2
-		buttons dots
-		borderWidth 0
-		handlewidth 2
-		;;
-		tiny)
-		fontsize 9
-		paddingHeight 1
-		buttons normal
-		borderWidth 0
-		handlewidth 0
-		;;
-		*):;;
-	esac
-}
-savetheme () {
-	case "$LANG" in
-        pl*)SAVE_AS="Nowy motyw Openbox"
-			DESC="Zapisz obecne ustawionia Openbox jako nowy motyw..."
-			LABEL="Nazwa:"
-			NAME="nazwa";;
-        *) 	SAVE_AS="New Openbox theme"
-			DESC="Save current Openbox window decoration setup as theme..."
-			LABEL="Name:"
-			NAME="theme-name";;
-    esac
-	# ask for scheme name
-	schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1
-	
-	echo "${1}${schemename}" >> "$HOME/.config/colorizer/openbox/userthemes.csv"
-}
-applyscheme () {
-	theme MBcolors
-	case "$1" in
-		sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";;
-		usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";;
-	esac
-	while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name
-	do
-	clractivebg "${abg}"
-	clractivebgto "${abgto}"
-	activetextcolor "${afg}"
-	activeborderColor "${aline}"
-	clrnormalbg "${nbg}"
-	clrnormalbgto "${nbgto}"
-	inactivetextcolor "${nfg}"
-	inactiveborderColor "${nline}"
-	gradient_type "${grad}"
-	done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
-}
-applytheme() {
-	case "$1" in
-		sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";;
-		usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";;
-	esac
-	applyscheme "$1" "$2"
-	while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name
-	do
-	textjustify "${txtjust}"
-	paddingHeight "${pheight}"
-	paddingWidth "${pwidth}"
-	handlewidth "${handle}"
-	borderWidth "${bord}"
-	raised "${bevel}"
-	buttons "${button}"
-	fontsize "${fsize}"
-	fontfamily "${fname}"
-	ndslimc  "${ndslim}"
-	fontweight "${weight}"
-	fontslant "${slant}"
-	done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
-}
-delscheme() {
-	sed -i ${1}d "$HOME/.config/colorizer/openbox/userthemes.csv"
-}
-mono() {
-lighten=(0.92 0.8 0.65 0.45 0.28)
-darken=(0.9 0.74 0.54 0.38 0.18)
-
-if [ "${1}" == pick ];then 
-	color=$(gpick -pso 2>/dev/null)
-else
-	color="${1}"
-fi
-
-if [ "${#color}" == 7 ];then
-	for i in "${lighten[@]}"
-	do
-	pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)")
-	done
-	pal+=("$color")
-
-	for i in "${darken[@]}"
-	do
-	pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)")
-	done
-else
-	exit 0
-fi
-
-#colorize OB
-if [ "$2" == "dark" ];then
-	clractivebg "${pal[5]}"
-	#clractivebgto "${pal[6]}"
-	activeborderColor "${pal[2]}"
-	activetextcolor "${pal[1]}"
-	clrnormalbg "${pal[9]}"
-	clrnormalbgto "${pal[10]}"
-	inactiveborderColor "${pal[8]}"
-	inactivetextcolor "${pal[4]}"
-else #light
-	clractivebg "${pal[4]}"
-	#clractivebgto "${pal[4]}"
-	activeborderColor "${pal[0]}"
-	activetextcolor "${pal[9]}"
-	clrnormalbg "${pal[9]}"
-	clrnormalbgto "${pal[10]}"
-	inactiveborderColor "${pal[7]}"
-	inactivetextcolor "${pal[5]}"
-fi
-openbox --reconfigure
-colorizer-ob -s 2>/dev/null
 }
 
 case "$1" in
@@ -905,7 +595,6 @@ case "$1" in
     gradient_type) gradient_type "$2";;
     random_gradient) random_gradient;;
     activegradient) activegradient "$2" "$3";;
-    gradient_reverse) gradient_reverse;;
     activehandle) activehandle "$2";;
     clractivebg_only) clractivebg_only "$2";; #ADVANCED - do not calculate colorTo
     clractivebg) clractivebg "$2";;
@@ -920,19 +609,11 @@ case "$1" in
     activebuttonscolors) activebuttonscolors "$2";;
     fontfamily) fontfamily "$2";;
     fontweight) fontweight "$2";;
-    fontweight_inactive) fontweight_inactive "$2";;
     fontslant) fontslant "$2";;
-    fontslant_inactive) fontslant_inactive "$2";;
     fontsize) fontsize "$2";;
     fontweighttoggle) fontweighttoggle;;
     fontslanttoggle) fontslanttoggle;;
     randomizer) randomizer;;
-    tweak) tweak "$2";;
-    mono) mono "$2" "$3";;
-    savetheme) savetheme "$2";;
-    applyscheme) applyscheme "$2" "$3";;
-    applytheme) applytheme "$2" "$3";;
-    delscheme) delscheme "$2";;
     *) : ;;
 esac
 

bin/papirus-folder-color.sh

@@ -1,275 +0,0 @@
-#!/bin/bash
-#    papirus-folder-color.sh
-#    Generate icon theme inheriting Papirus or Papirus-Dark,
-#    but with different coloured folder icons.
-#
-#    Copyright: 2019-2022 John Crawley <john@bunsenlabs.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# If not overruled by --name option, this will be included in generated theme name.
-# Other vendors, please edit to taste:
-vendor=Mabox
-
-USAGE="
-papirus-folder-color.sh [OPTIONS]
-
-    Generates a user custom icon theme with a different folder color from
-    the default Papirus blue.
-
-Options:
-        -h, --help
-            Show this message.
-        -c, --color <color>
-            Choose icon color.
-        -s, --source_path <path>
-            Set path to directory holding Papirus theme to be used.
-        -t, --target_path <path>
-            Set path to directory where new theme will be generated.
-        -n, --name <name>
-            Set name of generated theme.
-        -l, --link
-            Symlink icons to source instead of copying.
-        -d, --dark
-            Declare theme to be dark and inherit Papirus-Dark.
-
-color must be specified and can be one of:
-black,blue,bluegrey,breeze,brown,cyan,deeporange,green,grey,indigo,magenta,nordic,orange,palebrown,paleorange,pink,red,teal,violet,white,yaru,yellow,custom
-
-NB \"custom\" color corresponds to jet black, while \"black\" is actually dark grey.
-\"jet-black\" may also be passed as an alias for \"custom\".
-
-If --source_path is not passed, the Papirus theme is read from
-/usr/share/icons/Papirus
-
-If --target_path is not passed, the generated theme is written to
-~/.local/share/icons/<new theme name>
-
-If --name is not passed, the generated theme will be named
-Papirus-${vendor}[-Dark]-<color>.
-
-By default icons will be copied into the new theme, not symlinked.
-This increases the size, but improves portability.
-Pass --link to generate symlinks instead.
-
-If source_path and target_path are under the same top-level directory
-then symlinked icons will use relative paths, otherwise absolute paths.
-"
-
-## default variables
-## these can (should, at least for color) be overridden by script options
-source_path=/usr/share/icons # place to find source Papirus theme
-target_path="$HOME/.local/share/icons" # place to put generated theme
-#target_path="$PWD"
-copy_files=true # If true, copy icons into new theme instead of symlinking.
-new_theme=''
-color=''
-
-error_exit() {
-    echo "$0 error: $1" >&2
-    exit 1
-}
-
-while [[ -n $1 ]]
-do
-    case "$1" in
-    --color|-c)
-        color=$2
-        shift 2
-        ;;
-    --source_path|-s)
-        source_path=$2
-        shift 2
-        ;;
-    --target_path|-t)
-        target_path=$2
-        shift 2
-        ;;
-    --name|-n)
-        new_theme=$2
-        shift 2
-        ;;
-    --link|-l)
-        copy_files=false
-        shift
-        ;;
-    --dark|-d)
-        dark_theme=true
-        shift
-        ;;
-    --help|-h)
-        echo "$USAGE"
-        exit
-        ;;
-    *)
-        error_exit "$1: Unrecognized option."
-        ;;
-    esac
-done
-
-########################################################################
-
-case "$color" in
-adwaita|black|blue|bluegrey|breeze|brown|carmine|cyan|darkcyan|deeporange|green|grey|indigo|magenta|nordic|orange|palebrown|paleorange|pink|red|teal|violet|white|yaru|yellow|custom)
-    ;;
-jet-black)
-    color=custom;;
-*)
-    error_exit "${color}: Unrecognized colour."
-esac
-
-[[ -n $new_theme ]] || {
-    if [[ $dark_theme = true ]]
-    then
-        new_theme="Papirus-${vendor}-Dark-${color}"
-    else
-        new_theme="Papirus-${vendor}-${color}"
-    fi
-}
-
-source_dir="$source_path/Papirus"
-target_dir="$target_path/$new_theme"
-
-[[ $(basename "$source_dir") = Papirus ]] || error_exit "$source_dir: Not a Papirus theme directory"
-[[ $(basename "$target_dir") = Papirus* ]] || error_exit "$target_dir: Not a Papirus theme directory" # try to avoid accidents
-
-
-# Define function to make symlinks,
-# relative if source & target have same top-level directory.
-# If copy_files is true, copy instead of linking.
-set_linking() {
-    if [[ $copy_files = true ]]
-    then
-        link_file() { cp "$1" "$2"; }
-    else
-        local tld_src=$( readlink -f "${source_dir}" )
-        tld_src=${tld_src#/}
-        tld_src=${tld_src%%/*}
-        local tld_tgt=$( readlink -f "${target_dir}" )
-        tld_tgt=${tld_tgt#/}
-        tld_tgt=${tld_tgt%%/*}
-        if [[ "$tld_src" = "$tld_tgt" ]]
-        then
-            link_file() { ln -sfr "$1" "$2"; }
-        else
-            link_file() { ln -sf "$1" "$2"; }
-        fi
-    fi
-}
-
-set_linking
-
-[[ -e "$target_dir" ]] && {
-    echo "$target_dir will be removed and replaced, OK?"
-    read -r -p ' remove? (y/n) '
-    case ${REPLY^^} in
-    Y|YES)
-        rm -rf "$target_dir" || error_exit "Failed to remove $target_dir";;
-    *)
-        echo 'User cancelled. Exiting...'; exit;;
-    esac
-}
-mkdir -p "$target_dir" || error_exit "Failed to create $target_dir"
-
-defcolor=blue # the Papirus default
-shortdirlist=
-longdirlist=
-for subdir in "$source_dir"/*
-do
-    [[ -d ${subdir}/places && ! -h $subdir ]] || continue # only use icons in "places" directories
-    files=()
-    while IFS= read -r -d '' file
-    do
-        files+=("$file")
-    done < <(find "${subdir}/places" -type l \( -ilname "*-$defcolor-*" -o -lname "*-$defcolor.*" \) ! -iname "*-$defcolor-*" ! -iname "*-$defcolor.*" -print0)
-    [[ ${#files[@]} -gt 0 ]] || continue
-    dirname=${subdir##*/}
-    mkdir -p "$target_dir/${dirname}/places" || error_exit "Failed to create $target_dir/${dirname}/places"
-    scaledname=${dirname}@2x
-    [[ $dirname != symbolic ]] && ln -s "${dirname}" "${target_dir}/${scaledname}" || error_exit "Failed to link ${target_dir}/${scaledname} to ${dirname}"
-    for i in "${files[@]}"
-    do
-        find "${subdir}/places" -type l -lname "${i##*/}" -exec cp --no-dereference '{}' "$target_dir/${dirname}/places" \;
-        target="$(readlink "$i")"
-        target="${target/-${defcolor}/-${color}}"
-        [[ -f "$subdir/places/$target" ]] || { echo "$subdir/places/$target: not found"; continue; }
-        link_file "$subdir/places/$target" "$target_dir/$dirname/places/${i##*/}" || error_exit "Failed to link_file() $target_dir/$dirname/places/${i##*/} to $subdir/places/$target"
-    done
-    case "${dirname}" in
-    symbolic)
-        shortdirlist+="${dirname}/places,"
-        longdirlist+="[${dirname}/places]
-Context=Places
-Size=16
-MinSize=16
-MaxSize=512
-Type=Scalable
-
-"
-        ;;
-    *)
-        shortdirlist+="${dirname}/places,${scaledname}/places,"
-        longdirlist+="[${dirname}/places]
-Context=Places
-Size=${dirname%x*}
-Type=Fixed
-
-[${scaledname}/places]
-Context=Places
-Size=${dirname%x*}
-Scale=2
-Type=Fixed
-
-"
-        ;;
-    esac
-done
-
-if [[ $dark_theme = true ]]
-then
-    inherit="Papirus-Dark,breeze-dark"
-else
-    inherit="Papirus,breeze"
-fi
-
-cat <<EOF > "$target_dir/index.theme"
-[Icon Theme]
-Name=$new_theme
-Comment=Recoloured Papirus icon theme for Mabox Linux
-Inherits=${inherit},hicolor
-
-Example=folder
-
-FollowsColorScheme=true
-
-DesktopDefault=48
-DesktopSizes=16,22,24,32,48,64
-ToolbarDefault=22
-ToolbarSizes=16,22,24,32,48
-MainToolbarDefault=22
-MainToolbarSizes=16,22,24,32,48
-SmallDefault=16
-SmallSizes=16,22,24,32,48
-PanelDefault=48
-PanelSizes=16,22,24,32,48,64
-DialogDefault=48
-DialogSizes=16,22,24,32,48,64
-
-# Directory list
-Directories=${shortdirlist%,}
-
-$longdirlist
-EOF
-
-gtk-update-icon-cache "$target_dir"

bin/w2theme

@@ -20,7 +20,7 @@
 
 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
-read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | tail -1 | cut -d'=' -f2)
+read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
 
 NAME=${WALLPATH////_}
 if [[ "${NAME}" =~ ^_home_.* ]]; then
@@ -31,7 +31,7 @@ fi
 
 
 if [ ! -f "$WALLPALDIR/$NAME.clr" ]; then
-magick ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$NAME.clr"
+convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$NAME.clr"
 fi
 mapfile -t w < "$WALLPALDIR/$NAME.clr"
 
@@ -284,7 +284,6 @@ case "$1" in
     obtctl clrnormalbgto "$(pastel darken 0.1 "${w[1]}"|pastel format hex)" 
     ;;
     esac
-    obtctl shadow 0
 }
 colorize () {
     source ~/.config/colorizer/colorizer.conf
@@ -382,7 +381,7 @@ genthumb () {
     mkdir -p ${THUMBDIR}
     THUMB="${THUMBDIR}/${NAME}.png"
     if [[ ! -f "$THUMB" ]]; then
-        magick ${1} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
+        convert ${1} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
     fi
 }
 pin () {

share/mabox-colorizer/colorschemes/conky.csv

@@ -1,12 +1,10 @@
-WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |WINTRANS|OUTLINE|SHADES | BORD | STIP |scheme_name
+WINCLR |  CLR  | CLR0  | CLR1  | CLR2  |scheme_name
-#142c2c|#309552|#accdc7|#61c4bc|#E8CB2D|false|false|false|true|0|Istredd default
+#142c2c|#309552|#accdc7|#61c4bc|#E8CB2D|Istredd default
-#282936|#e9e9f4|#ea51b2|#00f769|#ebff87|false|false|false|false|1|Dracula
+#282936|#e9e9f4|#ea51b2|#00f769|#ebff87|Dracula
-#282828|#ebdbb2|#98971a|#d79921|#cc241d|false|false|false|false|1|Gruvbox Dark
+#282828|#ebdbb2|#98971a|#d79921|#cc241d|Gruvbox Dark
-#2D2A2E|#AB9DF2|#FCFCFA|#78DCE8|#A9DC76|false|false|false|false|1|Monokai Pro
+#2D2A2E|#AB9DF2|#FCFCFA|#78DCE8|#A9DC76|Monokai Pro
-#2E3440|#B48EAD|#D8DEE9|#88C0D0|#EBCB8B|false|false|false|false|1|Nord
+#2E3440|#B48EAD|#D8DEE9|#88C0D0|#EBCB8B|Nord
-#f8f8f8|#181415|#282828|#0e8420|#e95620|true|false|true|false|1|transparent DarkTxt
+#184956|#adbcbc|#ff665c|#84c747|#ebc13d|Selenized Dark
-#1b1b1b|#bbc8c8|#f2f2f2|#84c747|#ebc13d|true|false|false|false|1|transparent WhiteTxt
+#ECE3CC|#3A4D53|#AD8900|#CC1729|#428B00|Selenized Light
-#184956|#adbcbc|#ff665c|#84c747|#ebc13d|false|false|false|false|1|Selenized Dark
+#151718|#D6D6D6|#CD3F45|#9FCA56|#E6CD69|Seti
-#ECE3CC|#3A4D53|#AD8900|#CC1729|#428B00|false|false|false|false|1|Selenized Light
+#1d1f21|#b294bb|#c5c8c6|#81a2be|#b5bd68|Tomorrow Nigh
-#151718|#D6D6D6|#CD3F45|#9FCA56|#E6CD69|false|false|false|false|1|Seti
-#1d1f21|#b294bb|#c5c8c6|#81a2be|#b5bd68|false|false|false|false|1|Tomorrow Nigh

share/mabox-colorizer/colorschemes/ob.csv

@@ -1,9 +0,0 @@
-  ABG  | ABGTO |  AFG  | ALINE |  NBG  | NBGTO |  NFG  | NLINE |  GRAD  |TXTJUST|PHEIGHT|PWIDTH|HANDLE|BORD|BEVEL|BUTTONS|FSIZE|FNAME|NDSLIMC|WEIGHT|SLANT|scheme_name
-#579c8e|#41756a|#ffffff|#579c8e|#383838|#2a2a2a|#898989|#292929|vertical|center|4|4|4|1|raised|tiny|11|Noto Sans|NDSLIMC|Normal|Normal|Mabox Istredd
-#d2cda1|#c6b76b|#222222|#d2cda1|#0c1d23|#000000|#898989|#0c1d23|vertical|center|4|4|2|0|raised|big-12|12|Noto Sans|NLIMC|Normal|Normal|Mabox Jaskier Light
-#283433|#1a231a|#E5E5E5|#283433|#0c100f|#080b08|#898989|#0c100f|horizontal|center|4|4|2|0|raised|tiny|11|Noto Sans|NLIMC|Normal|Normal|Mabox Jaskier Dark
-#D9D9D9|#B6B6B6|#0F0F0F|#BDBBB9|#D9D9D9|#B4B4B4|#656565|#BFBCBB|vertical|left|2|2|1|0|raised|bold|11|Ubuntu Bold|NLIMC|Bold|Normal|Light Grey
-#CE5C00|#9b4600|#E5E5E5|#CE5C00|#D3D7CF|#B4B4B4|#656565|#BFBCBB|mirrorhorizontal|center|2|2|1|0|raised|dots|11|Noto Sans|NLIMC|Normal|Normal|Orange
-#F7941E|#004E8F|#E5E5E5|#F7941E|#4a2c09|#00172b|#656565|#4a2c09|mirrorhorizontal|center|4|4|1|0|raised|big-14|13|Ubuntu|NLIMC|Normal|Normal|Sky and Sea
-#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|flat|bold|11|Ubuntu|LIMC|Bold|Normal|BL Boron Light
-#765BAB|#5e478c|#FFFFFF|#242424|#373737|#1e1e1e|#9A9A9A|#373737|solid|center|2|2|4|1|flat|tiny|10|Cantarell|NDSLIMC|Normal|Normal|Lean

share/mabox-colorizer/help/css/w3.css

@@ -26,210 +26,210 @@ legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}t
 /* End extract */
 html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
 h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}
-.serif{font-family:serif}.sans-serif{font-family:sans-serif}.cursive{font-family:cursive}.monospace{font-family:monospace}
+.w3-serif{font-family:serif}.w3-sans-serif{font-family:sans-serif}.w3-cursive{font-family:cursive}.w3-monospace{font-family:monospace}
-h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.wide{letter-spacing:4px}
+h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
 hr{border:0;border-top:1px solid #eee;margin:20px 0}
-.image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
+.w3-image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
-.table,.table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.table-all{border:1px solid #ccc}
+.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.bordered tr,.table-all tr{border-bottom:1px solid #ddd}.striped tbody tr:nth-child(even){background-color:#f1f1f1}
+.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
-.table-all tr:nth-child(odd){background-color:#fff}.table-all tr:nth-child(even){background-color:#f1f1f1}
+.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
-.hoverable tbody tr:hover,.ul.hoverable li:hover{background-color:#ccc}.centered tr th,.centered tr td{text-align:center}
+.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
-.table td,.table th,.table-all td,.table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
+.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
-.table th:first-child,.table td:first-child,.table-all th:first-child,.table-all td:first-child{padding-left:16px}
+.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
-.btn,.button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
+.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
+.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
-.btn,.button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
+.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
-.disabled,.btn:disabled,.button:disabled{cursor:not-allowed;opacity:0.3}.disabled *,:disabled *{pointer-events:none}
+.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
-.btn.disabled:hover,.btn:disabled:hover{box-shadow:none}
+.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
-.badge,.tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.badge{border-radius:50%}
+.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
-.ul{list-style-type:none;padding:0;margin:0}.ul li{padding:8px 16px;border-bottom:1px solid #ddd}.ul li:last-child{border-bottom:none}
+.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
-.tooltip,.display-container{position:relative}.tooltip .text{display:none}.tooltip:hover .text{display:inline-block}
+.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
-.ripple:active{opacity:0.5}.ripple{transition:opacity 0s}
+.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
+.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
-.select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
+.w3-select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
-.dropdown-click,.dropdown-hover{position:relative;display:inline-block;cursor:pointer}
+.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
-.dropdown-hover:hover .dropdown-content{display:block}
+.w3-dropdown-hover:hover .w3-dropdown-content{display:block}
-.dropdown-hover:first-child,.dropdown-click:hover{background-color:#ccc;color:#000}
+.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
-.dropdown-hover:hover > .button:first-child,.dropdown-click:hover > .button:first-child{background-color:#ccc;color:#000}
+.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
-.dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
+.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
-.check,.radio{width:24px;height:24px;position:relative;top:6px}
+.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
-.sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
+.w3-sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
-.bar-block .dropdown-hover,.bar-block .dropdown-click{width:100%}
+.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
-.bar-block .dropdown-hover .dropdown-content,.bar-block .dropdown-click .dropdown-content{min-width:100%}
+.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
-.bar-block .dropdown-hover .button,.bar-block .dropdown-click .button{width:100%;text-align:left;padding:8px 16px}
+.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
-.main,#main{transition:margin-left .4s}
+.w3-main,#main{transition:margin-left .4s}
-.modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
+.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
-.modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
+.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
-.bar{width:100%;overflow:hidden}.center .bar{display:inline-block;width:auto}
+.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
-.bar .bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
+.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
-.bar .dropdown-hover,.bar .dropdown-click{position:static;float:left}
+.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
-.bar .button{white-space:normal}
+.w3-bar .w3-button{white-space:normal}
-.bar-block .bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
+.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
-.bar-block.center .bar-item{text-align:center}.block{display:block;width:100%}
+.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
-.responsive{display:block;overflow-x:auto}
+.w3-responsive{display:block;overflow-x:auto}
-.container:after,.container:before,.panel:after,.panel:before,.row:after,.row:before,.row-padding:after,.row-padding:before,
+.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
-.cell-row:before,.cell-row:after,.clear:after,.clear:before,.bar:before,.bar:after{content:"";display:table;clear:both}
+.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.col,.half,.third,.twothird,.threequarter,.quarter{float:left;width:100%}
+.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
-.col.s1{width:8.33333%}.col.s2{width:16.66666%}.col.s3{width:24.99999%}.col.s4{width:33.33333%}
+.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
-.col.s5{width:41.66666%}.col.s6{width:49.99999%}.col.s7{width:58.33333%}.col.s8{width:66.66666%}
+.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
-.col.s9{width:74.99999%}.col.s10{width:83.33333%}.col.s11{width:91.66666%}.col.s12{width:99.99999%}
+.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.col.m1{width:8.33333%}.col.m2{width:16.66666%}.col.m3,.quarter{width:24.99999%}.col.m4,.third{width:33.33333%}
+@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
-.col.m5{width:41.66666%}.col.m6,.half{width:49.99999%}.col.m7{width:58.33333%}.col.m8,.twothird{width:66.66666%}
+.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.col.m9,.threequarter{width:74.99999%}.col.m10{width:83.33333%}.col.m11{width:91.66666%}.col.m12{width:99.99999%}}
+.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
-@media (min-width:993px){.col.l1{width:8.33333%}.col.l2{width:16.66666%}.col.l3{width:24.99999%}.col.l4{width:33.33333%}
+@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
-.col.l5{width:41.66666%}.col.l6{width:49.99999%}.col.l7{width:58.33333%}.col.l8{width:66.66666%}
+.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
-.col.l9{width:74.99999%}.col.l10{width:83.33333%}.col.l11{width:91.66666%}.col.l12{width:99.99999%}}
+.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
-.rest{overflow:hidden}.stretch{margin-left:-16px;margin-right:-16px}
+.w3-rest{overflow:hidden}.w3-stretch{margin-left:-16px;margin-right:-16px}
-.content,.auto{margin-left:auto;margin-right:auto}.content{max-width:980px}.auto{max-width:1140px}
+.w3-content,.w3-auto{margin-left:auto;margin-right:auto}.w3-content{max-width:980px}.w3-auto{max-width:1140px}
-.cell-row{display:table;width:100%}.cell{display:table-cell}
+.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
-.cell-top{vertical-align:top}.cell-middle{vertical-align:middle}.cell-bottom{vertical-align:bottom}
+.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
-.hide{display:none!important}.show-block,.show{display:block!important}.show-inline-block{display:inline-block!important}
+.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
-@media (max-width:1205px){.auto{max-width:95%}}
+@media (max-width:1205px){.w3-auto{max-width:95%}}
-@media (max-width:600px){.modal-content{margin:0 10px;width:auto!important}.modal{padding-top:30px}
+@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
-.dropdown-hover.mobile .dropdown-content,.dropdown-click.mobile .dropdown-content{position:relative}	
+.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
-.hide-small{display:none!important}.mobile{display:block;width:100%!important}.bar-item.mobile,.dropdown-hover.mobile,.dropdown-click.mobile{text-align:center}
+.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
-.dropdown-hover.mobile,.dropdown-hover.mobile .btn,.dropdown-hover.mobile .button,.dropdown-click.mobile,.dropdown-click.mobile .btn,.dropdown-click.mobile .button{width:100%}}
+.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
-@media (max-width:768px){.modal-content{width:500px}.modal{padding-top:50px}}
+@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
-@media (min-width:993px){.modal-content{width:900px}.hide-large{display:none!important}.sidebar.collapse{display:block!important}}
+@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
-@media (max-width:992px) and (min-width:601px){.hide-medium{display:none!important}}
+@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
-@media (max-width:992px){.sidebar.collapse{display:none}.main{margin-left:0!important;margin-right:0!important}.auto{max-width:100%}}
+@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}.w3-auto{max-width:100%}}
-.top,.bottom{position:fixed;width:100%;z-index:1}.top{top:0}.bottom{bottom:0}
+.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
-.overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
+.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
-.display-topleft{position:absolute;left:0;top:0}.display-topright{position:absolute;right:0;top:0}
+.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
-.display-bottomleft{position:absolute;left:0;bottom:0}.display-bottomright{position:absolute;right:0;bottom:0}
+.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
-.display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
+.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
-.display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
+.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
-.display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
+.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
-.display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
+.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
+.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.display-container:hover .display-hover{display:block}.display-container:hover span.display-hover{display:inline-block}.display-hover{display:none}
+.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
-.display-position{position:absolute}
+.w3-display-position{position:absolute}
-.circle{border-radius:50%}
+.w3-circle{border-radius:50%}
-.round-small{border-radius:2px}.round,.round-medium{border-radius:4px}.round-large{border-radius:8px}.round-xlarge{border-radius:16px}.round-xxlarge{border-radius:32px}
+.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
-.row-padding,.row-padding>.half,.row-padding>.third,.row-padding>.twothird,.row-padding>.threequarter,.row-padding>.quarter,.row-padding>.col{padding:0 8px}
+.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.container,.panel{padding:0.01em 16px}.panel{margin-top:16px;margin-bottom:16px}
+.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
-.code,.codespan{font-family:Consolas,"courier new";font-size:16px}
+.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
-.code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
+.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
-.codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
+.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
-.card,.card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
+.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
-.card-4,.hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
+.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
-.spin{animation:spin 2s infinite linear}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
+.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
-.animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
+.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
-.animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
+.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
-.animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
+.w3-animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
-.animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
+.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
-.animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
+.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
-.animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
+.w3-animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
-.animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
+.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
-.animate-input{transition:width 0.4s ease-in-out}.animate-input:focus{width:100%!important}
+.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
-.opacity,.hover-opacity:hover{opacity:0.60}.opacity-off,.hover-opacity-off:hover{opacity:1}
+.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
-.opacity-max{opacity:0.25}.opacity-min{opacity:0.75}
+.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
-.greyscale-max,.grayscale-max,.hover-greyscale:hover,.hover-grayscale:hover{filter:grayscale(100%)}
+.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
-.greyscale,.grayscale{filter:grayscale(75%)}.greyscale-min,.grayscale-min{filter:grayscale(50%)}
+.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
-.sepia{filter:sepia(75%)}.sepia-max,.hover-sepia:hover{filter:sepia(100%)}.sepia-min{filter:sepia(50%)}
+.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
-.tiny{font-size:10px!important}.small{font-size:12px!important}.medium{font-size:15px!important}.large{font-size:18px!important}
+.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
-.xlarge{font-size:24px!important}.xxlarge{font-size:36px!important}.xxxlarge{font-size:48px!important}.jumbo{font-size:64px!important}
+.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
-.left-align{text-align:left!important}.right-align{text-align:right!important}.justify{text-align:justify!important}.center{text-align:center!important}
+.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
-.border-0{border:0!important}.border{border:1px solid #ccc!important}
+.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
-.border-top{border-top:1px solid #ccc!important}.border-bottom{border-bottom:1px solid #ccc!important}
+.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
-.border-left{border-left:1px solid #ccc!important}.border-right{border-right:1px solid #ccc!important}
+.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
-.topbar{border-top:6px solid #ccc!important}.bottombar{border-bottom:6px solid #ccc!important}
+.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
-.leftbar{border-left:6px solid #ccc!important}.rightbar{border-right:6px solid #ccc!important}
+.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
-.section,.code{margin-top:16px!important;margin-bottom:16px!important}
+.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
-.margin{margin:16px!important}.margin-top{margin-top:16px!important}.margin-bottom{margin-bottom:16px!important}
+.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
-.margin-left{margin-left:16px!important}.margin-right{margin-right:16px!important}
+.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
-.padding-small{padding:4px 8px!important}.padding{padding:8px 16px!important}.padding-large{padding:12px 24px!important}
+.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px!important}.w3-padding-large{padding:12px 24px!important}
-.padding-16{padding-top:16px!important;padding-bottom:16px!important}.padding-24{padding-top:24px!important;padding-bottom:24px!important}
+.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
-.padding-32{padding-top:32px!important;padding-bottom:32px!important}.padding-48{padding-top:48px!important;padding-bottom:48px!important}
+.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
-.padding-64{padding-top:64px!important;padding-bottom:64px!important}
+.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
-.padding-top-64{padding-top:64px!important}.padding-top-48{padding-top:48px!important}
+.w3-padding-top-64{padding-top:64px!important}.w3-padding-top-48{padding-top:48px!important}
-.padding-top-32{padding-top:32px!important}.padding-top-24{padding-top:24px!important}
+.w3-padding-top-32{padding-top:32px!important}.w3-padding-top-24{padding-top:24px!important}
-.left{float:left!important}.right{float:right!important}
+.w3-left{float:left!important}.w3-right{float:right!important}
-.button:hover{color:#000!important;background-color:#ccc!important}
+.w3-button:hover{color:#000!important;background-color:#ccc!important}
-.transparent,.hover-none:hover{background-color:transparent!important}
+.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
-.hover-none:hover{box-shadow:none!important}
+.w3-hover-none:hover{box-shadow:none!important}
 /* Colors */
-.amber,.hover-amber:hover{color:#000!important;background-color:#ffc107!important}
+.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
-.aqua,.hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
+.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
-.blue,.hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
+.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
-.light-blue,.hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
+.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
-.brown,.hover-brown:hover{color:#fff!important;background-color:#795548!important}
+.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
-.cyan,.hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
+.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
-.blue-grey,.hover-blue-grey:hover,.blue-gray,.hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
+.w3-blue-grey,.w3-hover-blue-grey:hover,.w3-blue-gray,.w3-hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
-.green,.hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
+.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
-.light-green,.hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
+.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
-.indigo,.hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
+.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
-.khaki,.hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
+.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
-.lime,.hover-lime:hover{color:#000!important;background-color:#cddc39!important}
+.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
-.orange,.hover-orange:hover{color:#000!important;background-color:#ff9800!important}
+.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
-.deep-orange,.hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
+.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
-.pink,.hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
+.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
-.purple,.hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
+.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
-.deep-purple,.hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
+.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
-.red,.hover-red:hover{color:#fff!important;background-color:#f44336!important}
+.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
-.sand,.hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
+.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
-.teal,.hover-teal:hover{color:#fff!important;background-color:#009688!important}
+.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
-.yellow,.hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
+.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
-.white,.hover-white:hover{color:#000!important;background-color:#fff!important}
+.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
-.black,.hover-black:hover{color:#fff!important;background-color:#000!important}
+.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
-.grey,.hover-grey:hover,.gray,.hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
+.w3-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
-.light-grey,.hover-light-grey:hover,.light-gray,.hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
+.w3-light-grey,.w3-hover-light-grey:hover,.w3-light-gray,.w3-hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
-.dark-grey,.hover-dark-grey:hover,.dark-gray,.hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
+.w3-dark-grey,.w3-hover-dark-grey:hover,.w3-dark-gray,.w3-hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
-.pale-red,.hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
+.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
-.pale-green,.hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
+.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
-.pale-yellow,.hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
+.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
-.pale-blue,.hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
+.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
-.text-amber,.hover-text-amber:hover{color:#ffc107!important}
+.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
-.text-aqua,.hover-text-aqua:hover{color:#00ffff!important}
+.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
-.text-blue,.hover-text-blue:hover{color:#2196F3!important}
+.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
-.text-light-blue,.hover-text-light-blue:hover{color:#87CEEB!important}
+.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
-.text-brown,.hover-text-brown:hover{color:#795548!important}
+.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
-.text-cyan,.hover-text-cyan:hover{color:#00bcd4!important}
+.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
-.text-blue-grey,.hover-text-blue-grey:hover,.text-blue-gray,.hover-text-blue-gray:hover{color:#607d8b!important}
+.w3-text-blue-grey,.w3-hover-text-blue-grey:hover,.w3-text-blue-gray,.w3-hover-text-blue-gray:hover{color:#607d8b!important}
-.text-green,.hover-text-green:hover{color:#4CAF50!important}
+.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
-.text-light-green,.hover-text-light-green:hover{color:#8bc34a!important}
+.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
-.text-indigo,.hover-text-indigo:hover{color:#3f51b5!important}
+.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
-.text-khaki,.hover-text-khaki:hover{color:#b4aa50!important}
+.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
-.text-lime,.hover-text-lime:hover{color:#cddc39!important}
+.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
-.text-orange,.hover-text-orange:hover{color:#ff9800!important}
+.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
-.text-deep-orange,.hover-text-deep-orange:hover{color:#ff5722!important}
+.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
-.text-pink,.hover-text-pink:hover{color:#e91e63!important}
+.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
-.text-purple,.hover-text-purple:hover{color:#9c27b0!important}
+.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
-.text-deep-purple,.hover-text-deep-purple:hover{color:#673ab7!important}
+.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
-.text-red,.hover-text-red:hover{color:#f44336!important}
+.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
-.text-sand,.hover-text-sand:hover{color:#fdf5e6!important}
+.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
-.text-teal,.hover-text-teal:hover{color:#009688!important}
+.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
-.text-yellow,.hover-text-yellow:hover{color:#d2be0e!important}
+.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
-.text-white,.hover-text-white:hover{color:#fff!important}
+.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
-.text-black,.hover-text-black:hover{color:#000!important}
+.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
-.text-grey,.hover-text-grey:hover,.text-gray,.hover-text-gray:hover{color:#757575!important}
+.w3-text-grey,.w3-hover-text-grey:hover,.w3-text-gray,.w3-hover-text-gray:hover{color:#757575!important}
-.text-light-grey,.hover-text-light-grey:hover,.text-light-gray,.hover-text-light-gray:hover{color:#f1f1f1!important}
+.w3-text-light-grey,.w3-hover-text-light-grey:hover,.w3-text-light-gray,.w3-hover-text-light-gray:hover{color:#f1f1f1!important}
-.text-dark-grey,.hover-text-dark-grey:hover,.text-dark-gray,.hover-text-dark-gray:hover{color:#3a3a3a!important}
+.w3-text-dark-grey,.w3-hover-text-dark-grey:hover,.w3-text-dark-gray,.w3-hover-text-dark-gray:hover{color:#3a3a3a!important}
-.border-amber,.hover-border-amber:hover{border-color:#ffc107!important}
+.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
-.border-aqua,.hover-border-aqua:hover{border-color:#00ffff!important}
+.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
-.border-blue,.hover-border-blue:hover{border-color:#2196F3!important}
+.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
-.border-light-blue,.hover-border-light-blue:hover{border-color:#87CEEB!important}
+.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
-.border-brown,.hover-border-brown:hover{border-color:#795548!important}
+.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
-.border-cyan,.hover-border-cyan:hover{border-color:#00bcd4!important}
+.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
-.border-blue-grey,.hover-border-blue-grey:hover,.border-blue-gray,.hover-border-blue-gray:hover{border-color:#607d8b!important}
+.w3-border-blue-grey,.w3-hover-border-blue-grey:hover,.w3-border-blue-gray,.w3-hover-border-blue-gray:hover{border-color:#607d8b!important}
-.border-green,.hover-border-green:hover{border-color:#4CAF50!important}
+.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
-.border-light-green,.hover-border-light-green:hover{border-color:#8bc34a!important}
+.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
-.border-indigo,.hover-border-indigo:hover{border-color:#3f51b5!important}
+.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
-.border-khaki,.hover-border-khaki:hover{border-color:#f0e68c!important}
+.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
-.border-lime,.hover-border-lime:hover{border-color:#cddc39!important}
+.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
-.border-orange,.hover-border-orange:hover{border-color:#ff9800!important}
+.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
-.border-deep-orange,.hover-border-deep-orange:hover{border-color:#ff5722!important}
+.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
-.border-pink,.hover-border-pink:hover{border-color:#e91e63!important}
+.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
-.border-purple,.hover-border-purple:hover{border-color:#9c27b0!important}
+.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
-.border-deep-purple,.hover-border-deep-purple:hover{border-color:#673ab7!important}
+.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
-.border-red,.hover-border-red:hover{border-color:#f44336!important}
+.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
-.border-sand,.hover-border-sand:hover{border-color:#fdf5e6!important}
+.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
-.border-teal,.hover-border-teal:hover{border-color:#009688!important}
+.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
-.border-yellow,.hover-border-yellow:hover{border-color:#ffeb3b!important}
+.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
-.border-white,.hover-border-white:hover{border-color:#fff!important}
+.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
-.border-black,.hover-border-black:hover{border-color:#000!important}
+.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
-.border-grey,.hover-border-grey:hover,.border-gray,.hover-border-gray:hover{border-color:#9e9e9e!important}
+.w3-border-grey,.w3-hover-border-grey:hover,.w3-border-gray,.w3-hover-border-gray:hover{border-color:#9e9e9e!important}
-.border-light-grey,.hover-border-light-grey:hover,.border-light-gray,.hover-border-light-gray:hover{border-color:#f1f1f1!important}
+.w3-border-light-grey,.w3-hover-border-light-grey:hover,.w3-border-light-gray,.w3-hover-border-light-gray:hover{border-color:#f1f1f1!important}
-.border-dark-grey,.hover-border-dark-grey:hover,.border-dark-gray,.hover-border-dark-gray:hover{border-color:#616161!important}
+.w3-border-dark-grey,.w3-hover-border-dark-grey:hover,.w3-border-dark-gray,.w3-hover-border-dark-gray:hover{border-color:#616161!important}
-.border-pale-red,.hover-border-pale-red:hover{border-color:#ffe7e7!important}.border-pale-green,.hover-border-pale-green:hover{border-color:#e7ffe7!important}
+.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
-.border-pale-yellow,.hover-border-pale-yellow:hover{border-color:#ffffcc!important}.border-pale-blue,.hover-border-pale-blue:hover{border-color:#e7ffff!important}
+.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}

share/mabox-colorizer/themes/MBcolors/openbox-3/themerc

@@ -5,10 +5,10 @@ window.client.padding.width: 0
 window.client.padding.height: 0
 window.handle.width: 4
 
-window.active.label.text.font: shadow=n:shadowtint=70:shadowoffset=1
+window.active.label.text.font: shadow=y:shadowtint=70:shadowoffset=1
-window.inactive.label.text.font: shadow=n:shadowtint=20:shadowoffset=1
+window.inactive.label.text.font: shadow=y:shadowtint=20:shadowoffset=1
 
-*.active.border.color: #111111
+*.active.border.color: #292929
 *.inactive.border.color: #292929
 
 window.active.grip.bg: parentrelative
@@ -19,18 +19,9 @@ window.*.button.*.bg: parentrelative
 window.*.handle.bg:  flat vertical gradient 
 window.*.text.justify: center
 
-window.active.title.bg.color.splitTo: #add2ca
+window.active.title.bg.color: #579c8e
-window.active.title.bg.color: #579C8E
+window.active.title.bg.colorTo: #41756a
-window.active.title.bg.colorTo: #3d6e64
-window.active.title.bg.colorTo.splitTo: #539588
 window.active.label.text.color: #ffffff
-
-window.inactive.title.bg.color.splitTo: #7e7e7e
-window.inactive.title.bg.color: #383838
-window.inactive.title.bg.colorTo: #1f1f1f
-window.inactive.title.bg.colorTo.splitTo: #3e3e3e
-window.inactive.label.text.color: #898989
-
 window.active.button.*.unpressed.image.color: #ffffff
 window.active.button.*.disabled.image.color: #8fbdb3
 window.active.button.*.hover.image.color: #abcdc6
@@ -40,6 +31,9 @@ window.active.handle.bg.colorTo: #2a2a2a
 window.active.grip.bg.color: #383838
 window.active.grip.bg.colorTo: #2a2a2a
 
+window.inactive.title.bg.color: #383838
+window.inactive.title.bg.colorTo: #2a2a2a
+window.inactive.label.text.color: #898989
 window.inactive.button.*.unpressed.image.color: #898989
 window.inactive.button.*.disabled.image.color: #6e6e6e
 window.inactive.button.*.hover.image.color: #dadada