@kecan0406/ttheme 1.0.49 → 1.1.2

package/shell/ttheme.zsh

@@ -4,7 +4,7 @@ zmodload -F zsh/stat b:zstat 2>/dev/null
 
 __tt_palettes_load() {
   local -a at
-  unset TTHEME_PALETTE TTHEME_GROUP TTHEME_NATIVE TTHEME_SRC
+  unset TTHEME_PALETTE TTHEME_GROUP TTHEME_CATALOG TTHEME_NATIVE TTHEME_SRC
   source $TTHEME_HOME/palettes.zsh || return 1
   zstat -F %s.%N -A at +mtime -- $TTHEME_HOME/palettes.zsh 2>/dev/null
   TTHEME_PALETTES_AT=$at[1]
@@ -231,7 +231,7 @@ __tt_name_of() { REPLY=${${(k)TTHEME_PALETTE[(re)$1]}:-custom} }
 __tt_color() { [[ -t 1 && -z $NO_COLOR && $TERM != dumb ]] }
 
 __tt_palette_line() {
-  local name=$1 width=$2 on=$3 hex cell="" bar=""
+  local name=$1 width=$2 on=$3 label=${4:-$1} hex cell="" bar=""
   local -a p=(${=TTHEME_PALETTE[$name]}) sw=(${=TTHEME_SWATCH[$name]})
   (( ${#p} >= 20 )) || return 1
   for hex in $sw; do
@@ -243,9 +243,9 @@ __tt_palette_line() {
     printf -v ac '\e[38;2;%d;%d;%dm' $((16#${cur:0:2})) $((16#${cur:2:2})) $((16#${cur:4:2}))
     printf -v bar '\e[48;2;%d;%d;%d;38;2;%d;%d;%dm' \
       $((16#${sel:0:2})) $((16#${sel:2:2})) $((16#${sel:4:2})) $((16#${fg:0:2})) $((16#${fg:2:2})) $((16#${fg:4:2}))
-    printf '%s▌\e[39m %s %s■\e[39m \e[1m%-*s\e[22m  %s\e[0m\n' "$ac" "$bar" "$ac" "$width" "$name" "$cell"
+    printf '%s▌\e[39m %s %s■\e[39m \e[1m%-*s\e[22m  %s\e[0m\n' "$ac" "$bar" "$ac" "$width" "$label" "$cell"
   else
-    printf '     %-*s  %s\e[0m\n' "$width" "$name" "$cell"
+    printf '     %-*s  %s\e[0m\n' "$width" "$label" "$cell"
   fi
 }
 
@@ -402,9 +402,9 @@ __tt_pin_save() {
   TTHEME_PIN=$key TTHEME_PIN_SPEC=${TTHEME_PALETTE[$name]}
   __tt_tilde "$key"
   if __tt_color; then
-    printf '\033[2mpinned · %s → %s\033[0m\n' "$REPLY" "$name"
+    printf '\033[2mPinned · %s → %s\033[0m\n' "$REPLY" "$name"
   else
-    print -r -- "pinned · $REPLY → $name"
+    print -r -- "Pinned · $REPLY → $name"
   fi
 }
 
@@ -420,9 +420,9 @@ __tt_unpin() {
     __tt_dir_sync
     __tt_tilde "$key"
     if __tt_color; then
-      printf '\033[2munpinned · %s\033[0m\n' "$REPLY"
+      printf '\033[2mUnpinned · %s\033[0m\n' "$REPLY"
     else
-      print -r -- "unpinned · $REPLY"
+      print -r -- "Unpinned · $REPLY"
     fi
     return 0
   done
@@ -457,7 +457,7 @@ __tt_order() {
 }
 
 __tt_menu() {
-  local k cur="" grp last_grp="" REPLY
+  local k cur="" grp last_grp="" shelf last_shelf="" label REPLY
   local -a reply
   local -i width=0
   __tt_order
@@ -469,18 +469,28 @@ __tt_menu() {
   fi
   [[ -n $TTHEME_SPEC ]] && __tt_name_of "$TTHEME_SPEC" && cur=$REPLY
   for k in $reply; do
-    (( ${#k} > width )) && width=${#k}
+    label=${k##*/}
+    [[ -n ${TTHEME_CATALOG[$k]} && ${TTHEME_GROUP[$k]} == *@* ]] && label="  $label"
+    (( ${#label} > width )) && width=${#label}
   done
   for k in $reply; do
     grp=${TTHEME_GROUP[$k]:-Other}
     if [[ $grp != $last_grp ]]; then
-      [[ $grp == *@* && $last_grp != *@* && -n $last_grp ]] && printf '  \033[2m── markets ──────────\033[0m\n'
+      [[ $grp == *@* && $last_grp != *@* && -n $last_grp ]] && printf '  \033[2m── Markets ──────────\033[0m\n'
       printf '  \033[1m%s\033[0m' "$grp"
       [[ -n ${TTHEME_NATIVE[$k]} ]] && printf ' \033[2m%s\033[0m' "${TTHEME_NATIVE[$k]}"
       printf '\n'
-      last_grp=$grp
+      last_grp=$grp last_shelf=""
     fi
-    __tt_palette_line "$k" $width ${${(M)k:#$cur}:+1}
+    shelf=""
+    [[ $grp == *@* ]] && shelf=${TTHEME_CATALOG[$k]}
+    if [[ -n $shelf && $shelf != "$last_shelf" ]]; then
+      printf '    \033[1m%s\033[0m\n' "$shelf"
+      last_shelf=$shelf
+    fi
+    label=${k##*/}
+    [[ -n $shelf ]] && label="  $label"
+    __tt_palette_line "$k" $width "${${(M)k:#$cur}:+1}" "$label"
   done
   printf '\n  \033[2mttheme use <palette> paints this tab · ttheme preview · ttheme help\033[0m\n'
 }
@@ -537,7 +547,7 @@ __tt_cli() {
 __tt_catalog() {
   local was
   __tt_cli "$@" || return
-  [[ $1 == (list|share|market) ]] && return 0
+  [[ $1 == (list|share) ]] && return 0
   [[ -r $TTHEME_HOME/palettes.zsh ]] || return 0
   was="$TTHEME_STARTUP ${TTHEME_PALETTE[$TTHEME_STARTUP]}"
   __tt_palettes_load && __tt_reloaded
@@ -572,7 +582,7 @@ __tt_config() {
   blur=${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*}
   ${=${VISUAL:-${EDITOR:-vi}}} $TTHEME_CONFIG || return
   [[ ${(M)${(@f)"$(<$TTHEME_CONFIG)"}:#': ${TTHEME_BG_BLUR:='*} == "$blur" ]] || __tt_redraw
-  print -r -- "settings apply in new tabs — $TTHEME_CONFIG"
+  print -r -- "Settings apply in new tabs — $TTHEME_CONFIG"
 }
 
 __tt_redraw() {
@@ -639,11 +649,11 @@ __tt_resolve() {
     return 0
   elif (( ${#m} > 1 )); then
     m=(${(o)m})
-    print -u2 "multiple palettes start with '$name': $m"
+    print -u2 "ttheme: multiple palettes start with '$name': $m"
   elif m=(${(o)${(M)${(k)TTHEME_PALETTE}:#*$name*}}) && (( ${#m} )); then
-    print -u2 "unknown palette '$name' — did you mean: ${(j:, :)m[1,3]}?"
+    print -u2 "ttheme: unknown palette '$name' — did you mean: ${(j:, :)m[1,3]}?"
   else
-    print -u2 "unknown palette '$name' — run \`ttheme\` to list palettes"
+    print -u2 "ttheme: unknown palette '$name' — run \`ttheme\` to list palettes"
   fi
   return 1
 }
@@ -671,14 +681,14 @@ __tt_rotate() {
 
 __tt_pv_rows() {
   rtype=() rval=() rcnt=()
-  local g t gm ruled=""
-  local -a ts
+  local g t c gm ruled=""
+  local -a ts cs loose inside
   for g in $groups; do
     ts=()
     gm=""
     [[ -n $flt && ${(L)g} == *$flt* ]] && gm=1
     for t in ${=gthemes[$g]}; do
-      [[ -z $flt || -n $gm || $t == *$flt* ]] && ts+=($t)
+      [[ -z $flt || -n $gm || $t == *$flt* || ${(L)TTHEME_CATALOG[$t]} == *$flt* ]] && ts+=($t)
     done
     [[ -n $flt ]] && (( ! ${#ts} )) && continue
     if [[ $g == *@* && -z $ruled ]]; then
@@ -686,12 +696,38 @@ __tt_pv_rows() {
       (( ${#rtype} )) && { rtype+=(rule); rval+=(''); rcnt+=(0) }
     fi
     rtype+=(hdr); rval+=($g); rcnt+=(${#ts})
-    if [[ -n $flt || -n ${exp[$g]} ]]; then
-      for t in $ts; do rtype+=(thm); rval+=($t); rcnt+=(0); done
-    fi
+    [[ -n $flt || -n ${exp[$g]} ]] || continue
+    cs=() loose=()
+    for t in $ts; do
+      c=${TTHEME_CATALOG[$t]}
+      if [[ -n $c && $g == *@* ]]; then
+        (( ${cs[(Ie)$c]} )) || cs+=($c)
+      else
+        loose+=($t)
+      fi
+    done
+    for c in $cs; do
+      inside=()
+      for t in $ts; do
+        [[ ${TTHEME_CATALOG[$t]} == "$c" ]] && inside+=($t)
+      done
+      rtype+=(cat); rval+=("$g/$c"); rcnt+=(${#inside})
+      if [[ -n $flt || -n ${exp[$g/$c]} ]]; then
+        for t in $inside; do rtype+=(thm); rval+=($t); rcnt+=(0); done
+      fi
+    done
+    for t in $loose; do rtype+=(thm); rval+=($t); rcnt+=(0); done
   done
 }
 
+__tt_pv_at() {
+  local i
+  for (( i = 1; i <= ${#rval}; i++ )); do
+    [[ ${rtype[i]} == (hdr|cat) && ${rval[i]} == "$1" ]] && { cur=$i; return 0 }
+  done
+  return 0
+}
+
 __tt_pv_first() {
   local name=$1 i
   cur=1 top=1
@@ -707,8 +743,9 @@ __tt_pv_first() {
 }
 
 __tt_pv_goto() {
-  local name=$1 i
-  exp[${TTHEME_GROUP[$name]:-Other}]=1
+  local name=$1 i g=${TTHEME_GROUP[$1]:-Other} c=${TTHEME_CATALOG[$1]}
+  exp[$g]=1
+  [[ -n $c && $g == *@* ]] && exp[$g/$c]=1
   __tt_pv_rows
   for (( i = 1; i <= ${#rval}; i++ )); do
     [[ ${rtype[i]} == thm && ${rval[i]} == $name ]] && { cur=$i; return 0 }
@@ -738,16 +775,19 @@ __tt_pv_toggle() {
 
 __tt_pv_left() {
   [[ -n $flt ]] && return 0
-  if [[ ${rtype[cur]} == hdr ]]; then
-    [[ -n ${exp[${rval[cur]}]} ]] && __tt_pv_toggle
+  if [[ ${rtype[cur]} == (hdr|cat) ]]; then
+    if [[ -n ${exp[${rval[cur]}]} ]]; then
+      __tt_pv_toggle
+    elif [[ ${rtype[cur]} == cat ]]; then
+      __tt_pv_at ${rval[cur]%%/*}
+    fi
     return 0
   fi
-  local g=${TTHEME_GROUP[${rval[cur]}]:-Other} i
-  for (( i = cur; i >= 1; i-- )); do
-    [[ ${rtype[i]} == hdr ]] && { cur=$i; break }
-  done
+  local g=${TTHEME_GROUP[${rval[cur]}]:-Other} c=${TTHEME_CATALOG[${rval[cur]}]}
+  [[ -n $c && $g == *@* ]] && g=$g/$c
   exp[$g]=""
   __tt_pv_rows
+  __tt_pv_at $g
 }
 
 typeset -gA TTHEME_GLYPHS=(
@@ -815,7 +855,7 @@ __tt_pv_hl() {
 }
 
 __tt_pv_row() {
-  local t=${rval[$1]} b=$'\e[1m' d=$'\e[2m' r=$'\e[22;24;39m' z=$'\e[0m' on="" gut="  " base="" lead=$'\e[2m' mark=" " name arrow=▸
+  local t=${rval[$1]} b=$'\e[1m' d=$'\e[2m' r=$'\e[22;24;39m' z=$'\e[0m' on="" gut="  " base="" lead=$'\e[2m' mark=" " name arrow=▸ ind="   "
   local -i w
   (( color )) || b= d= r= z= lead=
   if (( $1 == cur )); then
@@ -823,7 +863,7 @@ __tt_pv_row() {
     (( color )) && on=$sb
   fi
   if [[ ${rtype[$1]} == rule ]]; then
-    name='── markets '
+    name='── Markets '
     REPLY="   "$d$name${(l:lw - 4 - ${#name}::─:)}$z
     return 0
   fi
@@ -843,19 +883,37 @@ __tt_pv_row() {
     REPLY=$gut$on" "$lead$arrow$r" "$base$REPLY$r${(l:w:: :)}$d${rcnt[$1]}$r" "$z
     return 0
   fi
+  if [[ ${rtype[$1]} == cat ]]; then
+    [[ -n $flt || -n ${exp[$t]} ]] && arrow=▾
+    name=${t#*/}
+    (( ${(m)#name} > lw - 12 )) && name="${name[1,lw-13]}…"
+    base=$b
+    if (( color )) && [[ $t == "$acat" ]]; then
+      base+=$ac lead=$ac
+    elif (( $1 == cur )); then
+      lead=""
+    fi
+    __tt_pv_hl "$name" "$base"
+    w=$(( lw - 8 - ${(m)#name} - ${#rcnt[$1]} ))
+    (( w < 1 )) && w=1
+    REPLY=$gut$on"   "$lead$arrow$r" "$base$REPLY$r${(l:w:: :)}$d${rcnt[$1]}$r" "$z
+    return 0
+  fi
   if (( $1 == cur )); then
     mark=$ac"■"$r base=$b
   elif [[ -n $cdot && $t == "$cn" ]]; then
     mark=$cdot
   fi
-  __tt_pv_hl "$t" "$base"
+  name=${t##*/}
+  [[ -n ${TTHEME_CATALOG[$t]} && ${TTHEME_GROUP[$t]} == *@* ]] && ind="     "
+  __tt_pv_hl "$name" "$base"
   if (( color )); then
     [[ -n ${tstrip[$t]} ]] || __tt_pv_strip $t
-    w=$(( lw - 19 - ${#t} ))
+    w=$(( lw - 16 - ${#ind} - ${#name} ))
     (( w < 1 )) && w=1
-    REPLY=$gut$on"   $mark $base$REPLY$r${(l:w:: :)}${tstrip[$t]} "$z
+    REPLY=$gut$on"$ind$mark $base$REPLY$r${(l:w:: :)}${tstrip[$t]} "$z
   else
-    REPLY="$gut   $mark $REPLY"
+    REPLY="$gut$ind$mark $REPLY"
   fi
 }
 
@@ -893,9 +951,9 @@ __tt_pv_foot() {
       note=$REPLY
       (( pk == 2 )) && note+="/**"
     elif (( pk == 1 )); then
-      note="until this tab closes"
+      note="Until this tab closes"
     else
-      note="new tabs · the default palette"
+      note="New tabs · the default palette"
     fi
     kk=(enter) kl=(confirm)
     right=$b"esc"$z$d" back"$z
@@ -919,7 +977,7 @@ __tt_pv_foot() {
     [[ -n $flt ]] && badge=FILTER
     if (( ! ${#rval} )); then
       kk=(bksp) kl=(edit)
-    elif [[ ${rtype[cur]} == hdr ]]; then
+    elif [[ ${rtype[cur]} == (hdr|cat) ]]; then
       if [[ -z $flt && -n ${exp[${rval[cur]}]} ]]; then
         kk=(←) kl=(close)
       elif [[ -z $flt ]]; then
@@ -992,19 +1050,19 @@ __tt_pv_foot() {
 __tt_pv_help() {
   local back="the tab" z=$'\e[0m' b=$'\e[1m' blank
   [[ -n ${TTHEME_PALETTE[$cn]} ]] && back=$cn
-  local -a hk=(move series filter apply) hv=(
+  local -a hk=(Move Series Filter Apply) hv=(
     "↑↓  home  end  pgup  pgdn"
     "←→  ·  enter or space on a series"
     "a-z 0-9 -  ·  bksp  ·  ctrl-u clears"
     "enter  ·  esc restores $back"
   )
   if (( bgcw )); then
-    hk+=("tune bg" "" "" "" "")
+    hk+=("Tune bg" "" "" "" "")
     hv+=("tab  ·  finds one on the boorus, or takes your own, if none" "↑↓ field  ←→ step  ⇧←→ ×10  1-9 place" "space hides  ·  = default  ·  f adds one from the boorus or your own" "enter keeps  ·  esc undoes" ",  .  other saved images  ·  D removes this one")
   fi
-  hk+=(config "")
+  hk+=(Config "")
   hv+=("alt-c  ·  ↑↓ setting  ←→ value" "enter saves  ·  esc undoes")
-  hk+=(close)
+  hk+=(Close)
   hv+=("?  esc")
   (( color )) || z= b=
   local -i i r x y w hh
@@ -1020,7 +1078,7 @@ __tt_pv_help() {
   x=$(( (pw - w) / 2 + 1 )) y=$(( (ph - hh) / 2 ))
   (( y < 4 )) && y=4
   blank=${(l:w:: :)}
-  out+=$'\e['$y';'$x'H'"╭─ keys ${(l:$(( w - 9 ))::─:)}╮"
+  out+=$'\e['$y';'$x'H'"╭─ Keys ${(l:$(( w - 9 ))::─:)}╮"
   for (( r = y + 1; r < y + hh - 1; r++ )); do
     out+=$'\e['$r';'$x'H'$blank$'\e['$r';'$x'H│'$'\e['$r';'$(( x + w - 1 ))'H│'
   done
@@ -1104,7 +1162,7 @@ __tt_pv_tune() {
       ;;
     $'\r'|$'\n')
       if [[ "${bgsize[$tune]} ${bgpos[$tune]} ${bgop[$tune]} ${bgoff[$tune]}" != "$tsnap" ]]; then
-        bgedit[$tune]=1 msg="kept · saved when preview closes" msgt=200
+        bgedit[$tune]=1 msg="Kept · saved when preview closes" msgt=200
       fi
       tune=""
       ;;
@@ -1184,11 +1242,11 @@ __tt_pv_conf_save() {
   fi
   __tt_tilde "$TTHEME_CONFIG"
   if __tt_config_write "${pairs[@]}"; then
-    conf=0 msg="saved · $REPLY" msgt=200
+    conf=0 msg="Saved · $REPLY" msgt=200
     (( ${pairs[(Ie)TTHEME_BG_BLUR]} )) && __tt_pv_redraw
   else
     __tt_pv_unconf
-    msg="could not write $REPLY" msgt=200
+    msg="Could not write $REPLY" msgt=200
   fi
 }
 
@@ -1200,7 +1258,7 @@ __tt_pv_redraw() {
     done
   fi
   bgedit=()
-  msg="drawing the background pictures again" msgt=300
+  msg="Drawing the background pictures again" msgt=300
   printf '\e[?2026h'
   __tt_pv_draw
   __tt_pv_bg_close
@@ -1208,7 +1266,7 @@ __tt_pv_redraw() {
   bgsrc=() resized=1 bgname="" bgshown="" bgdim=()
   __tt_reload
   (( $+functions[__tt_bg_refresh] )) && __tt_bg_refresh $TTHEME_ORDER
-  msg=${${out//$'\n'/ }:-"saved · no background pictures to draw"} msgt=300
+  msg=${${out//$'\n'/ }:-"Saved · no background pictures to draw"} msgt=300
 }
 
 __tt_pv_conf_panel() {
@@ -1270,7 +1328,7 @@ __tt_pv_flush() {
 }
 
 __tt_pv_draw() {
-  local out line cnt ex ag="" ac="" sb="" dd="" zz="" state=on src="" REPLY
+  local out line cnt ex ag="" acat="" ac="" sb="" dd="" zz="" state=on src="" REPLY
   local -i lw sw split sc se=$(( pw - 2 )) h k i N=${#rval} mt=${#TTHEME_ORDER} wiped=0
   __tt_pv_lw
   lw=$reply[1] sw=$reply[2]
@@ -1291,7 +1349,10 @@ __tt_pv_draw() {
       printf -v ac '\e[38;2;%d;%d;%dm' $((16#${acx:0:2})) $((16#${acx:2:2})) $((16#${acx:4:2}))
       printf -v sb '\e[48;2;%d;%d;%dm' $((16#${sbx:0:2})) $((16#${sbx:2:2})) $((16#${sbx:4:2}))
     fi
-    [[ ${rtype[cur]} == thm ]] && ag=${TTHEME_GROUP[${rval[cur]}]:-Other}
+    if [[ ${rtype[cur]} == thm ]]; then
+      ag=${TTHEME_GROUP[${rval[cur]}]:-Other}
+      [[ -n ${TTHEME_CATALOG[${rval[cur]}]} ]] && acat=$ag/${TTHEME_CATALOG[${rval[cur]}]}
+    fi
   fi
   if [[ -n $flt ]]; then
     local -a mm=(${(M)rtype:#thm})
@@ -1307,7 +1368,7 @@ __tt_pv_draw() {
   if (( pw < 40 || ph < 12 )); then
     line="ttheme preview"
     (( color )) && line=$'\e[1m'$ac$line$'\e[0m'
-    out+=$line$'\e[K\n'"needs 40×12 — now ${pw}×${ph}"$'\e[K\n'
+    out+=$line$'\e[K\n'"Needs 40×12 — now ${pw}×${ph}"$'\e[K\n'
     line="esc quits"
     (( color )) && line=$'\e[2m'$line$'\e[0m'
     out+=$line$'\e[K\e[J'
@@ -1340,7 +1401,7 @@ __tt_pv_draw() {
         ex="${ex[1,gkeep]}▏"
       fi
     fi
-    line="   "$dd"search… e.g. $ex"$zz
+    line="   "$dd"Search… e.g. $ex"$zz
   fi
   local tail=$'\e['$(( lw - ${#cnt} ))'G'$dd$cnt$zz
   [[ -n $flt ]] && tail=$'\e['$(( lw - ${#cnt} ))'G'$cnt
@@ -1357,7 +1418,7 @@ __tt_pv_draw() {
     line=""
     if (( k < h )); then
       if (( ! N )); then
-        (( k == 0 )) && line="   ${dd}no palettes match '$flt'$zz"
+        (( k == 0 )) && line="   ${dd}No palettes match '$flt'$zz"
       elif (( i <= N )); then
         __tt_pv_row $i
         line=$REPLY
@@ -1370,20 +1431,20 @@ __tt_pv_draw() {
   __tt_pv_foot $(( split ? se : pw ))
   if (( split )); then
     if (( help && sw >= 48 )); then
-      __tt_pv_head 1 $sc $se keys
+      __tt_pv_head 1 $sc $se Keys
       __tt_pv_help
     elif [[ -n $tune ]]; then
       (( bgoff[$tune] )) && state=off
-      src=background
+      src=Background
       [[ -n ${bgfrom[$tune]} ]] && src+=" · ${bgfrom[$tune]}"
-      (( ${#tune} + ${#src} + 6 > sw )) && src=background
+      (( ${#tune} + ${#src} + 6 > sw )) && src=Background
       __tt_pv_head 1 $sc $se $tune "$src" $state
       __tt_pv_bg_panel $tune 4 $sc $se
     elif (( conf )); then
       __tt_tilde "$TTHEME_CONFIG"
       src=$REPLY
       (( 8 + ${#src} > sw )) && src=""
-      __tt_pv_head 1 $sc $se config "" "$src"
+      __tt_pv_head 1 $sc $se Config "" "$src"
       __tt_pv_conf_panel 4 $sc $se
     else
       [[ -n $an ]] && src=${TTHEME_SRC[$an]}
@@ -1395,13 +1456,13 @@ __tt_pv_draw() {
   else
     if [[ -n $tune ]]; then
       (( bgoff[$tune] )) && state=off
-      src=background
+      src=Background
       [[ -n ${bgfrom[$tune]} ]] && src+=" · ${bgfrom[$tune]}"
-      (( ${#tune} + ${#src} + 6 > lw )) && src=background
+      (( ${#tune} + ${#src} + 6 > lw )) && src=Background
       __tt_pv_head $(( ph - 9 )) 1 $lw $tune "$src" $state
       __tt_pv_bg_panel $tune $(( ph - 8 )) 1 $lw
     elif (( conf )); then
-      __tt_pv_head $(( ph - 7 )) 1 $lw config
+      __tt_pv_head $(( ph - 7 )) 1 $lw Config
       __tt_pv_conf_panel $(( ph - 6 )) 1 $lw
     fi
     (( help )) && __tt_pv_help
@@ -1597,13 +1658,13 @@ __tt_pv_handle() {
           sel=${rval[cur]}
           return 1
         fi
-      elif [[ ${rtype[cur]} == hdr ]]; then
+      elif [[ ${rtype[cur]} == (hdr|cat) ]]; then
         __tt_pv_toggle
       fi
       ;;
     up) (( cur > 1 )) && cur=$(( cur - 1 )); [[ ${rtype[cur]} == rule ]] && cur=$(( cur - 1 )) ;;
     down) (( cur < ${#rval} )) && cur=$(( cur + 1 )); [[ ${rtype[cur]} == rule ]] && cur=$(( cur + 1 )) ;;
-    right) [[ ${rtype[cur]} == hdr && -z ${exp[${rval[cur]}]} ]] && __tt_pv_toggle ;;
+    right) [[ ${rtype[cur]} == (hdr|cat) && -z ${exp[${rval[cur]}]} ]] && __tt_pv_toggle ;;
     left) __tt_pv_left ;;
     home) cur=1 ;;
     end) (( ${#rval} )) && cur=${#rval} ;;
@@ -1618,7 +1679,7 @@ __tt_pv_handle() {
       (( cur < 1 )) && cur=1
       [[ ${rtype[cur]} == rule ]] && cur=$(( cur + 1 ))
       ;;
-    ' ') [[ ${rtype[cur]} == hdr ]] && __tt_pv_toggle ;;
+    ' ') [[ ${rtype[cur]} == (hdr|cat) ]] && __tt_pv_toggle ;;
     $'\t')
       [[ ${rtype[cur]} == thm ]] || return 0
       name=${rval[cur]}
@@ -1627,7 +1688,7 @@ __tt_pv_handle() {
       elif __tt_pv_bg_findable $name; then
         :
       elif (( bgcw )); then
-        msg="no background image for $name" msgt=200
+        msg="No background image for $name" msgt=200
       fi
       ;;
     altc)
@@ -1672,19 +1733,19 @@ __tt_preview() {
   local -a bgorder=()
   local -A bgfrom=() bgsent=() bgcost=() bgdim=() bgsrc=() bgfill=() bgfocus=() bgsize=() bgpos=() bgop=() bgdef=() bgoff=() bgbase=() bgload=() bgshot=() bgshotkey=() bgedit=() bgtunef=() bgofff=() bgimages=()
   local conf=0 cf=1
-  local -a plabel=(" this tab " " default ") csnap=()
-  local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT TTHEME_BG_BLUR) clabel=("new tabs" announce "search fx" sort blur)
+  local -a plabel=(" This tab " " Default ") csnap=()
+  local -a cvars=(TTHEME_TAB_PALETTE TTHEME_ANNOUNCE TTHEME_FX TTHEME_SORT TTHEME_BG_BLUR) clabel=("New tabs" Announce "Search fx" Sort Blur)
   local -a cchoice=("off seq" "1 0" "typewriter decode glitch" "abc series" "0 1 2 3 4") cshow=("off seq" "on off" "typewriter decode glitch" "abc series" "off 1px 2px 3px 4px")
   local -A cnote=(
-    TTHEME_TAB_PALETTE:seq "new tabs rotate through palettes" TTHEME_TAB_PALETTE:off "new tabs keep the terminal theme"
-    TTHEME_ANNOUNCE:1 "shows the palette notice" TTHEME_ANNOUNCE:0 "silences the palette notice"
-    TTHEME_FX:typewriter "the search hint types itself" TTHEME_FX:decode "the search hint decodes" TTHEME_FX:glitch "the search hint glitches in"
-    TTHEME_SORT:abc "series and palettes by name" TTHEME_SORT:series "series in the order added"
-    TTHEME_BG_BLUR:0 "pictures stay sharp" TTHEME_BG_BLUR:1 "pictures soften a little behind the text"
-    TTHEME_BG_BLUR:2 "pictures soften behind the text" TTHEME_BG_BLUR:3 "pictures blur behind the text"
-    TTHEME_BG_BLUR:4 "pictures blur well behind the text"
+    TTHEME_TAB_PALETTE:seq "New tabs rotate through palettes" TTHEME_TAB_PALETTE:off "New tabs keep the terminal theme"
+    TTHEME_ANNOUNCE:1 "Shows the palette notice" TTHEME_ANNOUNCE:0 "Silences the palette notice"
+    TTHEME_FX:typewriter "The search hint types itself" TTHEME_FX:decode "The search hint decodes" TTHEME_FX:glitch "The search hint glitches in"
+    TTHEME_SORT:abc "Series and palettes by name" TTHEME_SORT:series "Series in the order added"
+    TTHEME_BG_BLUR:0 "Pictures stay sharp" TTHEME_BG_BLUR:1 "Pictures soften a little behind the text"
+    TTHEME_BG_BLUR:2 "Pictures soften behind the text" TTHEME_BG_BLUR:3 "Pictures blur behind the text"
+    TTHEME_BG_BLUR:4 "Pictures blur well behind the text"
   )
-  [[ $mode == pin ]] && pkdef=2 plabel=(" this directory " " and below ")
+  [[ $mode == pin ]] && pkdef=2 plabel=(" This directory " " And below ")
   [[ $mode == init ]] && pkdef=2
   __tt_pv_canpick
   __tt_pv_size
@@ -1829,9 +1890,11 @@ if (( $+functions[compdef] )); then
       compadd -- add remove search init
     elif [[ $words[2] == market && $words[3] == (add|init) && CURRENT == 4 ]]; then
       _files -/
+    elif [[ $words[2] == add && $words[CURRENT-1] == --market ]]; then
+      _files -/
     elif [[ $words[2] == add ]]; then
       reply=(${${${(M)${(f)"$(__tt_cli list --json 2>/dev/null)"}:#*\"name\": *}#*\"name\": \"}%%\"*})
-      compadd -- ${reply:|TTHEME_ORDER}
+      compadd -- --market ${reply:|TTHEME_ORDER}
     fi
   }
   compdef __tt_complete ttheme