bin/colorizer

@@ -214,7 +214,7 @@ out+=("<big></big>   $FONTS,colorizer-fonts -s")
 out+=("^sep()")
 out+=("$OBTHEME,colorizer-ob -s")
 
-#out+=("TINT2,colorizer-tint2 -s")
+out+=("TINT2,colorizer-tint2 -s")
 out+=("$MENUPANELS,colorizer-menus -s")
 out+=("$COLORIZER_CONKY,colorizer-conky -s")
 out+=("^sep()")

bin/colorizer-conky

@@ -124,7 +124,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"
@@ -182,7 +181,6 @@ case "$LANG" in
     RESETCOLORS="Restore default colors"
     AREYOUSURE="Are you sure?"
     _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -479,7 +477,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)

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

@@ -147,7 +147,6 @@ 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"
@@ -232,7 +231,6 @@ case "$LANG" in
     FILE="file"
     SET_RANDOM="Set random menu theme"
     _COLORIZER_ROOT="<b>Colorizer</b> rootmenu"
-    _LEFTSIDEPANEL="Left Sidepanel"
     ;;
 esac
 
@@ -575,7 +573,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)

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
@@ -140,7 +140,6 @@ 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"
@@ -213,7 +212,7 @@ case "$LANG" in
     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 +225,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
 
@@ -389,7 +387,7 @@ out+=("<big><span fgcolor='${ABGTO}'></span> <span fgcolor='${ABG}'></span
 	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+=("<big></big>   $OPEN_THEMEFILE,xdg-open $USERSCHEMES")
 	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
@@ -430,8 +428,8 @@ out+=("<tt><span bgcolor='#16a084'> </span><span bgcolor='#43a480'> </span><span
 out+=("<big></big>   $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+=("$HANDLEWIDTH [ <b>$HANDLE</b> ],^checkout(handlewidth)")
 #out+=("$ACTIVEHANDLE? [ <b>$AHANDLE</b> ],^checkout(handle)")
@@ -473,7 +471,6 @@ out2+=("^sep($TEXTALIGN)")
 
 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")
@@ -669,7 +666,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

bin/conkyctl

@@ -817,10 +817,9 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
     fi
 
     
-if [[ "$FONT" != "" ]];then
+    
     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 +853,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 +868,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,12 +999,10 @@ 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)
@@ -1022,9 +1018,7 @@ 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"
@@ -1035,7 +1029,7 @@ cmdmenu () {
     
    # 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 +1046,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
@@ -1382,7 +1376,7 @@ case "$1" in
     toggleone) toggleone "$2";;
     restartone) restartone "$2";;
     contextmenu) contextmenu;;
-    cmdmenu) cmdmenu "$2";;
+    cmdmenu) cmdmenu;;
     cmdmenu_edit) cmdmenu_edit "$2";;
     makemoveableall) makemoveableall;;
     saveposall) saveposall;;

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/mbclr

@@ -84,12 +84,6 @@ grays=("#000000" "#0d0d0d" "#1b1b1b" "#282828" "#363636" "#434343" "#515151" "#5
 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
@@ -150,6 +144,9 @@ 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+=("<big></big>   $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}")
+out+=("<big></big>   $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}")
+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)")

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 () {
@@ -81,13 +80,9 @@ borderWidth () {
 }
 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
@@ -205,18 +200,6 @@ activegradient () {
     #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}
     
@@ -273,17 +256,6 @@ activegradient () {
 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}
     
@@ -374,7 +346,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 +360,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}
@@ -436,30 +397,11 @@ clrnormalbg () {
     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}
 }
 
 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 AHBG <<< "$(grep .active.handle.bg.color: ${THEMERC} | cut -d':' -f2)"
@@ -471,11 +413,6 @@ clractivebgto () {
 
 clrnormalbgto () {
     sd "^window.inactive.title.bg.colorTo:.*$" "window.inactive.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}
-    
     sd "\.inactive.handle.bg.colorTo:.*$" ".inactive.handle.bg.colorTo: ${1}" ${THEMERC}
     sd "\.inactive.grip.bg.colorTo:.*$" ".inactive.grip.bg.colorTo: ${1}" ${THEMERC}
 }
@@ -866,8 +803,8 @@ fi
 
 #colorize OB
 if [ "$2" == "dark" ];then
-	clractivebg "${pal[5]}"
+	clractivebg "${pal[4]}"
-	#clractivebgto "${pal[6]}"
+	clractivebgto "${pal[6]}"
 	activeborderColor "${pal[2]}"
 	activetextcolor "${pal[1]}"
 	clrnormalbg "${pal[9]}"
@@ -875,8 +812,8 @@ if [ "$2" == "dark" ];then
 	inactiveborderColor "${pal[8]}"
 	inactivetextcolor "${pal[4]}"
 else #light
-	clractivebg "${pal[4]}"
+	clractivebg "${pal[2]}"
-	#clractivebgto "${pal[4]}"
+	clractivebgto "${pal[4]}"
 	activeborderColor "${pal[0]}"
 	activetextcolor "${pal[9]}"
 	clrnormalbg "${pal[9]}"

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"

share/mabox-colorizer/colorschemes/ob.csv

@@ -5,5 +5,3 @@
 #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/en.html

@@ -95,8 +95,6 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
   flex-direction: column;**/
   justify-content: center;
 }
-.grid div.i{background-color:#191919;}
-.grid div.i a{text-decoration:none;display:block;border-radius: 4px;margin: -1em;padding:1em;}
 .gi2 {grid-column: span 2;}
 .gi3 {grid-column: span 3;}
 .gi4 {grid-column: span 4;}
@@ -124,18 +122,18 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
   <nav style="padding-top:8px;">
   <button class="button small tablink bg" onclick="openTab(event, 'Colorizer')">Start</button>
   <button class="button small tablink" onclick="openTab(event, 'Openbox')">Openbox Theme</button>
-  <button class="button small tablink" onclick="openTab(event, 'Jgmenu')">Menu/Sidepanels</button>
   <button class="button small tablink" onclick="openTab(event, 'Conky')">Conky</button>
-  <button class="button small tablink" onclick="openTab(event, 'fonts')">Fonts, Icons, GTK theme</i></button>
+  <button class="button small tablink" onclick="openTab(event, 'Jgmenu')">Menu/Sidepanels</button>
   <button class="button small tablink" onclick="openTab(event, 'Tint2')">Tint2 Panel</button>
   <button class="button small tablink" onclick="openTab(event, 'Wall2theme')">Wallpaper  themes</button>
   <button class="button small tablink" onclick="openTab(event, 'pyradiocava')"><i>Cava, PyRadio</i></button>
+  <button class="button small tablink" onclick="openTab(event, 'fonts')">Fonts</i></button>
   <button class="button small tablink" onclick="openTab(event, 'Terminal')">Terminal theme</button>
   <button class="button small tablink" onclick="openTab(event, 'Save')">Save and Restore</button>
   </nav>
   <div class="fixeddown">
   <div class="center small" style="margin: 0 4px 4px 2px;">
-	  <p><a class="tag small indigo" href="run://jgwallpaperchanger -s"> Wallpaper...</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
+	  <p><a class="tag small indigo" href="run://pcmanwp"> Wallpaper...</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
 	  <p><em>dynamic menus:</em></p>
 	  <p>
   <a class="tag small purple" href="run://colorizer -s"> Colorizer</a><br />
@@ -675,142 +673,16 @@ If you add more commands, a menu will be shown.</p>
      <a class="tag small amber" href="config://.config/mabox/wallp_dirs.conf"> Configure directories</a></p>
 </section>
 <section id="fonts" class="container tab" style="display:none;min-height:100vh">
-    <h3>Fonts</h3>
+    <div class="fixed">
+        <div class="bar">
+        <a class="button bar-item small grey hover-amber right" href="run://colorizer-fonts -s">  Fonts - dynamic menu</a>
+        </div>
+    </div>
+    <h2>Fonts</h2>
     <p> To set fonts for Openbox window decorations, GTK, Conky and Menu/Panels...<br />
     use dynamic menu <a class="button amber" href="run://colorizer-fonts -s">  Fonts</a>
     </p>
-    <h3>GTK widget theme and Icons</h3>
-    <p><a class="button amber" href="run://lxappearance"> Choose GTK theme and Icons</a></p>
-    <h3></h3>
-    <div class="grid">
-    <p class="gi3"><strong>Papirus Folder Icons</strong><br />Click below to generate and apply colorized folder icons for Papirus.</p>
     
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor adwaita">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-adwaita.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-adwaita-music.svg" /><br />
-		Adwaita
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor black">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-black.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-black-music.svg" /><br />
-		Black
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor blue">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-blue.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-blue-music.svg" /><br />
-		Blue
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor bluegrey">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-bluegrey.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-bluegrey-music.svg" /><br />
-		Bluegrey
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor breeze">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-breeze.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-breeze-music.svg" /><br />
-		Breeze
-    </a></div>
-        <div class="i"><a class="hover-white" href="run://gtkctl papcolor brown">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-brown.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-brown-music.svg" /><br />
-		Brown
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor carmine">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-carmine.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-carmine-music.svg" /><br />
-		Carmine
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor cyan">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-cyan.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-cyan-music.svg" /><br />
-		Cyan
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor darkcyan">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-darkcyan.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-darkcyan-music.svg" /><br />
-		DarkCyan
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor deeporange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-deeporange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-deeporange-music.svg" /><br />
-		DeepOrange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor green">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-green.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-green-music.svg" /><br />
-		Green
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor grey">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-grey.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-grey-music.svg" /><br />
-		Grey
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor indigo">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-indigo.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-indigo-music.svg" /><br />
-		Indigo
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor magenta">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-magenta.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-magenta-music.svg" /><br />
-		Magenta
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor nordic">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-nordic.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-nordic-music.svg" /><br />
-		Nordic
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor orange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-orange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-orange-music.svg" /><br />
-		Orange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor palebrown">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-palebrown.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-palebrown-music.svg" /><br />
-		PaleBrown
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor paleorange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-paleorange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-paleorange-music.svg" /><br />
-		PaleOrange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor pink">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-pink.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-pink-music.svg" /><br />
-		Pink
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor red">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-red.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-red-music.svg" /><br />
-		Red
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor teal">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-teal.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-teal-music.svg" /><br />
-		Teal
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor violet">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-violet.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-violet-music.svg" /><br />
-		Violet
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor white">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-white.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-white-music.svg" /><br />
-		White
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor yaru">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yaru.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yaru-music.svg" /><br />
-		Yaru
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor yellow">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yellow.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yellow-music.svg" /><br />
-		Yellow
-    </a></div>
-    </div>
     </section>
 <section id="pyradiocava" class="container tab" style="display:none;min-height:100vh;">
       <div class="fixed">

share/mabox-colorizer/help/pl.html

@@ -95,9 +95,6 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
   flex-direction: column;**/
   justify-content: center;
 }
-.grid div.i{background-color:#191919;}
-.grid div.i a{text-decoration:none;display:block;border-radius: 4px;margin: -1em;padding:1em;}
-
 .gi2 {grid-column: span 2;}
 .gi3 {grid-column: span 3;}
 .gi4 {grid-column: span 4;}
@@ -125,18 +122,18 @@ h5 {font-size: 2vw !important;border-bottom: 1px solid;padding-left: 1em;}
   <nav style="padding-top:8px;">
   <button class="button small tablink bg" onclick="openTab(event, 'Colorizer')">Colorizer</button>
   <button class="button small tablink" onclick="openTab(event, 'Openbox')">Motyw Openbox</button>
-  <button class="button small tablink" onclick="openTab(event, 'Jgmenu')">Menu/Panele Boczne</button>
   <button class="button small tablink" onclick="openTab(event, 'Conky')">Conky</button>
-  <button class="button small tablink" onclick="openTab(event, 'fonts')">Czcionki, ikony, GTK</i></button>
+  <button class="button small tablink" onclick="openTab(event, 'Jgmenu')">Menu/Panele Boczne</button>
   <button class="button small tablink" onclick="openTab(event, 'Tint2')">Panel Tint2</button>
   <button class="button small tablink" onclick="openTab(event, 'Wall2theme')">Kolory z tapety</button>
   <button class="button small tablink" onclick="openTab(event, 'pyradiocava')"><i>Cava, PyRadio</i></button>
+  <button class="button small tablink" onclick="openTab(event, 'fonts')">Czcionki</i></button>
   <button class="button small tablink" onclick="openTab(event, 'Terminal')">Kolory Terminala</button>
   <button class="button small tablink" onclick="openTab(event, 'Save')">Zapisywanie</button>
   </nav>
 <div class="fixeddown">
   <div class="center small" style="margin: 0 4px 4px 2px;">
-	  <p><a class="tag small indigo" href="run://jgwallpaperchanger -s"> Wybierz tapetę</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
+	  <p><a class="tag small indigo" href="run://pcmanwp"> Wybierz tapetę</a> <a class="tag small indigo" href="run://mbwallpaper -o"></a></p>
 	  <p><em>dynamiczne menu</em></p>
 	  <p>
   <a class="tag small purple" href="run://colorizer -s"> Colorizer</a><br />
@@ -818,139 +815,13 @@ Jeśli potrzebujesz pełen zestaw opcji, precyzyjnego dostrajania kolorów i prz
 
 </section>
 <section id="fonts" class="container tab" style="display:none;min-height:100vh">
-    <h3>Czcionki</h3>
+    <div class="fixed">
-    <p>Użyj dynamicznego menu <a class="tag small amber" href="run://colorizer-fonts -s">  Czcionki</a> aby ustawić czcionki używane przez aplikacje GTK, Conky oraz Menu/Panele boczne</p>
+        <div class="bar">
-    <h3>Motyw GTK oraz Ikon</h3>
+        <a class="button bar-item small grey hover-amber right" href="run://colorizer-fonts -s">  Czcionki - dynamiczne menu</a>
-    <p><a class="button amber" href="run://lxappearance"> Wybierz motyw GTK oraz Ikony</a></p>
-    <div class="grid">
-    <p class="gi3"><strong>Papirus Folder Icons</strong><br />Kliknij poniżej, aby zastosować kolory folderów Papirus.</p>
-    
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor adwaita">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-adwaita.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-adwaita-music.svg" /><br />
-		Adwaita
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor black">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-black.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-black-music.svg" /><br />
-		Black
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor blue">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-blue.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-blue-music.svg" /><br />
-		Blue
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor bluegrey">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-bluegrey.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-bluegrey-music.svg" /><br />
-		Bluegrey
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor breeze">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-breeze.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-breeze-music.svg" /><br />
-		Breeze
-    </a></div>
-        <div class="i"><a class="hover-white" href="run://gtkctl papcolor brown">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-brown.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-brown-music.svg" /><br />
-		Brown
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor carmine">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-carmine.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-carmine-music.svg" /><br />
-		Carmine
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor cyan">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-cyan.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-cyan-music.svg" /><br />
-		Cyan
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor darkcyan">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-darkcyan.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-darkcyan-music.svg" /><br />
-		DarkCyan
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor deeporange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-deeporange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-deeporange-music.svg" /><br />
-		DeepOrange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor green">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-green.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-green-music.svg" /><br />
-		Green
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor grey">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-grey.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-grey-music.svg" /><br />
-		Grey
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor indigo">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-indigo.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-indigo-music.svg" /><br />
-		Indigo
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor magenta">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-magenta.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-magenta-music.svg" /><br />
-		Magenta
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor nordic">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-nordic.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-nordic-music.svg" /><br />
-		Nordic
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor orange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-orange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-orange-music.svg" /><br />
-		Orange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor palebrown">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-palebrown.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-palebrown-music.svg" /><br />
-		PaleBrown
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor paleorange">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-paleorange.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-paleorange-music.svg" /><br />
-		PaleOrange
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor pink">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-pink.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-pink-music.svg" /><br />
-		Pink
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor red">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-red.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-red-music.svg" /><br />
-		Red
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor teal">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-teal.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-teal-music.svg" /><br />
-		Teal
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor violet">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-violet.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-violet-music.svg" /><br />
-		Violet
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor white">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-white.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-white-music.svg" /><br />
-		White
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor yaru">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yaru.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yaru-music.svg" /><br />
-		Yaru
-    </a></div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor yellow">
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yellow.svg" />
-		<img src="/usr/share/icons/Papirus/32x32/places/folder-yellow-music.svg" /><br />
-		Yellow
-    </a></div>
         </div>
+    </div>
+    <h2>Czcionki</h2>
+    <p>Użyj dynamicznego menu <a class="tag small amber" href="run://colorizer-fonts -s">  Czcionki</a> aby ustawić czcionki używane przez aplikacje GTK, Conky oraz Menu/Panele boczne</p>
     
     </section>
 <section id="Terminal" class="container tab" style="display:none;min-height:100vh">

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: #EEEEEE
 *.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