@kecan0406/ttheme 1.2.17 → 1.2.18

package/shell/preview.zsh

@@ -157,7 +157,7 @@ typeset -gA TTHEME_GLYPHS=(
 )
 
 __tt_pv_osd() {
-  local text=${(U)osd} bits line oc=$'\e[1m' blank
+  local text=${(U)osd} bits line oc=$TTHEME_SGR[bold] blank
   local -i s=2 n=${#text} w r c k i top left
   (( n * 16 + 4 <= pw && ph >= 14 )) || s=1
   w=$(( n * 8 * s - 2 * s + 4 ))
@@ -186,7 +186,7 @@ __tt_pv_osd() {
     done
     line+="  "
     for (( i = 0; i < s; i++ )); do
-      out+=$'\e['$(( top + r * s + i ))';'${left}H$oc$line$'\e[0m'
+      out+=$'\e['$(( top + r * s + i ))';'${left}H$oc$line$TTHEME_SGR[reset]
     done
   done
   out+=$'\e['$(( top + 5 * s ))';'${left}H$blank
@@ -217,7 +217,7 @@ __tt_pv_hl() {
   REPLY=$t
   (( color )) && [[ -n $flt && $lt == *$flt* ]] || return 0
   pre=${lt%%$flt*}
-  REPLY=${t[1,${#pre}]}$'\e[1;4m'$ac${t[${#pre}+1,${#pre}+${#flt}]}$'\e[22;24;39m'$2${t[${#pre}+${#flt}+1,-1]}
+  REPLY=${t[1,${#pre}]}$hm${t[${#pre}+1,${#pre}+${#flt}]}$TTHEME_SGR[/match]$2${t[${#pre}+${#flt}+1,-1]}
 }
 
 __tt_pv_fit() {
@@ -233,11 +233,11 @@ __tt_pv_fit() {
 }
 
 __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=▸ ind="   " hl extra part
+  local t=${rval[$1]} b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] r=$TTHEME_SGR[/match] z=$TTHEME_SGR[reset] on="" gut="  " base="" lead=$TTHEME_SGR[dim] mark=" " name arrow=▸ ind="   " hl extra part
   local -i w
   (( color )) || b= d= r= z= lead=
   if (( $1 == cur )); then
-    gut=$ac"▌"$r" "
+    gut=$gc"▌"$r" "
     (( color )) && on=$sb
   fi
   if [[ ${rtype[$1]} == rule ]]; then
@@ -282,14 +282,18 @@ __tt_pv_row() {
     return 0
   fi
   if (( $1 == cur )); then
-    mark=$ac"■"$r base=$b
+    mark=$gc"■"$r base=$b
   elif [[ -n $cdot && $t == "$cn" ]]; then
-    mark=$cdot
+    mark=$ac$cdot$r
   fi
   name=${t##*/}
   [[ -n ${TTHEME_CATALOG[$t]} && ${TTHEME_GROUP[$t]} == *@* ]] && ind="     "
   __tt_pv_hl "$name" "$base"
   hl=$REPLY
+  if (( ${TTHEME_TUNED[(Ie)$t]} )); then
+    (( color )) && hl+=" "$TTHEME_SGR[warn]"●"$TTHEME_SGR[/warn] || hl+=" ●"
+    w=-2
+  fi
   extra=""
   for part in "${(@s:|:)TTHEME_NATIVE_NAMES[$t]}" "${TTHEME_CHARACTER[$t]}" "${(@s:|:)TTHEME_ALIASES[$t]}"; do
     __tt_pv_alias "$name" "$part"
@@ -297,7 +301,7 @@ __tt_pv_row() {
   done
   if (( color )); then
     [[ -n ${tstrip[$t]} ]] || __tt_pv_strip $t
-    w=$(( lw - 16 - ${#ind} - ${#name} ))
+    w=$(( w + lw - 16 - ${#ind} - ${#name} ))
     __tt_pv_fit "$extra"
     (( w < 1 )) && w=1
     REPLY=$gut$on"$ind$mark $base$hl$r$REPLY${(l:w:: :)}${tstrip[$t]} "$z
@@ -314,13 +318,13 @@ __tt_pv_bg_credit() {
   (( ${#REPLY} > room )) && REPLY=${by:+by $by}
   (( ${#REPLY} > room )) && REPLY=""
   [[ -n $mark && $REPLY == *"$mark$ref"* ]] || return 0
-  (( color )) && [[ -n ${TTHEME_SITE_ANSI[${ref%% *}]} ]] && sgr=$'\e[3'${TTHEME_SITE_ANSI[${ref%% *}]}m
-  REPLY=${REPLY/"$mark$ref"/$sgr⧉${sgr:+$'\e[39m'} $'\e]8;;'$url$'\e\\'$ref$'\e]8;;\e\\'}
+  (( color )) && [[ -n ${TTHEME_SITE_ANSI[${ref%% *}]} ]] && sgr=$TTHEME_SGR[fg${TTHEME_SITE_ANSI[${ref%% *}]}]
+  REPLY=${REPLY/"$mark$ref"/$sgr⧉${sgr:+$TTHEME_SGR[/fg]} $'\e]8;;'$url$'\e\\'$ref$'\e]8;;\e\\'}
   return 0
 }
 
 __tt_pv_bar() {
-  local z=$'\e[0m' d=$'\e[2m' on=$'\e[7;1m'$ac line=" " title hint="tab next"
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] on=$pl line=" " title hint="tab next"
   local -i i at=${TTHEME_HUB_TABS[(Ie)preview]} len=${#TTHEME_HUB_TITLES}
   (( color )) || z= d= on=
   [[ ${rtype[cur]} == thm ]] && hint="⇧tab switch"
@@ -346,9 +350,9 @@ __tt_pv_bar() {
 }
 
 __tt_pv_head() {
-  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' right=$6
+  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] right=$6
   (( color )) || b= d= z=
-  out+=$'\e['$1';'$2'H'$b$ac$4$z
+  out+=$'\e['$1';'$2'H'$b$gc$4$z
   [[ -n $5 ]] && out+="  "$d$5$z
   [[ -n $right ]] && out+=$'\e['$(( $3 - ${(m)#right} + 1 ))'G'$d$right$z
   return 0
@@ -356,7 +360,7 @@ __tt_pv_head() {
 
 __tt_pv_foot() {
   setopt localoptions extendedglob
-  local b=$'\e[1m' d=$'\e[2m' z=$'\e[0m' y=$'\e[33m' on=$'\e[7;1m'$ac badge="" lead="" note="" right="" text line plain hex tb=EDIT
+  local b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] y=$TTHEME_SGR[warn] on=$pl badge="" lead="" note="" right="" text line plain hex tb=EDIT
   local -a kk=() kl=() seg=()
   local -i end=$1 i lwid rwid room
   (( color )) || b= d= z= y= on=
@@ -394,6 +398,8 @@ __tt_pv_foot() {
     right=$b"esc"$z$d" back"$z
   elif (( te && tfocus == 0 )); then
     badge=$tb kk=(enter ↑↓ s ⇧enter) kl=("edit palette" move save apply)
+    (( tbtn )) && kl[1]="reset palette"
+    (( ${TTHEME_TUNED[(Ie)$tename]} )) && kk[2]=↑↓←→
     right=$b"esc"$z$d" cancel"$z
   elif (( te && tfocus == 2 )); then
     badge=$tb kk=(enter ↑↓ s) kl=(apply move save)
@@ -448,7 +454,7 @@ __tt_pv_foot() {
       right=$b"esc"$z$d" clear filter"$z
     else
       right=$b"esc"$z$d" restore"$z
-      [[ -n $cdot ]] && right+=" $cdot$z $cn"
+      [[ -n $cdot ]] && right+=" $ac$cdot$z $cn"
     fi
   fi
   if (( msgt > 0 )) && [[ -z $pick ]]; then
@@ -470,7 +476,7 @@ __tt_pv_foot() {
     line=${(j:   :)seg}
     if [[ -n $badge ]]; then
       if (( color )); then
-        line=$'\e[7;1m'$ac" $badge "$z"  "$line
+        line=$on" $badge "$z"  "$line
       else
         line="[$badge] $line"
       fi
@@ -521,7 +527,7 @@ __tt_pv_foot() {
 }
 
 __tt_pv_help() {
-  local back="the tab" z=$'\e[0m' b=$'\e[1m' blank
+  local back="the tab" z=$TTHEME_SGR[reset] b=$TTHEME_SGR[bold] blank
   [[ -n ${TTHEME_PALETTE[$cn]} ]] && back=$cn
   local -a hk=() hv=()
   if (( te )); then
@@ -560,7 +566,7 @@ __tt_pv_help() {
     hv+=("?  esc")
   fi
   (( color )) || z= b=
-  local -i i r x y w hh
+  local -i i r x y w hh floor
   if (( split && sw >= 48 )); then
     for (( i = 1; i <= ${#hk}; i++ )); do
       r=$(( i + 3 ))
@@ -572,7 +578,10 @@ __tt_pv_help() {
   w=$(( pw - 2 < 58 ? pw - 2 : 58 )) hh=$(( ${#hk} + 4 ))
   (( te )) && w=$(( pw - 2 < 76 ? pw - 2 : 76 ))
   x=$(( (pw - w) / 2 + 1 )) y=$(( (ph - hh) / 2 ))
-  (( y < 4 )) && y=4
+  floor=$(( te && ! split ? 4 : pvhd + 2 ))
+  (( y < floor )) && y=$floor
+  (( y > ph - hh )) && y=$(( ph - hh ))
+  (( y < 1 )) && y=1
   blank=${(l:w:: :)}
   out+=$'\e['$y';'$x'H'"╭─ Help ${(l:$(( w - 9 ))::─:)}╮"
   for (( r = y + 1; r < y + hh - 1; r++ )); do
@@ -588,8 +597,8 @@ __tt_pv_help() {
 __tt_pv_specimen() {
   local -a sp=(${=applied}) lines parts
   (( ${#sp} >= 20 )) || return 0
-  local z=$'\e[0m' d=$'\e[2m' cell hex fore line text piece role tabs="" built="" key="$applied|$painted|$scene|$sw|$sc|$ph"
-  local -A rs=(p "" d $'\e[2m' b $'\e[1m')
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] cell hex fore line text piece role tabs="" built="" key="$applied|$painted|$scene|$sw|$sc|$ph"
+  local -A rs=(p "" d $TTHEME_SGR[dim] b $TTHEME_SGR[bold])
   local -i i r=6 cw=4 k n=${#TTHEME_SCENES} at
   (( n )) || return 0
   if [[ $key == "$pvscene" ]]; then
@@ -624,13 +633,13 @@ __tt_pv_specimen() {
     for (( k = 1; k <= n; k++ )); do
       (( k > 1 )) && tabs+="  "
       if (( k == at )); then
-        tabs+=$'\e[1m'$ac$TTHEME_SCENES[k]$z
+        tabs+=$TTHEME_SGR[bold]$ac$TTHEME_SCENES[k]$z
       else
         tabs+=$d$TTHEME_SCENES[k]$z
       fi
     done
   else
-    tabs=$'\e[1m'$ac$TTHEME_SCENES[at]$z"  "$d"$at/$n"$z
+    tabs=$TTHEME_SGR[bold]$ac$TTHEME_SCENES[at]$z"  "$d"$at/$n"$z
   fi
   built+=$'\e[2;'$sc'H'$tabs
   (( sw < 44 )) && cw=3
@@ -639,7 +648,7 @@ __tt_pv_specimen() {
   line=""
   for (( i = 0; i < 8; i++ )); do
     fore=${sp[i+5]#\#} hex=${sp[i+13]#\#}
-    printf -v cell '\e[38;2;%d;%d;%d;48;2;%d;%d;%dm%s\e[0m ' \
+    printf -v cell "\e[38;2;%d;%d;%d;48;2;%d;%d;%dm%s${TTHEME_SGR[/ink]} " \
       $((16#${fore:0:2})) $((16#${fore:2:2})) $((16#${fore:4:2})) \
       $((16#${hex:0:2})) $((16#${hex:2:2})) $((16#${hex:4:2})) "${(l:cw::▀:)}"
     line+=$cell
@@ -808,6 +817,7 @@ __tt_pv_conf_save() {
   __tt_tilde "$TTHEME_CONFIG"
   if __tt_config_write "${pairs[@]}"; then
     conf=0 msg="Saved · $REPLY" msgt=200
+    (( ${pairs[(Ie)TTHEME_TAB_PALETTE]} )) && __tt_cli sync > /dev/null 2>&1 && __tt_reload
     (( ${pairs[(Ie)TTHEME_BG_BLUR]} )) && __tt_pv_redraw
   else
     __tt_pv_unconf
@@ -834,7 +844,7 @@ __tt_pv_redraw() {
 }
 
 __tt_pv_conf_panel() {
-  local z=$'\e[0m' b=$'\e[1m' d=$'\e[2m' c=$ac on=$'\e[7;1m'$ac var v note
+  local z=$TTHEME_SGR[reset] b=$TTHEME_SGR[bold] d=$TTHEME_SGR[dim] c=$ac on=$pl var v note
   local -a ch sh
   local -i r0=$1 col=$2 end=$3 k i j fit=1
   (( color )) || z= b= d= c= on=
@@ -904,11 +914,11 @@ __tt_pv_flush() {
   elif (( ${#bgthumb} )); then
     __tt_pv_bg_strip_off
   fi
-  printf '\e[1;%dH\e[?2026l' $(( 4 + ${(m)#flt} ))
+  printf '\e[%d;%dH\e[?2026l' $pvsr $pvsc
 }
 
 __tt_pv_reach() {
-  local key=${pkeys[pk]} base top k home=${HOME:a} here=${PWD:a} htip="" d=$'\e[2m' z=$'\e[0m' REPLY
+  local key=${pkeys[pk]} base top k home=${HOME:a} here=${PWD:a} htip="" d=$TTHEME_SGR[dim] z=$TTHEME_SGR[reset] REPLY
   local -A own=() below=() parent=() mark=() tstrip=()
   local -a roots=() lp=() lpw=() ll=() lat=() lpal=() lnote=() lflag=() reply was=()
   local -A TTHEME_PINS=("${(@kv)TTHEME_PINS}")
@@ -941,7 +951,7 @@ __tt_pv_reach() {
     __tt_map_build "$top"
   fi
   __tt_map_fit $1
-  (( ${#reply} > room )) && reply=("${(@)reply[1,room-1]}" "   …")
+  (( ${#reply} > room )) && reply=("${(@)reply[1,room-1]}" "    …")
   reach=("${reply[@]}")
   [[ $key == /* || ${#was} -gt 0 ]] && reach+=("")
   __tt_pin_where "$key"
@@ -959,8 +969,8 @@ __tt_pv_reach() {
 }
 
 __tt_pv_draw() {
-  local out line cnt ex ag="" acat="" ac="" sb="" dd="" zz="" state=on src="" nflt="" rsub="" REPLY
-  local -i lw sw split sc se=$(( pw - 2 )) h k i N=${#rval} mt=${#TTHEME_ORDER} wiped=0
+  local out line cnt ex ag="" acat="" ac="" gc="" pl="" hm="" sb="" dd="" zz="" state=on src="" nflt="" rsub="" REPLY
+  local -i lw sw split sc se=$(( pw - 2 )) h k i N=${#rval} mt=${#TTHEME_ORDER} wiped=0 tall=$(( ph >= 22 )) hd
   local -a held
   bgstrip=""
   if [[ -n $flt ]]; then
@@ -970,15 +980,16 @@ __tt_pv_draw() {
   __tt_pv_lw
   lw=$reply[1] sw=$reply[2]
   split=$(( sw > 0 )) sc=$(( pw - 1 - sw ))
-  h=$(( ph - 5 ))
-  (( conf && ! split )) && h=$(( ph - 6 - ${#cvars} ))
+  hd=$(( tall ? hub + 4 : 2 )) pvhd=$hd
+  h=$(( ph - hd - 3 ))
+  (( conf && ! split )) && h=$(( ph - hd - 4 - ${#cvars} ))
   reach=()
   if [[ -n $pick && $mode == pin ]]; then
     if (( split )); then
       __tt_pv_reach $sw $(( ph - 6 ))
     else
-      __tt_pv_reach $se $(( ph - 13 ))
-      h=$(( ph - 6 - ${#reach} ))
+      __tt_pv_reach $se $(( ph - hd - 11 ))
+      h=$(( ph - hd - 4 - ${#reach} ))
     fi
   fi
   (( h < 1 )) && h=1
@@ -987,12 +998,16 @@ __tt_pv_draw() {
   (( top < 1 )) && top=1
   (( N > h && top > N - h + 1 )) && top=$(( N - h + 1 ))
   if (( color )); then
-    dd=$'\e[2m' zz=$'\e[0m'
+    dd=$TTHEME_SGR[dim] zz=$TTHEME_SGR[reset] ac=$TTHEME_SGR[accent] pl=$TTHEME_SGR[pill] hm=$TTHEME_SGR[match]
     if [[ -n $applied ]]; then
       local -a ap=(${=applied})
-      local acx=${ap[3]#\#} sbx=${ap[4]#\#}
-      printf -v ac '\e[38;2;%d;%d;%dm' $((16#${acx:0:2})) $((16#${acx:2:2})) $((16#${acx:4:2}))
+      local acx=${ap[3]#\#} sbx=${ap[4]#\#} six=${ap[11]#\#}
+      printf -v gc '\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}))
+      if [[ $applied != "$painted" && -n $six ]]; then
+        printf -v ac '\e[38;2;%d;%d;%dm' $((16#${six:0:2})) $((16#${six:2:2})) $((16#${six:4:2}))
+        pl+=$ac hm+=$ac
+      fi
     fi
     if [[ ${rtype[cur]} == thm ]]; then
       ag=${TTHEME_GROUP[${rval[cur]}]:-Other}
@@ -1013,10 +1028,10 @@ __tt_pv_draw() {
   [[ $1 == hint ]] && (( ! wiped )) || pvz=()
   if (( pw < 40 || ph < 12 )); then
     line="ttheme"
-    (( color )) && line=$'\e[1m'$ac$line$'\e[0m'
+    (( color )) && line=$TTHEME_SGR[bold]$ac$line$TTHEME_SGR[reset]
     out+=$line$'\e[K\n'"Needs 40×12 — now ${pw}×${ph}"$'\e[K\n'
     line="esc quits"
-    (( color )) && line=$'\e[2m'$line$'\e[0m'
+    (( color )) && line=$TTHEME_SGR[dim]$line$TTHEME_SGR[reset]
     out+=$line$'\e[K\e[J'
     __tt_pv_flush
     return 0
@@ -1025,15 +1040,14 @@ __tt_pv_draw() {
     __tt_pv_te_draw
     return 0
   fi
+  local find bd="" edge=${(l:$(( lw - 3 ))::─:)}
+  (( color )) && bd=$TTHEME_SGR[bold]
   if [[ -n $flt ]]; then
-    if (( color )); then
-      line="   "$'\e[1m'$flt$zz$ac$'\e[7m \e[0m'
-    else
-      line="   ${flt}_"
-    fi
+    find=$flt"_"
   else
     ex="$expal | $exgrp"
-    (( ${#ex} > lw - 19 - ${#cnt} )) && ex="${ex[1,lw-20-${#cnt}]}…"
+    local -i room=$(( tall ? lw - 21 : lw - 19 - ${#cnt} ))
+    (( ${#ex} > room )) && ex="${ex[1,room-1]}…"
     if (( gstep > 0 )); then
       local gkeep=$(( ${#ex} * (8 - gstep) / 8 ))
       if [[ $TTHEME_FX == (decode|glitch) ]]; then
@@ -1051,27 +1065,37 @@ __tt_pv_draw() {
         ex="${ex[1,gkeep]}▏"
       fi
     fi
-    line="   "$dd"Search… e.g. $ex"$zz
+    find=$dd"Search… e.g. $ex"$zz
+  fi
+  if (( tall )); then
+    pvsr=$(( hub + 3 )) pvsc=$(( 6 + ${(m)#flt} ))
+    line=$'\e['$lw'X '$dd"│"$zz" "$dd"⌕"$zz" "$find$'\e['$lw'G'$dd"│"$zz
+  else
+    pvsr=$(( hub + 1 )) pvsc=$(( 4 + ${(m)#flt} ))
+    line=$'\e['$lw'X '$dd"⌕"$zz" "$find$'\e['$(( lw - ${#cnt} ))'G'$dd$cnt$zz
   fi
-  local tail=$'\e['$(( lw - ${#cnt} ))'G'$dd$cnt$zz
-  [[ -n $flt ]] && tail=$'\e['$(( lw - ${#cnt} ))'G'$cnt
   if [[ $1 == hint ]] && (( ! wiped )); then
-    print -rn -- $'\e['$(( 1 + hub ))$'H\e[0m\e['$lw'X'$line$tail
-    printf '\e[%d;%dH\e[?2026l' $(( 1 + hub )) $(( 4 + ${(m)#flt} ))
+    print -rn -- $'\e['$pvsr'H'$TTHEME_SGR[reset]$line
+    printf '\e[%d;%dH\e[?2026l' $pvsr $pvsc
     return 0
   fi
   if (( hub )); then
     __tt_pv_bar $(( split ? sc - 2 : pw - 1 ))
-    out+=$REPLY$'\e[K\n'$line$'\e[K'$tail$'\n'
+    out+=$REPLY$'\e[K\n'
+  fi
+  if (( tall )); then
+    out+=" "$bd"Preview"$zz" "$dd"($cnt)"$zz$'\e[K\n'
+    out+=" "$dd"╭"$edge"╮"$zz$'\e[K\n'$line$'\e[K\n'" "$dd"╰"$edge"╯"$zz$'\e[K\n'
   else
-    out+=$line$'\e[K'$tail$'\n\e[K\n'
+    out+=$line$'\e[K\n'
+    (( hub )) || out+=$'\e[K\n'
   fi
   if (( N > h && top > 1 )); then
     out+="   "$dd"…"$zz
-    pvz+=("3 1 $lw more -1")
+    pvz+=("$(( hd + 1 )) 1 $lw more -1")
   fi
   out+=$'\e[K\n'
-  for (( k = 0; k < ph - 4; k++ )); do
+  for (( k = 0; k < ph - hd - 2; k++ )); do
     i=$(( top + k ))
     line=""
     if (( k < h )); then
@@ -1080,15 +1104,15 @@ __tt_pv_draw() {
       elif (( i <= N )); then
         __tt_pv_row $i
         line=$REPLY
-        pvz+=("$(( 4 + k )) 1 $lw row $i")
+        pvz+=("$(( hd + 2 + k )) 1 $lw row $i")
         case ${rtype[i]} in
-          hdr) pvz+=("$(( 4 + k )) 3 5 fold $i") ;;
-          cat) pvz+=("$(( 4 + k )) 5 7 fold $i") ;;
+          hdr) pvz+=("$(( hd + 2 + k )) 3 5 fold $i") ;;
+          cat) pvz+=("$(( hd + 2 + k )) 5 7 fold $i") ;;
         esac
       fi
     elif (( k == h && N > h && top + h <= N )); then
       line="   "$dd"…"$zz
-      pvz+=("$(( 4 + k )) 1 $lw more 1")
+      pvz+=("$(( hd + 2 + k )) 1 $lw more 1")
     fi
     out+=$line$'\e[K\n'
   done
@@ -1167,20 +1191,14 @@ __tt_pv_strip() {
       cell+=" "
     fi
   done
-  tstrip[$1]=$cell$'\e[39m'
+  tstrip[$1]=$cell$TTHEME_SGR[/fg]
 }
 
 __tt_pv_init() {
-  local lo
-  local -a tp
   __tt_pv_group
   [[ -n $orig ]] && __tt_name_of "$orig" && cn=$REPLY
   [[ -n ${TTHEME_PALETTE[$cn]} ]] || return 0
   cdot="◆"
-  (( color )) || return 0
-  tp=(${=TTHEME_PALETTE[$cn]})
-  lo=${tp[3]#\#}
-  printf -v cdot '\e[38;2;%d;%d;%dm◆\e[39m' $((16#${lo:0:2})) $((16#${lo:2:2})) $((16#${lo:4:2}))
 }
 
 __tt_pv_roll() {
@@ -1370,12 +1388,15 @@ __tt_pv_free() {
 }
 
 __tt_pv_press() {
+  [[ $4 == tereset ]] || tearm=0
   case $4 in
     row|fold) __tt_pv_free && [[ ${rtype[$5]} != rule ]] && cur=$5 ;;
     pick) pk=$5 ;;
     conf) cf=$5 ;;
     teimg) (( tfocus == 1 )) || __tt_te_to_image ;;
-    tepal|teedit) tfocus=0 ;;
+    tepal) tfocus=0 ;;
+    teedit) tfocus=0 tbtn=0 ;;
+    tereset) tfocus=0 tbtn=1 ;;
     tefield|track|place|colors)
       (( tfocus == 1 )) || __tt_te_to_image
       case $4 in
@@ -1432,6 +1453,7 @@ __tt_pv_release() {
       ;;
     tefind) __tt_te_find ;;
     teedit) __tt_te_edit ;;
+    tereset) __tt_te_resetting ;;
     teapply) __tt_te_apply || return 1 ;;
     place) __tt_pv_bg_adjust at $5 ;;
     colors)
@@ -1558,7 +1580,7 @@ __tt_te_read() {
 
 __tt_te_open() {
   local name=$1
-  tename=$name tfocus=0 teframe=() tetop=0 msgt=0 te=1
+  tename=$name tfocus=0 teframe=() tetop=0 msgt=0 te=1 tbtn=0 tearm=0
   if ! __tt_te_read; then
     msg="Could not read the colors of $name" msgt=300
     tename="" te=0
@@ -1572,7 +1594,7 @@ __tt_te_open() {
 
 __tt_te_close() {
   [[ -n $tune ]] && __tt_pv_untune
-  te=0 tfocus=0 tename="" teframe=() tetop=0 help=0 pick=""
+  te=0 tfocus=0 tename="" teframe=() tetop=0 tbtn=0 tearm=0 help=0 pick=""
   resized=1 bgname=""
   return 0
 }
@@ -1644,8 +1666,14 @@ __tt_pv_unpaint() {
   fi
 }
 
+__tt_te_follow() {
+  [[ $orig == "$1" && -n ${TTHEME_PALETTE[$tename]} ]] || return 0
+  orig=${TTHEME_PALETTE[$tename]}
+  TTHEME_SPEC=$orig
+}
+
 __tt_te_edit() {
-  local name=$tename err back=$applied
+  local name=$tename err back=$applied was=${TTHEME_PALETTE[$tename]}
   local -i rc
   __tt_te_save_image
   __tt_pv_untune
@@ -1660,6 +1688,7 @@ __tt_te_edit() {
   resized=1 bgname="" bgshown="" bgdim=()
   if (( rc == 0 )); then
     __tt_palettes_load && __tt_reloaded
+    __tt_te_follow "$was"
     __tt_reload
     back=${TTHEME_PALETTE[$name]:-$back}
   fi
@@ -1677,11 +1706,56 @@ __tt_te_edit() {
   return 0
 }
 
+__tt_te_reset() {
+  local name=$tename err was=${TTHEME_PALETTE[$tename]}
+  local -i rc
+  __tt_te_save_image
+  __tt_pv_untune
+  __tt_pv_bg_close
+  err=$(__tt_cli tone $name reset 2>&1 >/dev/null)
+  rc=$?
+  err=${${err//$'\n'/ }## #}
+  tbtn=0 tearm=0 resized=1 bgname="" bgshown="" bgdim=()
+  if (( rc == 0 )); then
+    __tt_palettes_load && __tt_reloaded
+    __tt_te_follow "$was"
+    __tt_reload
+    [[ -n ${TTHEME_PALETTE[$name]} ]] && __tt_pv_paint "${TTHEME_PALETTE[$name]}" && applied=${TTHEME_PALETTE[$name]}
+    __tt_pv_bg_reset $name
+    bgload[$name]=""
+    __tt_te_read
+    msg=${err:-"Back to the original colors"} msgt=200
+  elif (( rc == 1 )); then
+    msg=${err:-"Could not reset the colors of $name"} msgt=300
+  fi
+  __tt_pv_bg_state $name && __tt_pv_tune_open $name
+  return 0
+}
+
+__tt_te_resetting() {
+  if (( tearm )); then
+    __tt_te_reset
+  else
+    tearm=1
+  fi
+}
+
 __tt_te_palette() {
+  local -i armed=$tearm
+  tearm=0
+  (( ${TTHEME_TUNED[(Ie)$tename]} )) || tbtn=0
   case $key in
-    $'\r'|$'\n') __tt_te_edit ;;
+    $'\r'|$'\n')
+      if (( tbtn )); then
+        tearm=$armed
+        __tt_te_resetting
+      else
+        __tt_te_edit
+      fi
+      ;;
+    left|right) (( ${TTHEME_TUNED[(Ie)$tename]} )) && tbtn=$(( ! tbtn )) ;;
     s) __tt_te_save ;;
-    esc) __tt_te_close ;;
+    esc) (( armed )) || __tt_te_close ;;
     up|k)
       if __tt_te_image; then
         __tt_te_to_image last
@@ -1769,7 +1843,7 @@ __tt_pv_te() {
 }
 
 __tt_pv_te_head() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' y=$'\e[33m' line REPLY
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] b=$TTHEME_SGR[bold] y=$TTHEME_SGR[warn] line REPLY
   local -i col=$1 end=$2 room=$(( $2 - $1 + 1 ))
   (( color )) || z= d= b= y=
   __tt_te_unsaved && (( room -= 11 ))
@@ -1782,7 +1856,7 @@ __tt_pv_te_head() {
 }
 
 __tt_pv_te_tile() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' sty top side bot
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] b=$TTHEME_SGR[bold] sty top side bot
   local -i y=$1 col=$2 r tc=10
   (( color )) || z= d= b=
   if (( tfocus == 1 && tf == 5 )); then
@@ -1804,7 +1878,7 @@ __tt_pv_te_tile() {
 }
 
 __tt_pv_te_ghost() {
-  local z=$'\e[0m' d=$'\e[2m'
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim]
   local -i r0=$1 col=$2 T=$(( $3 - $2 - 21 )) i
   (( color )) || z= d=
   (( T < 8 )) && T=8
@@ -1819,7 +1893,7 @@ __tt_pv_te_ghost() {
 }
 
 __tt_pv_te_edge() {
-  local left=$4 right=$5 sty=$6 hs=$7 head=$8 tail=$9 z=$'\e[0m' line
+  local left=$4 right=$5 sty=$6 hs=$7 head=$8 tail=$9 z=$TTHEME_SGR[reset] line
   local -i y=$1 col=$2 w=$3 n
   (( color )) || z=
   n=$(( w - 3 - (${#head} ? ${#head} + 2 : 0) - (${#tail} ? ${#tail} + 3 : 0) ))
@@ -1832,7 +1906,7 @@ __tt_pv_te_edge() {
 }
 
 __tt_pv_te_sides() {
-  local sty=$5 z=$'\e[0m'
+  local sty=$5 z=$TTHEME_SGR[reset]
   local -i y r1=$2 col=$3 w=$4
   (( color )) || z=
   for (( y = $1; y <= r1; y++ )); do
@@ -1841,7 +1915,7 @@ __tt_pv_te_sides() {
 }
 
 __tt_pv_te_images() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' st="  " tt note="0/0"
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] b=$TTHEME_SGR[bold] st="  " tt note="0/0"
   local -a held
   local -i y=$1 col=$2 end=$3 n
   (( color )) || z= d= b=
@@ -1858,23 +1932,37 @@ __tt_pv_te_images() {
   pvz+=("$y $col $end teimg")
 }
 
-__tt_pv_te_editrow() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' note="tunes its colors full screen"
-  local -i y=$1 col=$2 end=$3
-  (( color )) || z= d= b=
-  pvz+=("$y $col $end teedit")
-  out+=$'\e['$y';'$(( col + 2 ))'H'
-  if (( tfocus == 0 )); then
-    (( color )) && out+=$ac"▶"$z" "$'\e[7;1m'$ac" Edit palette "$z || out+="▶ [Edit palette]"
+__tt_pv_te_button() {
+  if (( tfocus == 0 && tbtn == $1 )); then
+    (( color )) && out+=$ac"▶"$z" "$pl" $2 "$z || out+="▶ [$2]"
   else
-    (( color )) && out+="  "$b" Edit palette "$z || out+="   Edit palette "
+    (( color )) && out+="  "$b" $2 "$z || out+="   $2 "
   fi
-  (( ${#note} > end - col - 21 )) && note=${note[1,end-col-21]}
-  out+="  "$d$note$z
+}
+
+__tt_pv_te_editrow() {
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] b=$TTHEME_SGR[bold] note="tunes its colors full screen"
+  local -i y=$1 col=$2 end=$3 x=$(( $2 + 2 ))
+  local reset="Reset palette"
+  (( color )) || z= d= b=
+  out+=$'\e['$y';'$x'H'
+  __tt_pv_te_button 0 "Edit palette"
+  pvz+=("$y $col $(( x + 15 )) teedit")
+  x+=16
+  if (( ${TTHEME_TUNED[(Ie)$tename]} )); then
+    out+="  "
+    (( tearm )) && reset="Reset? enter again"
+    __tt_pv_te_button 1 "$reset"
+    pvz+=("$y $(( x + 2 )) $(( x + ${#reset} + 5 )) tereset")
+    x+=$(( ${#reset} + 6 ))
+    (( tfocus == 0 && tbtn )) && note="back to its own colors"
+    (( tearm )) && note="drops your tone"
+  fi
+  (( ${#note} <= end - x - 3 )) && out+="  "$d$note$z
 }
 
 __tt_pv_te_panel() {
-  local z=$'\e[0m' d=$'\e[2m' b=$'\e[1m' fs hs st note row REPLY
+  local z=$TTHEME_SGR[reset] d=$TTHEME_SGR[dim] b=$TTHEME_SGR[bold] dx=$TTHEME_SGR[/dim] bx=$TTHEME_SGR[/bold] ax=$TTHEME_SGR[/accent] fs hs st note row REPLY
   local -i col=$1 end=$2 r0=$3 r1=$4 ix=$(( $1 + 2 )) ie=$(( $2 - 2 )) R W T P I=3 V i y pics=0 tfs=$tf
   (( color )) || z= d= b=
   R=$(( r1 - r0 + 1 )) W=$(( end - col + 1 ))
@@ -1941,8 +2029,8 @@ __tt_pv_te_panel() {
     else
       row=${teframe[i == P ? T : i]}
       if (( tfocus == 0 && color )); then
-        row=${${row//$'\e[2m'/$ac}//$'\e[22m'/$'\e[22;39m'}
-        (( i == 1 )) && row=${row/ Palette /$'\e[1m Palette \e[22m'}
+        row=${${row//$d/$ac}//$dx/$bx$ax}
+        (( i == 1 )) && row=${row/ Palette /$b" Palette "$bx}
       fi
       out+=$'\e['$y';'$col'H'$row$z
       pvz+=("$y $col $end tepal")
@@ -1960,7 +2048,7 @@ __tt_pv_te_panel() {
   fi
   out+=$'\e['$y';'$ix'H'
   if (( tfocus == 2 )); then
-    (( color )) && out+=$ac"▶"$z" "$'\e[7;1m'$ac" Apply "$z || out+="▶ [Apply]"
+    (( color )) && out+=$ac"▶"$z" "$pl" Apply "$z || out+="▶ [Apply]"
   else
     (( color )) && out+="  "$b" Apply "$z || out+="   Apply "
   fi
@@ -2084,7 +2172,7 @@ __tt_pv_handle() {
       if (( cur <= 1 )); then
         (( ${#rval} )) && cur=${#rval}
       else
-        cur=$(( cur - ph + 5 ))
+        cur=$(( cur - ph + pvhd + 3 ))
         (( cur < 1 )) && cur=1
         [[ ${rtype[cur]} == rule ]] && cur=$(( cur - 1 ))
       fi
@@ -2093,7 +2181,7 @@ __tt_pv_handle() {
       if (( cur >= ${#rval} )); then
         cur=1
       else
-        cur=$(( cur + ph - 5 ))
+        cur=$(( cur + ph - pvhd - 3 ))
         (( cur > ${#rval} )) && cur=${#rval}
         [[ ${rtype[cur]} == rule ]] && cur=$(( cur + 1 ))
       fi
@@ -2148,7 +2236,7 @@ __tt_preview() {
     print -u2 "ttheme $mode: needs a terminal"
     return 1
   fi
-  local orig=$TTHEME_SPEC applied=$TTHEME_SPEC painted=$TTHEME_SPEC flt="" sel="" cn="" cdot="" key="" REPLY="" cur=1 top=1 color=0 pw=80 ph=24 resized=1 expal="" exgrp="" exnext=0 gstep=0 gseed=0 tick=0
+  local orig=$TTHEME_SPEC applied=$TTHEME_SPEC painted=$TTHEME_SPEC flt="" sel="" cn="" cdot="" key="" REPLY="" cur=1 top=1 color=0 pw=80 ph=24 resized=1 expal="" exgrp="" exnext=0 gstep=0 gseed=0 tick=0 pvhd=2 pvsr=1 pvsc=4
   local pick="" pk=1 pkdef=1 picked=0 canpick=0 bgcw=0 bgch=0 bgname="" bgshown="" bginc="" osd="" osdt=0
   local tune="" tpick="" tf=1 help=0 msg="" msgt=0 an="" bgrel=0 bgmx=0 bgmy=0 bganchor=0 bgcut="" bgnext=0 bgbytes=0 bgstrip="" pvscene="" pvscenes=""
   local -i scene=0
@@ -2157,7 +2245,7 @@ __tt_preview() {
   local -A bgpic=() bgpics=() bgact=() bgview=() bgswap=() bgthumb=() tsnaps=() pvseek=() bgcolors=() bgprep=() TTHEME_ALIASES=()
   local conf=0 cf=1
   local -a plabel=(" Default " " This tab ") pkeys=() reach=() csnap=() teframe=()
-  local te=0 tfocus=0 tetop=0 tewide=0 tename=""
+  local te=0 tfocus=0 tetop=0 tewide=0 tbtn=0 tearm=0 tename=""
   local -i pvgone=0 bgprepid=0 mrow=0 mcol=0 mclick=0 mwheel=0 mlwheel=0 mlrow=0 mlcol=0
   local -F mlast=0
   local mact="" mzone="" pvmouse=""