pcmanwp

bin/colorizer

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 #    colorizer - set of tools for Mabox (auto)theming
-#    Copyright (C) 2022-2023 Daniel Napora    <napcok@gmail.com>
+#    Copyright (C) 2022-2024 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
@@ -16,6 +16,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+. $HOME/.config/mabox/mabox.conf
+
 CNF_DIR="$HOME/.config/colorizer"
 mkdir -p "$CNF_DIR"
 CNF_FILE="$CNF_DIR/colorizer.conf"
@@ -47,6 +49,7 @@ case "$LANG" in
     CURRENTCONF="Obecna konfiguracja"
     MODULES="Moduły"
     FONTS="Konfiguruj <b>Czcionki</b>"
+    _PICOM="Ustawienia <b>Kompozytora (Picom)</b>"
     OBTHEME="Motyw <b>Openbox</b>"
     MENUPANELS="<b>Menu</b> i Panele boczne"
     COLORIZER_CONKY="<b>Conky</b> Manager i Colorizer"
@@ -101,6 +104,8 @@ case "$LANG" in
     RES_MENU="Menu i Paneli"
     RES_ALL="Wszystko <i>(OB, menu, conky)</i>"
     COLORIZE="Szybko Pokoloruj lub Resetuj..."
+    _LEFTSIDEPANEL="Lewy panel boczny"
+    _WALL_DESK_MENU="Tapety oraz <b>stylizacja</b> pulpitu"
     ;;
     *)
     REGENERATE="(Re)Generate from wallpaper colors..."
@@ -110,6 +115,7 @@ case "$LANG" in
     CURRENTCONF="Current configuration"
     MODULES="Modules"
     FONTS="Configure <b>Fonts</b>"
+    _PICOM="<b>Compositor</b> settings <b>(Picom)</b>"
     OBTHEME="<b>Openbox</b> Theme"
     MENUPANELS="<b>Menus/SidePanels</b>"
     COLORIZER_CONKY="<b>Conky</b> Manager &amp; Colorizer"
@@ -164,6 +170,8 @@ case "$LANG" in
     RES_MENU="Menus / Panels"
     RES_ALL="All <i>(OB, menus, conky)</i>"
     COLORIZE="Quickly Colorize or Reset..."
+    _LEFTSIDEPANEL="Left Sidepanel"
+    _WALL_DESK_MENU="Wallpaper &amp; Desktop <b>styling</b> menu"
     ;;
 esac
 
@@ -211,6 +219,7 @@ out+=("^sep(Mabox Colorizer)")
 out+=("  $COLORIZE,^pipe(randomizer c)")
 out+=("^sep($MODULES)")
 out+=("<big></big>   $FONTS,colorizer-fonts -s")
+out+=("$_PICOM,jgpicom-pipe -s")
 out+=("^sep()")
 out+=("$OBTHEME,colorizer-ob -s")
 
@@ -239,6 +248,8 @@ out+=("$CAVA,colorizer-cava -s")
 ##out+=("  $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr")
 
 
+
+out+=("^sep($WALLPAPER)")
 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")
@@ -247,7 +258,7 @@ out+=("  $SYSWALLPAPER (<small>${syswallp}</small>),nitrogen --random /usr/sh
     out+=("  $USERWALLPAPER (<small>${userwallp}</small>),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s")
     fi
 out+=("^sep()")
-	out+=("$WALLPAPERS,^checkout(wallpapersettings)")
+out+=("   $_WALL_DESK_MENU,jgwallpaperchanger -s")
 
 if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then
     [[ "$gradient_obtheme" == "yes" ]] && OBGRAD="OB" || OBGRAD=""
@@ -264,6 +275,9 @@ out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Coloriz
 else
 out+=("  $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'")
 fi
+out+=("^sep()")
+out+=(" ${arrow_string_left} ${arrow_string_left}    $_LEFTSIDEPANEL,mb-jgtools places")
+
 
 ### RESET ACTIONS (replaced by Randomizer)
 #out+=("^sep($RESET_COLORS)")
@@ -287,28 +301,6 @@ fi
 out2+=("^tag(settings)")
 
 
-#out2+=("$WALLPAPERS,^checkout(wallpapersettings)")
-out3+=("^tag(wallpapersettings)")
-out3+=("^sep($SYSWALLPAPER ($syswallp))")
-out3+=("^sep(<i>/usr/share/backgrounds</i>)")
-out3+=("  $OPENDIR,xdg-open /usr/share/backgrounds")
-out3+=("  $OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds")
-out3+=("  $SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s")
-out3+=("^sep($USERWALLPAPER  ($userwallp))")
-if [[ -d "${user_wallpapers_dir}" ]]; then
-# dir exist
-out3+=("^sep(<i>${user_wallpapers_dir}</i>)")
-out3+=("  $OPENDIR ,xdg-open ${user_wallpapers_dir}")
-out3+=("  $OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}")
-out3+=("  $SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s")
-out3+=("^sep()")
-out3+=("  $CHANGE ($EDITCONF),xdg-open $CNF_FILE")
-else
-# dir not exist
-out3+=("^sep(<i>${user_wallpapers_dir} - $USERDIR_NOT_EXIST</i>")
-out3+=("  $CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s")
-out3+=("  $CHANGE ($EDITCONF),xdg-open $CNF_FILE")
-fi
 out2+=("^sep($GRADIENTS_ACT)")
 [[ "$gradient_obtheme" == "yes" ]] && out2+=("<big></big>  $GRAD_OB,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") || out2+=("<big></big>  $GRAD_OB,mb-setvar gradient_obtheme=yes $CNF_FILE;colorizer -s")
 #out2+=("$GRAD_OB [ <b>${gradient_obtheme}</b> ],^checkout(grad_ob)")

bin/colorizer-conky

@@ -117,7 +117,7 @@ case "$LANG" in
     RUNNING_CONKIES="Uruchomione Conky"
     STOP_ALL="Zatrzymaj wszystkie"
     MORECONKIES="Więcej Conky..."
-    CLICKTOSTART="Kliknij aby uruchomić"
+    CLICKTOSTART="<b>Uruchom</b> więcej Conky..."
     STARTALL="Uruchom wszystkie"
     RESET="Resetuj"
     RESETALL="Resetuj wszystkie"
@@ -175,7 +175,7 @@ case "$LANG" in
     RUNNING_CONKIES="Running Conkys"
     STOP_ALL="Stop All"
     MORECONKIES="More Conkies Available"
-    CLICKTOSTART="...click to start"
+    CLICKTOSTART="<b>Start</b> more Conkies..."
     STARTALL="Start all"
     RESET="Reset"
     RESETALL="Reset all to defaults"
@@ -290,6 +290,8 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then
         else # too many conkies not started -> show them in submenu
            out+=("$CLICKTOSTART (${#notstarted[@]}),^checkout(nstarted)")
            out2+=("^tag(nstarted)")
+           out2+=("^sep($CLICKTOSTART)")
+           
             for c in ${notstarted[@]};do
                 filename=${c##*/}
                 name=${filename%%_mb*}

bin/colorizer-fonts

@@ -158,7 +158,7 @@ out+=("<big>󰑓</big>   $_RESET,^checkout(reset)")
 	out2+=("^sep($_RESET)")
 	out2+=("$_ALL,fontctl resetall;$me")
 	out2+=("^sep()")
-	out2+=("$_TITLEBAR_FONT,fontctl resetob;$me")
+	out2+=("$_TITLEBAR_FONT ($_OPENBOX_WM),fontctl resetob;$me")
 	out2+=("$_MENUS,fontctl resetmenus;$me")
 	out2+=("$_CONKY,fontctl resetconky;$me")
 	out2+=("$_GTK,fontctl resetgtk;$me")
@@ -375,7 +375,7 @@ if [[ "$1" == "-s" ]]; then
     MENU_PADDING_TOP=$((jgtools_padding + 150))
     
     #WALLPAPER
-    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2)
+    read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg |  tail -1 | cut -d'=' -f2)
     THUMBDIR="$HOME/.cache/colorizer/thumbs"
     mkdir -p ${THUMBDIR}
     NAME=${WALLPATH////_}

bin/colorizer-menus

@@ -19,7 +19,7 @@
 
 
 SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/menus.csv"
-USERSCHEMES="$HOME/.config/colorizer/menus/userschemes.csv"
+USERSCHEMES="$HOME/.config/colorizer/menus/userschemes2.csv"
 
 
 ### Wallpaper colors
@@ -251,6 +251,7 @@ getvalues () {
     read TFG TFGA<<< "$(grep 'color_title_fg' ${THEMERC} | cut -d'=' -f2)"
     read TBORDER TBORDERA<<< "$(grep 'color_title_border' ${THEMERC} | cut -d'=' -f2)"
     read NORMBG NORMBGA<<< "$(grep color_norm_bg ${THEMERC} | cut -d'=' -f2)"
+    [[ "$NORMBG" == "" ]] && NORMBG="${MBG}" NORMBGA=0
     read NFG NFGA<<< "$(grep color_norm_fg ${THEMERC} | cut -d'=' -f2)"
     read SBG SBGA<<< "$(grep 'color_sel_bg' ${THEMERC} | cut -d'=' -f2)"
     read SFG SFGA<<< "$(grep 'color_sel_fg' ${THEMERC} | cut -d'=' -f2)"
@@ -261,11 +262,12 @@ getvalues () {
 getvalues
 
 # Current colors
-currcolors="${MBG}|${MBGT}|${MBORDER}|${TBG}|${TFG}|${TBORDER}|${NORMBG}|${NFG}|${SBG}|${SFG}|${SBORDER}|${SEPFG}|${GRADIENT}|"
+currcolors="${MBG}|${MBGA}|${MBGT}|${MBGTA}|${MBORDER}|${MBORDERA}|${TBG}|${TBGA}|${TFG}|${TFGA}|${TBORDER}|${TBORDERA}|${NORMBG}|${NORMBGA}|${NFG}|${NFGA}|${SBG}|${SBGA}|${SFG}|${SFGA}|${SBORDER}|${SBORDERA}|${SEPFG}|${SEPFGA}|${jgtools_border}|${jgtools_radius}|${jgtools_padding}|${submenu_spacing}|${IBORDER}|${IRADIUS}|${arrow_string}|${arrow_string_left}|${SEPHALIGN}|${GRADIENT}|"
 #echo "${currcolors}" > ~/.config/mabox/.menu_colors
+###notify-send.sh "Currcolors" "${currcolors}"
 if [ ! -f "$USERSCHEMES" ]; then
     mkdir -p "$HOME/.config/colorizer/menus/"
-	echo "  MBG  | MBGT  |MBORDER|  TBG  |  TFG  |TBORDER|NORMBG |  NFG  |  SBG  |  SFG  |SBORDER| SEPFG  |GRADIENT|scheme_name" > "$USERSCHEMES"
+    echo "  MBG  |opa| MBGT  |opa|MBORDER|opa|  TBG  |opa|  TFG  |opa|TBORDER|opa|NORMBG |opa|  NFG  |opa|  SBG  |opa|  SFG  |opa|SBORDER|opa| SEPFG  |opa|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name" > "$USERSCHEMES"
 fi
 
 out+=("^sep($MENU_THEME: <i>${jgmenu_theme}</i>)")
@@ -350,7 +352,7 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
     out2+=("^sep($SYSTEM_SCHEMES)")
 
     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 mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
     do
     ((n=n+1))
     case "$grad" in
@@ -372,7 +374,7 @@ out+=("<big><span bgcolor='${MBG}'> <span fgcolor='${TBG}'></span> <span fgco
     out2+=("<big></big>   $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES")
     out2+=("^sep()")
     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 mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
     do
     ((n=n+1))
     case "$grad" in

bin/colorizer-ob

@@ -366,8 +366,8 @@ out+=("<big><span fgcolor='${ABGTO}'></span> <span fgcolor='${ABG}'></span
     out2+=("^sep($THEMES)")
     out2+=("^sep($MONOCHROMATIC)")
     out2+=("^sep(<i>$CHOOSE_AND_PICK</i>)")
-	out2+=("<big></big>   $LIGHTBG...,obtctl mono pick light")
+    out2+=("<big></big>   $LIGHTBG...,obtctl mono pick light col")
-	out2+=("<big></big>   $DARKBG...,obtctl mono pick dark")
+    out2+=("<big></big>   $DARKBG...,obtctl mono pick dark col")
     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")

bin/conkyctl

@@ -717,28 +717,28 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
     if [[ "$1" =~ "quoter" ]]; then
     case "$LANG" in
         pl*)
-        FONTSIZE="Rozmiar czcionki"
+        FONTSIZE="Czcionka i rozmiar"
         QUOTE_FSIZE="Cytat"
         AUTHOR_FSIZE="Autor"
         EDIT_CONF="Edytuj plik konfiguracyjny"
         RELOAD="Przeładuj"
         ;;
         es*)
-        FONTSIZE="Font size"
+        FONTSIZE="Font size & family"
         QUOTE_FSIZE="Quote"
         AUTHOR_FSIZE="Author"
         EDIT_CONF="Edit conf file"
         RELOAD="Reload"
         ;;
         *)
-        FONTSIZE="Font size"
+        FONTSIZE="Font size & family"
         QUOTE_FSIZE="Quote"
         AUTHOR_FSIZE="Author"
         EDIT_CONF="Edit conf file"
         RELOAD="Reload"
         ;;
     esac
-    Q_CFG="$HOME/.config/quoter/quoter.cfg"
+    Q_CFG="$HOME/.config/quoter/quoter.conf"
     source "$Q_CFG"
     out+=("^sep($FONTSIZE)")
     out+=("$QUOTE_FSIZE [ <b>$quote_fontsize</b> ],^checkout(qsize)")
@@ -753,6 +753,22 @@ if [[ "$OLD_SYNTAX" = "true" ]];then
     for i in 10 11 12 13 14 15 16 18 20; do
     out2+=("${i},mb-setvar author_fontsize=$i $Q_CFG;conkyctl restartone ${1};$me")
     done
+    #FONT FAMILY FOR QUOTER
+    out+=("$FONT_NAME [ <b>${font_name}</b> ],^checkout(qfontfamily)")
+    out2+=("^tag(qfontfamily)")
+    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
+				#notify-send.sh "Ile" "${#favfonts[@]}"
+				if [ "${#favfonts[@]}" -gt 0 ];then
+				out2+=("^sep($FONTFAMILY_LBL)")
+					for fon in "${favfonts[@]}";do
+					[[ "$fon" == "$font_name" ]] && out2+=("<big>綠</big>  <span font_family=\"${fon}\">${fon}</span>,$me") || out2+=("<big>祿</big>  <span font_family=\"${fon}\">${fon}</span>,mb-setvar 'font_name=\"${fon}\"' $Q_CFG;conkyctl restartone ${1}")
+					done
+				fi
     fi
     
     out+=("^sep($COLORS)")
@@ -817,9 +833,10 @@ 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)")
@@ -853,7 +870,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];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)")
@@ -868,6 +885,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];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}")
@@ -1190,7 +1208,11 @@ do
     
 done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 }
-
+fix_transparent_conkies(){
+	transparent true ${CONKYDIR}/Polaroid_mbcolor.conkyrc
+	transparent true ${CONKYDIR}/logo_mbcolor.conkyrc
+	transparent true ${CONKYDIR}/logo_SVG_mbcolor.conkyrc
+}
 
 applyscheme_all () {
 case "$1" in
@@ -1212,6 +1234,8 @@ do
     stippled_borders_all ${stip}
     draw_borders_all ${bord}
 done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
+
+fix_transparent_conkies
 }
 
 
@@ -1295,6 +1319,8 @@ else # light
 	color1_all "${pal[8]}"
 	color2_all "${pal[1]}"
 fi
+
+fix_transparent_conkies
 colorizer-conky -s 2>/dev/null
 }
 monoone () {
@@ -1395,5 +1421,6 @@ case "$1" in
     baseconky_info) baseconky_info;;
     mono) mono "$2" "$3";;
     monoone) monoone "$2" "$3" "$4";;
+    fix_transparent_conkies)fix_transparent_conkies;;
     *) : ;;
 esac

bin/fontctl

@@ -43,8 +43,8 @@ resetob () {
 
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:name' -v "Ubuntu" "$cfg"
     xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:name' -v "Ubuntu" "$cfg"
-    xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v 9 "$cfg"
+    xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v 10 "$cfg"
-    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:size' -v 10 "$cfg"
     
     #add Weight and slant
     
@@ -71,11 +71,13 @@ inc_all() {
 	gtk_fontsize inc
 	inc_conky
 	inc_menus
+  ob_fontsize inc
 }
 dec_all() {
 	gtk_fontsize dec
 	dec_conky
 	dec_menus
+  ob_fontsize dec
 }
 inc_conky () {
     read FONTDEF <<< "$(grep "font .*=.*,$" ${BASECONKY} | cut -d'=' -f2,3 |cut -d"'" -f2)"

bin/gtkctl

@@ -39,21 +39,23 @@ adwaita|black|blue|bluegrey|breeze|brown|carmine|cyan|darkcyan|deeporange|green|
 exit 1
 esac
 
-if [ -f "${ICON_DIR}/Papirus-Mabox-$1/index.theme" ];then
+[[ "$2" == "-d" ]] && VARIANT="Dark-" || VARIANT=""
+
+if [ -f "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/index.theme" ];then
 TITLE="Icons theme changed!"
-TEXT="Papirus folders color: <b>${1^}</b>"
+TEXT="Papirus folders color: <b>${VARIANT}${1^}</b>"
-icons Papirus-Mabox-$1
+icons Papirus-Mabox-${VARIANT}${1}
-notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" "$TITLE" "$TEXT"
+notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/64x64/places/folder-linux.svg" "$TITLE" "$TEXT"
 
 else
 TITLE="Please wait..."
-TEXT="Preparing ${1} folder color icons"
+TEXT="Preparing ${VARIANT}${1} folder color icons"
 TITLE2="Success!"
-TEXT2="${1^} icons color variant generated successfully"
+TEXT2="${VARIANT}${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"
+notify-send.sh -u critical -i /usr/share/icons/Papirus/64x64/places/folder-${VARIANT}${1}.svg -R /tmp/papicon "$TITLE" "$TEXT"
-papirus-folder-color.sh -c ${1}
+papirus-folder-color.sh -c ${1} ${2}
-notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-$1/64x64/places/folder-linux.svg" -R /tmp/papicon "$TITLE2" "$TEXT2"
+notify-send.sh -u normal -i "${ICON_DIR}/Papirus-Mabox-${VARIANT}${1}/64x64/places/folder-linux.svg" -R /tmp/papicon "$TITLE2" "$TEXT2"
-icons Papirus-Mabox-$1
+icons Papirus-Mabox-${VARIANT}${1}
 
 fi
 }
@@ -65,6 +67,6 @@ case "$1" in
 	get_icons)get_icons "$2";;
 	theme)theme "$2";;
 	icons)icons "$2";;
-	papcolor)papcolor "$2";;
+	papcolor)papcolor "$2" "$3";;
 	*):;;
 esac

bin/jgctl

@@ -68,6 +68,7 @@ color_menu_border () {
     }
 menu_gradient_pos () {
     sd "menu_gradient_pos.*$" "menu_gradient_pos = $1" ${THEMERC}
+    #mb-setvar menu_gradient_pos=${1}
     }
 gradient () {
     read MBG MBGA<<< "$(grep 'color_menu_bg ' ${THEMERC} | cut -d'=' -f2)"
@@ -335,18 +336,18 @@ savescheme () {
     # 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/menus/userschemes.csv"
+    echo "${1}${schemename}" >> "$HOME/.config/colorizer/menus/userschemes2.csv"
 }
 applyscheme () {
 theme MBcolors
-line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes.csv")
+line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes2.csv")
 #notify-send.sh "$1" "${line}"
 case "$1" in
     sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/menus.csv";;
-	usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes.csv";;
+    usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes2.csv";;
 esac
 
-while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name
+while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name
 do
 mb-setvar jgmenu_theme=MBcolors
 color_menu_bg "${mbg}"
@@ -363,18 +364,41 @@ color_sel_border "${sborder}"
 color_sep_fg "${sepfg}"
 menu_gradient_pos "${grad}"
 
-item_border 0
+#opacity
-color_title_bg 100
+color_menu_bg "${mbga}"
-color_menu_bg 100
+color_menu_bg_to "${mbgta}"
-color_menu_bg_to 100
+color_menu_border "${mbordera}"
-color_norm_bg 0
+color_title_bg "${tbga}"
+color_title_fg "${tfga}"
+color_title_border "${tbordera}"
+color_norm_bg "${normbga}"
+color_norm_fg "${nfga}"
+color_sel_bg "${sbga}"
+color_sel_fg "${sfga}"
+color_sel_border "${sbordera}"
+color_sep_fg "${sepfga}"
+
+
+item_border "${ibor}"
+item_radius "${irad}"
+sep_halign "${sephal}"
+
+mb-setvar arrow_string=${a}
+mb-setvar arrow_string_left=${al}
+
+# missing: ( from mabox.conf )
+mb-setvar jgtools_border=${b}
+mb-setvar jgtools_padding=${p}
+mb-setvar jgtools_radius=${r}
+mb-setvar submenu_spacing=${ss}
+
 
 #notify-send.sh "${scheme_name}" "${mbg}"
 done < <(awk 'NR == n' n=$2 "$SCHEMEFILE")
 }
 
 delscheme() {
-	sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes.csv"
+    sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes2.csv"
 }
 mono () {
 lighten=(0.92 0.8 0.65 0.45 0.28)
@@ -410,6 +434,7 @@ if [ "$2" == "dark" ];then
     color_title_bg "${pal[9]}"
     color_title_border "${pal[9]}"
     color_title_fg "${pal[2]}"
+    color_norm_bg "${pal[8]}"
     color_norm_fg "${pal[3]}"
     color_sel_bg "${pal[6]}"
     color_sel_fg "${pal[1]}"
@@ -421,12 +446,31 @@ else #light
     color_title_bg "${pal[3]}"
     color_title_border "${pal[4]}"
     color_title_fg "${pal[10]}"
+    color_norm_bg "${pal[2]}"
     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
+    # opacity
+    color_norm_bg 0
+
+case "$3" in
+ col)colorizer-menus -s 2>/dev/null;;
+ stylemenu) jgwallpaperchanger -s jgmenus;;
+ *):;;
+esac
+}
+randomscheme(){
+mb-setvar jgmenu_theme=MBcolors
+themefile=$(find /usr/share/mb-jgtools/jgobthemes/ -type f -name *.colorrc |shuf -n 1)
+#notify-send.sh "Theme:" "${themefile}"
+cat ${themefile} > ~/.config/mabox/jgobthemes/MBcolors.colorrc
+}
+applyoldscheme(){
+    #notify-send.sh "th" "${1}"
+mb-setvar jgmenu_theme=MBcolors
+cat ${1} > ~/.config/mabox/jgobthemes/MBcolors.colorrc
 }
 
 case "$1" in
@@ -458,9 +502,11 @@ case "$1" in
     t_icons)t_icons;;
     border)border "$2";;
     padding)padding "$2";;
-    mono) mono "$2" "$3";;
+    mono) mono "$2" "$3" "$4";;
     savescheme) savescheme "$2";;
     applyscheme) applyscheme "$2" "$3";;
     delscheme) delscheme "$2";;
+    randomscheme) randomscheme;;
+    applyoldscheme) applyoldscheme "$2";;
     *) : ;;
 esac

bin/obtctl

@@ -885,7 +885,11 @@ else #light
     inactivetextcolor "${pal[5]}"
 fi
 openbox --reconfigure
-colorizer-ob -s 2>/dev/null
+case "$3" in
+    col)colorizer-ob -s 2>/dev/null;;
+    stylemenu)jgwallpaperchanger -s obox;;
+    *):;;
+esac
 }
 
 case "$1" in
@@ -928,7 +932,7 @@ case "$1" in
     fontslanttoggle) fontslanttoggle;;
     randomizer) randomizer;;
     tweak) tweak "$2";;
-    mono) mono "$2" "$3";;
+    mono) mono "$2" "$3" "$4";;
     savetheme) savetheme "$2";;
     applyscheme) applyscheme "$2" "$3";;
     applytheme) applytheme "$2" "$3";;

bin/pcmanwp

@@ -20,4 +20,4 @@ fi
 
 readarray -t wpdirs < <(grep "^[^#]" "${CNF_FILE}")
 
-pcmanfm -n $(echo ${syswpdirs[@]} ${wpdirs[@]})
+sh -c "pcmanfm -n $(echo ${syswpdirs[@]} ${wpdirs[@]})"

bin/quote.sh

@@ -1,23 +1,52 @@
 #!/bin/bash
+
 DIR="$HOME/.config/quoter"
 mkdir -p "$DIR"
-CNF_FILE="$DIR/quoter.cfg"
+CNF_FILE="$DIR/quoter.conf"
+
+notify(){
+source <(grep = $CNF_FILE)
+quotes=${quotes_file:-"/usr/share/mabox/quotes.txt"}
+Q=$(shuf -n 1 "${quotes}")
+QUOTE=${Q%|*}
+AUTOR=${Q#*|}
+notify-send.sh -t 15000 --icon=$HOME/.config/mabox/wpicon.png "${AUTOR}\n" "${QUOTE}" --action="Next:quote.sh -n"
+}
+
+conky() {
+
 if [ ! -f $CNF_FILE ]; then
 cat <<EOF > ${CNF_FILE}
 quote_fontsize=12
 author_fontsize=10
+font_name="Ubuntu"
 EOF
 fi
 source <(grep = $CNF_FILE)
 qfsize=${quote_fontsize:-12}
 afsize=${author_fontsize:-10}
+fontname=${font_name:-"Source Code Pro"}
+quotes=${quotes_file:-"/usr/share/mabox/quotes.txt"}
 
-export Q=$(curl -s "http://api.forismatic.com/api/1.0/?method=getQuote&format=json&lang=en" | sed 's|\\||g' )
-QUOTE=$(echo $Q | jq .quoteText)
-AUTOR=$(echo $Q | jq .quoteAuthor | tr -d '"')
-echo "${QUOTE}|${AUTOR}" >> "${DIR}"/forismatic.txt
 
-printf "\${font Droid Sans:size=$qfsize}\${color}"
+Q=$(shuf -n 1 "${quotes}")
+
+
+QUOTE=${Q%|*}
+AUTOR=${Q#*|}
+#QUOTE=$(crow -b $(echo $Q | jq .quoteText))
+#AUTOR=$(echo $Q | jq .quoteAuthor | tr -d '"')
+#echo "${QUOTE}|${AUTOR}" >> "${DIR}"/forismatic.txt
+
+#QUOTE="Kto to jest Hiszpania? i dlaczego był Hitler?"
+#AUTOR="Nieznany Zenon"
+
+printf "\${font ${fontname}:size=$qfsize}\${color}"
 echo ${QUOTE} | fmt -80
-printf "\${font Droid Sans:size=$afsize}\${alignr}\${color0}"
+printf "\${font ${fontname}:size=$afsize}\${alignr}\${color0}"
 echo "${AUTOR}"
+}
+case "$1" in
+	-n) notify;;
+	*) conky;;
+esac

bin/randomizer

@@ -6,7 +6,7 @@ ob () {
     obtctl randomizer
 }
 menu () {
-    mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1))
+    jgctl randomscheme
     case "$1" in
         show) colorizer-menus -s;;
         *):;;

bin/w2theme

@@ -57,6 +57,7 @@ menu_theme () {
         jgctl color_sel_fg "${w[-1]}"
         jgctl color_sel_border "${w[3]}"
         jgctl color_sep_fg "${w[3]}"
+        jgctl color_norm_bg "${w[2]}"
         #sleep 1
         ;;
         *) #light bg
@@ -71,6 +72,7 @@ menu_theme () {
         jgctl color_sel_fg "${w[0]}"
         jgctl color_sel_border "${w[-4]}"
         jgctl color_sep_fg "${w[-5]}"
+        jgctl color_norm_bg "${w[-1]}"
         #sleep 1
         ;;
     esac
@@ -102,6 +104,7 @@ conky_colors() {
 	   #bars/graphs color
        #random
        conkyctl color2_all "${accents[ $RANDOM % ${#accents[@]} ]}"
+       conkyctl fix_transparent_conkies
     
 }
 conky_colorsone () {
@@ -120,7 +123,7 @@ conky_colorsone () {
         conkyctl color1 "${w[5]}" "${2}"
         ;;
     esac
-    conkyctl color2_all "${accents[ $RANDOM % ${#accents[@]} ]}" "${2}"
+    #conkyctl color2_all "${accents[ $RANDOM % ${#accents[@]} ]}" "${2}"
 }
 pyradio_theme() {
     case "$1" in

share/mabox-colorizer/colorschemes/menus.csv

@@ -1,6 +1,10 @@
-  MBG  | MBGT  |MBORDER|  TBG  |  TFG  |TBORDER|NORMBG |  NFG  |  SBG  |  SFG  |SBORDER| SEPFG |GRADIENT|scheme_name
+  MBG  |op| MBGT  |op|MBORDER|op|  TBG  |op|  TFG  |op|TBORDER|op|NORMBG |op|  NFG  |op|  SBG  |op|  SFG  |op|SBORDER|op| SEPFG  |op|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name
-#383838|#222222|#eeeeee|#325a52|#d3d4bf|#579c8e|#2b303b|#dadada|#579c8e|#ffffff|#579c8e|#4f4f4f|none|Istredd
+#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|0|#dadada|90|#579c8e|90|#ffffff|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|none|Istredd
-#1E1E1E|#262626|#333333|#383838|#BBBBBB|#222222|#1e1e1e|#9b9b9b|#000000|#FFCC66|#FFCC66|#363636|right|Jaskier
+#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|100|#dadada|90|#e8cc2d|70|#0d0d0d|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|right|Istredd  v2
-#d3d4bf|#d2cda1|#cdc76d|#cdc76d|#0c1d23|#c6b76b|#d3d4bf|#0c1d23|#a29d62|#060b0a|#c6b76b|#a29d62|top_right|Jaskier Light
+#1E1E1E|90|#262626|90|#333333|90|#383838|90|#BBBBBB|90|#222222|90|#1e1e1e|90|#9b9b9b|90|#000000|90|#FFCC66|90|#FFCC66|90|#363636|20|0|2|8|8|0|2|||center|right|Jaskier
-#38373c|#424247|#2a2a2c|#2a2a2d|#d0d0ce|#151517|#2b303b|#c8c8c4|#59595a|#f8f8f8|#373739|#2a2a2c|bottom_left|GreyBird Dark
+#d3d4bf|90|#d2cda1|90|#cdc76d|90|#cdc76d|90|#0c1d23|90|#c6b76b|90|#d3d4bf|90|#0c1d23|90|#e8e8dd|100|#060b0a|90|#c6b76b|90|#a29d62|20|0|2|8|8|0|2|||center|top_right|Jaskier Light
-#ececea|#e0e0de|#d0d0ce|#d0d0ce|#1e1e20|#c0c0be|#2b303b|#1e1e20|#b0b0af|#151517|#c0c0be|#b0b0af|bottom_left|GreyBird Light
+#38373c|90|#424247|90|#2a2a2c|90|#2a2a2d|90|#d0d0ce|90|#151517|90|#38373c|90|#c8c8c4|90|#59595a|90|#f8f8f8|90|#373739|90|#2a2a2c|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Dark
+#ececea|90|#e0e0de|90|#d0d0ce|90|#d0d0ce|90|#1e1e20|90|#c0c0be|90|#e0e0de|90|#1e1e20|90|#b0b0af|90|#151517|90|#c0c0be|90|#b0b0af|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Light
+#2f343f|100|#2f343f|100|#4C566A|100|#3B4252|100|#ffffff|100|#2f343f|100|#2f343f|0|#a8adb5|100|#3B4252|100|#A3BE8C|100|#A3BE8C|20|#4C566A|20|12|8|24|8|0|2|||center|top_right|Nordic
+#103C48|100|#184956|90|#eeeeee|90|#2D5B69|100|#CAD8D9|90|#103C48|100|#383838|0|#ADBCBC|90|#DBB32D|100|#103C48|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|none|Selenized-Dark
+#252525|100|#181818|90|#184956|90|#181818|100|#b2b2b2|90|#252525|100|#181818|0|#c0c0c0|90|#70B433|70|#ffffff|100|#70B433|90|#1d3036|30|0|2|8|4|1|3|||center|none|Selenized-Black

share/mabox-colorizer/colorschemes/ob.csv

@@ -5,5 +5,7 @@
 #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
+#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|sunken|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
+#0395E2|#02669c|#E5E5E5|#0395E2|#201d29|#09080b|#898989|#201d29|splitvertical|center|4|4|3|1|flat|bold|11|Ubuntu|NLIMC|Bold|Normal|Split Blue
+#393c47|#75443b|#E5E5E5|#393c47|#201d29|#09080b|#898989|#201d29|mirrorhorizontal|center|2|2|4|4|flat|tiny|8|Ubuntu|NLIMC|Bold|Normal|MirrHor Brown

share/mabox-colorizer/help/en.html

@@ -95,11 +95,14 @@ 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{background-color:#191919;padding: 6px 2px 2px 2px;}
-.grid div.i a{text-decoration:none;display:block;border-radius: 4px;margin: -1em;padding:1em;}
+.grid div.i a{text-decoration:none;margin-top:4px;}
+.grid div.i a.light-gray{border-radius: 4px 0 0 4px;}
+.grid div.i a.dark-gray{border-radius: 0 4px 4px 0;}
 .gi2 {grid-column: span 2;}
 .gi3 {grid-column: span 3;}
 .gi4 {grid-column: span 4;}
+.gi5 {grid-column: span 5;}
 .gi22 {
   grid-column: span 2;
   grid-row: span 2;
@@ -675,141 +678,119 @@ 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>
-    <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">
+    
+<div class="grid">
+<div class="g1 dark">
+    <a class="button amber" href="run://colorizer-fonts -s"><span class="large"></span><br />Configure Fonts</a>
+</div>
+<div class="g1 dark">
+    <a class="button amber" href="run://lxappearance"><span class="large"></span><br />GTK Theme and Icons</a>
+</div>
+</div>
+    <br /><hr /><br />
+    <div class="grid">
+     <div class="i">Adwaita<br />
 		<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 class="tag small light-gray hover-white" href="run://gtkctl papcolor adwaita">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor adwaita -d">dark</a></div>
-    </a></div>
+    <div class="gi5"><h3>Papirus Folder Icons</h3><hr />Generate and apply colorized folder icons for Papirus. Light or Dark variant.</div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor black">
+    <div class="i">Black<br />
 		<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 class="tag small light-gray hover-white" href="run://gtkctl papcolor black">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor black -d">dark</a></div>
-    </a></div>
+    <div class="i">Blue<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor blue">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor blue -d">dark</a></div>
-    </a></div>
+    <div class="i">Bluegrey<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor bluegrey">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor bluegrey -d">dark</a></div>
-    </a></div>
+    <div class="i">Breeze<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor breeze">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor breeze -d">dark</a></div>
-    </a></div>
+        <div class="i">Brown<br />
-        <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor brown">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor brown -d">dark</a></div>
-    </a></div>
+    <div class="i">Carmine<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor carmine">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor carmine -d">dark</a></div>
-    </a></div>
+    <div class="i">Cyan<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor cyan">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor cyan -d">dark</a></div>
-    </a></div>
+    <div class="i">DarkCyan<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor darkcyan">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor darkcyan -d">dark</a></div>
-    </a></div>
+    <div class="i">DeepOrange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor deeporange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor deeporange -d">dark</a></div>
-    </a></div>
+    <div class="i">Green<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor green">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor green -d">dark</a></div>
-    </a></div>
+    <div class="i">Grey<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor grey">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor grey -d">dark</a></div>
-    </a></div>
+    <div class="i">Indigo<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor indigo">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor indigo -d">dark</a></div>
-    </a></div>
+    <div class="i">Magenta<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor magenta">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor magenta -d">dark</a></div>
-    </a></div>
+    <div class="i">Nordic<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor nordic">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor nordic -d">dark</a></div>
-    </a></div>
+    <div class="i">Orange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor orange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor orange -d">dark</a></div>
-    </a></div>
+    <div class="i">PaleBrown<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor palebrown">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor palebrown -d">dark</a></div>
-    </a></div>
+    <div class="i">PaleOrange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor paleorange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor paleorange -d">dark</a></div>
-    </a></div>
+    <div class="i">Pink<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor pink">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor pink -d">dark</a></div>
-    </a></div>
+    <div class="i">Red<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor red">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor red -d">dark</a></div>
-    </a></div>
+    <div class="i">Teal<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor teal">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor teal -d">dark</a></div>
-    </a></div>
+    <div class="i">Violet<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor violet">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor violet -d">dark</a></div>
-    </a></div>
+    <div class="i">White<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor white">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor white -d">dark</a></div>
-    </a></div>
+    <div class="i">Yaru<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor yaru">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor yaru -d">dark</a></div>
-    </a></div>
+    <div class="i">Yellow<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor yellow">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor yellow -d">dark</a></div>
-    </a></div>
     </div>
     </section>
 <section id="pyradiocava" class="container tab" style="display:none;min-height:100vh;">

share/mabox-colorizer/help/pl.html

@@ -95,12 +95,14 @@ 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{background-color:#191919;padding: 6px 2px 2px 2px;}
-.grid div.i a{text-decoration:none;display:block;border-radius: 4px;margin: -1em;padding:1em;}
+.grid div.i a{text-decoration:none;margin-top:4px;}
-
+.grid div.i a.light-gray{border-radius: 4px 0 0 4px;}
+.grid div.i a.dark-gray{border-radius: 0 4px 4px 0;}
 .gi2 {grid-column: span 2;}
 .gi3 {grid-column: span 3;}
 .gi4 {grid-column: span 4;}
+.gi5 {grid-column: span 5;}
 .gi22 {
   grid-column: span 2;
   grid-row: span 2;
@@ -818,138 +820,120 @@ 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>
-    <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>
-    <h3>Motyw GTK oraz Ikon</h3>
-    <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="g1 dark">
+    <a class="button amber" href="run://colorizer-fonts -s"><span class="large"></span><br />Ustaw Czcionki</a>
+</div>
+<div class="g1 dark">
+  <a class="button amber" href="run://lxappearance"><span class="large"></span><br />Motyw GTK oraz Ikony</a>
+</div>
+</div>
+    <br /><hr /><br />
  
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor adwaita">
+    
+    <div class="grid">
+     
+    <div class="i">Adwaita<br />
 		<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 class="tag small light-gray hover-white" href="run://gtkctl papcolor adwaita">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor adwaita -d">dark</a></div>
-    </a></div>
+    <div class="gi5"><h3>Ikony Katalogów Papirus</h3><hr />Wygeneruj i ustaw kolorowe foldery Papirus. Wariant jasny (light) lub ciemny (dark).</div>
-    <div class="i"><a class="hover-white" href="run://gtkctl papcolor black">
+    <div class="i">Black<br />
 		<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 class="tag small light-gray hover-white" href="run://gtkctl papcolor black">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor black -d">dark</a></div>
-    </a></div>
+    <div class="i">Blue<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor blue">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor blue -d">dark</a></div>
-    </a></div>
+    <div class="i">Bluegrey<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor bluegrey">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor bluegrey -d">dark</a></div>
-    </a></div>
+    <div class="i">Breeze<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor breeze">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor breeze -d">dark</a></div>
-    </a></div>
+        <div class="i">Brown<br />
-        <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor brown">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor brown -d">dark</a></div>
-    </a></div>
+    <div class="i">Carmine<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor carmine">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor carmine -d">dark</a></div>
-    </a></div>
+    <div class="i">Cyan<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor cyan">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor cyan -d">dark</a></div>
-    </a></div>
+    <div class="i">DarkCyan<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor darkcyan">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor darkcyan -d">dark</a></div>
-    </a></div>
+    <div class="i">DeepOrange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor deeporange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor deeporange -d">dark</a></div>
-    </a></div>
+    <div class="i">Green<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor green">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor green -d">dark</a></div>
-    </a></div>
+    <div class="i">Grey<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor grey">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor grey -d">dark</a></div>
-    </a></div>
+    <div class="i">Indigo<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor indigo">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor indigo -d">dark</a></div>
-    </a></div>
+    <div class="i">Magenta<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor magenta">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor magenta -d">dark</a></div>
-    </a></div>
+    <div class="i">Nordic<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor nordic">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor nordic -d">dark</a></div>
-    </a></div>
+    <div class="i">Orange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor orange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor orange -d">dark</a></div>
-    </a></div>
+    <div class="i">PaleBrown<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor palebrown">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor palebrown -d">dark</a></div>
-    </a></div>
+    <div class="i">PaleOrange<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor paleorange">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor paleorange -d">dark</a></div>
-    </a></div>
+    <div class="i">Pink<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor pink">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor pink -d">dark</a></div>
-    </a></div>
+    <div class="i">Red<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor red">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor red -d">dark</a></div>
-    </a></div>
+    <div class="i">Teal<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor teal">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor teal -d">dark</a></div>
-    </a></div>
+    <div class="i">Violet<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor violet">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor violet -d">dark</a></div>
-    </a></div>
+    <div class="i">White<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor white">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor white -d">dark</a></div>
-    </a></div>
+    <div class="i">Yaru<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor yaru">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor yaru -d">dark</a></div>
-    </a></div>
+    <div class="i">Yellow<br />
-    <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 class="tag small light-gray hover-white" href="run://gtkctl papcolor yellow">light</a><a class="tag small dark-gray hover-black" href="run://gtkctl papcolor yellow -d">dark</a></div>
-    </a></div>
     </div>
     
     </section>