0.31.0

2025-11-15 23:03:47 -05:00 · 2022-07-21 22:46:34 +09:00
46 changed files with 605 additions and 1670 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-github: junegunn
+custom: ["https://paypal.me/junegunn", "https://www.buymeacoffee.com/junegunn"]
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -27,18 +27,18 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
      with:
        fetch-depth: 0

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@1ed1437484560351c5be56cf73a48a279d116b78
      with:
        languages: ${{ matrix.language }}

    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@1ed1437484560351c5be56cf73a48a279d116b78

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@1ed1437484560351c5be56cf73a48a279d116b78
--- a/.github/workflows/depsreview.yaml
+++ b/.github/workflows/depsreview.yaml
@@ -1,14 +0,0 @@
-name: 'Dependency Review'
-on: [pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v3
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -15,17 +15,17 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
      with:
        fetch-depth: 0

    - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
      with:
-        go-version: 1.19
+        go-version: 1.18

    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ebaea52cb20fea395b0904125276395e37183dac
      with:
        ruby-version: 3.0.0

--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -15,17 +15,17 @@ jobs:
  build:
    runs-on: macos-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
      with:
        fetch-depth: 0

    - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
      with:
        go-version: 1.18

    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ebaea52cb20fea395b0904125276395e37183dac
      with:
        ruby-version: 3.0.0

--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -18,7 +18,7 @@ builds:
      post: |
        sh -c '
        cat > /tmp/fzf-gon-amd64.hcl << EOF
-        source = ["./dist/fzf-macos_darwin_amd64_v1/fzf"]
+        source = ["./dist/fzf-macos_darwin_amd64/fzf"]
        bundle_id = "kr.junegunn.fzf"
        apple_id {
          username = "junegunn.c@gmail.com"
@@ -72,7 +72,6 @@ builds:
      - amd64
      - arm
      - arm64
-      - loong64
    goarm:
      - 5
      - 6
@@ -100,10 +99,6 @@ archives:
    files:
      - non-existent*

-checksum:
-  extra_files:
-    - glob: ./dist/fzf-*darwin*.zip
-
 release:
  github:
    owner: junegunn
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -26,5 +26,3 @@ Style/OptionalBooleanParameter:
  Enabled: false
 Style/WordArray:
  MinSize: 1
-Minitest/AssertEqual:
-  Enabled: false
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.19
+golang 1.18
--- a/ADVANCED.md
+++ b/ADVANCED.md
@@ -1,7 +1,7 @@
 Advanced fzf examples
 ======================

-*(Last update: 2022/08/25)*
+*(Last update: 2021/05/22)*

 <!-- vim-markdown-toc GFM -->

@@ -496,17 +496,9 @@ pods() {
 Key bindings for git objects
 ----------------------------

-Oftentimes, you want to put the identifiers of various Git object to the
-command-line. For example, it is common to write commands like these:
-
-```sh
-git checkout [SOME_COMMIT_HASH or BRANCH or TAG]
-git diff [SOME_COMMIT_HASH or BRANCH or TAG] [SOME_COMMIT_HASH or BRANCH or TAG]
-```
-
-[fzf-git.sh](https://github.com/junegunn/fzf-git.sh) project defines a set of
-fzf-based key bindings for Git objects. I strongly recommend that you check
-them out because they are seriously useful.
+I have [blogged](https://junegunn.kr/2016/07/fzf-git) about my fzf+git key
+bindings a few years ago. I'm going to show them here again, because they are
+seriously useful.

 ### Files listed in `git status`

@@ -526,6 +518,9 @@ them out because they are seriously useful.

 ![image](https://user-images.githubusercontent.com/700826/113473765-91692080-94a6-11eb-8d38-ed4d41f27ac1.png)

+
+The full source code can be found [here](https://gist.github.com/junegunn/8b572b8d4b5eddd8b85e5f4d40f17236).
+
 Color themes
 ------------

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,157 +1,6 @@
 CHANGELOG
 =========

-0.35.1
------
- Fixed a bug where fzf with `--tiebreak=chunk` crashes on inverse match query
- Fixed a bug where clicking above fzf would paste escape sequences
-
-0.35.0
------
- Added `start` event that is triggered only once when fzf finder starts.
-  Since fzf consumes the input stream asynchronously, the input list is not
-  available unless you use `--sync`.
-  ```sh
-  seq 100 | fzf --multi --sync --bind 'start:last+select-all+preview(echo welcome)'
-  ```
- Added `--border-label` and `--border-label-pos` for putting label on the border
-  ```sh
-  # ANSI color codes are supported
-  # (with https://github.com/busyloop/lolcat)
-  label=$(curl -s http://metaphorpsum.com/sentences/1 | lolcat -f)
-
-  # Border label at the center
-  fzf --height=10 --border --border-label="╢ $label ╟" --color=label:italic:black
-
-  # Left-aligned (positive integer)
-  fzf --height=10 --border --border-label="╢ $label ╟" --border-label-pos=3 --color=label:italic:black
-
-  # Right-aligned (negative integer) on the bottom line (:bottom)
-  fzf --height=10 --border --border-label="╢ $label ╟" --border-label-pos=-3:bottom --color=label:italic:black
-  ```
- Also added `--preview-label` and `--preview-label-pos` for the border of the
-  preview window
-  ```sh
-  fzf --preview 'cat {}' --border --preview-label=' Preview ' --preview-label-pos=2
-  ```
- Info panel (match counter) will be followed by a horizontal separator by
-  default
-    - Use `--no-separator` or `--separator=''` to hide the separator
-    - You can specify an arbitrary string that is repeated to form the
-      horizontal separator. e.g. `--separator=╸`
-    - The color of the separator can be customized via `--color=separator:...`
-    - ANSI color codes are also supported
-  ```sh
-  fzf --separator=╸ --color=separator:green
-  fzf --separator=$(lolcat -f -F 1.4 <<< ▁▁▂▃▄▅▆▆▅▄▃▂▁▁) --info=inline
-  ```
- Added `--border=bold` and `--border=double` along with
-  `--preview-window=border-bold` and `--preview-window=border-double`
-
-0.34.0
------
- Added support for adaptive `--height`. If the `--height` value is prefixed
-  with `~`, fzf will automatically determine the height in the range according
-  to the input size.
-  ```sh
-  seq 1 | fzf --height ~70% --border --padding 1 --margin 1
-  seq 10 | fzf --height ~70% --border --padding 1 --margin 1
-  seq 100 | fzf --height ~70% --border --padding 1 --margin 1
-  ```
-    - There are a few limitations
-        - Not compatible with percent top/bottom margin/padding
-          ```sh
-          # This is not allowed (top/bottom margin in percent value)
-          fzf --height ~50% --border --margin 5%,10%
-
-          # This is allowed (top/bottom margin in fixed value)
-          fzf --height ~50% --border --margin 2,10%
-          ```
-        - fzf will not start until it can determine the right height for the input
-          ```sh
-          # fzf will open immediately
-          (sleep 2; seq 10) | fzf --height 50%
-
-          # fzf will open after 2 seconds
-          (sleep 2; seq 10) | fzf --height ~50%
-          (sleep 2; seq 1000) | fzf --height ~50%
-          ```
- Fixed tcell renderer used to render full-screen fzf on Windows
- `--no-clear` is deprecated. Use `reload` action instead.
-
-0.33.0
------
- Added `--scheme=[default|path|history]` option to choose scoring scheme
-    - (Experimental)
-    - We updated the scoring algorithm in 0.32.0, however we have learned that
-      this new scheme (`default`) is not always giving the optimal result
-    - `path`: Additional bonus point is only given to the characters after
-      path separator. You might want to choose this scheme if you have many
-      files with spaces in their paths.
-    - `history`: No additional bonus points are given so that we give more
-      weight to the chronological ordering. This is equivalent to the scoring
-      scheme before 0.32.0. This also sets `--tiebreak=index`.
- ANSI color sequences with colon delimiters are now supported.
-  ```sh
-  printf "\e[38;5;208mOption 1\e[m\nOption 2" | fzf --ansi
-  printf "\e[38:5:208mOption 1\e[m\nOption 2" | fzf --ansi
-  ```
- Support `border-{up,down}` as the synonyms for `border-{top,bottom}` in
-  `--preview-window`
- Added support for ANSI `strikethrough`
-  ```sh
-  printf "\e[9mdeleted" | fzf --ansi
-  fzf --color fg+:strikethrough
-  ```
-
-0.32.1
------
- Fixed incorrect ordering of `--tiebreak=chunk`
- fzf-tmux will show fzf border instead of tmux popup border (requires tmux 3.3)
-  ```sh
-  fzf-tmux -p70%
-  fzf-tmux -p70% --color=border:bright-red
-  fzf-tmux -p100%,60% --color=border:bright-yellow --border=horizontal --padding 1,5 --margin 1,0
-  fzf-tmux -p70%,100% --color=border:bright-green --border=vertical
-
-  # Key bindings (CTRL-T, CTRL-R, ALT-C) will use these options
-  export FZF_TMUX_OPTS='-p100%,60% --color=border:green --border=horizontal --padding 1,5 --margin 1,0'
-  ```
-
-0.32.0
------
- Updated the scoring algorithm
-    - Different bonus points to different categories of word boundaries
-      (listed higher to lower bonus point)
-        - Word after whitespace characters or beginning of the string
-        - Word after common delimiter characters (`/,:;|`)
-        - Word after other non-word characters
-      ```sh
-      # foo/bar.sh` is preferred over `foo-bar.sh` on `bar`
-      fzf --query=bar --height=4 << EOF
-      foo-bar.sh
-      foo/bar.sh
-      EOF
-      ```
- Added a new tiebreak `chunk`
-    - Favors the line with shorter matched chunk. A chunk is a set of
-      consecutive non-whitespace characters.
-    - Unlike the default `length`, this scheme works well with tabular input
-      ```sh
-      # length prefers item #1, because the whole line is shorter,
-      # chunk prefers item #2, because the matched chunk ("foo") is shorter
-      fzf --height=6 --header-lines=2 --tiebreak=chunk --reverse --query=fo << "EOF"
-      N | Field1 | Field2 | Field3
-      - | ------ | ------ | ------
-      1 | hello  | foobar | baz
-      2 | world  | foo    | bazbaz
-      EOF
-      ```
-    - If the input does not contain any spaces, `chunk` is equivalent to
-      `length`. But we're not going to set it as the default because it is
-      computationally more expensive.
- Bug fixes and improvements
-
 0.31.0
 ------
 - Added support for an alternative preview window layout that is activated
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2013-2022 Junegunn Choi
+Copyright (c) 2013-2021 Junegunn Choi

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/1
+++ b/1
@@ -155,7 +155,6 @@ target/$(BINARYLOONG64): $(SOURCES)
 	GOARCH=loong64 $(GO) build $(BUILD_FLAGS) -o $@

 bin/fzf: target/$(BINARY) | bin
-	-rm -f bin/fzf
 	cp -f target/$(BINARY) bin/fzf

 docker:
--- a/README.md
+++ b/README.md
@@ -557,7 +557,7 @@ more details.

 ```sh
 FZF_DEFAULT_COMMAND='ps -ef' \
-  fzf --bind 'ctrl-r:reload(eval "$FZF_DEFAULT_COMMAND")' \
+  fzf --bind 'ctrl-r:reload($FZF_DEFAULT_COMMAND)' \
      --header 'Press CTRL-R to reload' --header-lines=1 \
      --height=50% --layout=reverse
 ```
@@ -566,7 +566,7 @@ FZF_DEFAULT_COMMAND='ps -ef' \

 ```sh
 FZF_DEFAULT_COMMAND='find . -type f' \
-  fzf --bind 'ctrl-d:reload(find . -type d),ctrl-f:reload(eval "$FZF_DEFAULT_COMMAND")' \
+  fzf --bind 'ctrl-d:reload(find . -type d),ctrl-f:reload($FZF_DEFAULT_COMMAND)' \
      --height=50% --layout=reverse
 ```

@@ -627,7 +627,10 @@ fzf --height 40% --layout reverse --info inline --border \

 See the man page (`man fzf`) for the full list of options.

-More advanced examples can be found [here](https://github.com/junegunn/fzf/blob/master/ADVANCED.md).
+For more advanced examples, see [Key bindings for git with fzf][fzf-git]
+([code](https://gist.github.com/junegunn/8b572b8d4b5eddd8b85e5f4d40f17236)).
+
+[fzf-git]: https://junegunn.kr/2016/07/fzf-git/

 ----

@@ -659,10 +662,10 @@ default find command to traverse the file system while respecting

 ```sh
 # Feed the output of fd into fzf
-fd --type f --strip-cwd-prefix | fzf
+fd --type f | fzf

 # Setting fd as the default source for fzf
-export FZF_DEFAULT_COMMAND='fd --type f --strip-cwd-prefix'
+export FZF_DEFAULT_COMMAND='fd --type f'

 # Now fzf (w/o pipe) will use fd instead of find
 fzf
@@ -675,7 +678,7 @@ If you want the command to follow symbolic links and don't want it to exclude
 hidden files, use the following command:

 ```sh
-export FZF_DEFAULT_COMMAND='fd --type f --strip-cwd-prefix --hidden --follow --exclude .git'
+export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git'
 ```

 #### Fish shell
--- a/bin/fzf-tmux
+++ b/bin/fzf-tmux
@@ -10,6 +10,7 @@ fail() {
 fzf="$(command -v fzf 2> /dev/null)" || fzf="$(dirname "$0")/fzf"
 [[ -x "$fzf" ]] || fail 'fzf executable not found'

+tmux_args=()
 args=()
 opt=""
 skip=""
@@ -57,7 +58,7 @@ while [[ $# -gt 0 ]]; do
      ;;
    -p*|-w*|-h*|-x*|-y*|-d*|-u*|-r*|-l*)
      if [[ "$arg" =~ ^-[pwhxy] ]]; then
-        [[ "$opt" =~ "-E" ]] || opt="-E"
+        [[ "$opt" =~ "-K -E" ]] || opt="-K -E"
      elif [[ "$arg" =~ ^.[lr] ]]; then
        opt="-h"
        if [[ "$arg" =~ ^.l ]]; then
@@ -118,6 +119,8 @@ while [[ $# -gt 0 ]]; do
      # "--" can be used to separate fzf-tmux options from fzf options to
      # avoid conflicts
      skip=1
+      tmux_args=("${args[@]}")
+      args=()
      continue
      ;;
    *)
@@ -136,7 +139,7 @@ fi
 args=("${args[@]}" "--no-height" "--bind=ctrl-z:ignore")

 # Handle zoomed tmux pane without popup options by moving it to a temp window
-if [[ ! "$opt" =~ "-E" ]] && tmux list-panes -F '#F' | grep -q Z; then
+if [[ ! "$opt" =~ "-K -E" ]] && tmux list-panes -F '#F' | grep -q Z; then
  zoomed_without_popup=1
  original_window=$(tmux display-message -p "#{window_id}")
  tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'")
@@ -178,14 +181,7 @@ trap 'cleanup 1' SIGUSR1
 trap 'cleanup' EXIT

 envs="export TERM=$TERM "
-if [[ "$opt" =~ "-E" ]]; then
-  FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
-  tmux_version=$(tmux -V)
-  if [[ ! $tmux_version =~ 3\.2 ]]; then
-    FZF_DEFAULT_OPTS="--border $FZF_DEFAULT_OPTS"
-    opt="-B $opt"
-  fi
-fi
+[[ "$opt" =~ "-K -E" ]] && FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
 [[ -n "$FZF_DEFAULT_OPTS"    ]] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
 [[ -n "$FZF_DEFAULT_COMMAND" ]] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"
 echo "$envs;" > "$argsf"
@@ -199,7 +195,7 @@ close="; trap - EXIT SIGINT SIGTERM $close"

 export TMUX=$(cut -d , -f 1,2 <<< "$TMUX")
 mkfifo -m o+w $fifo2
-if [[ "$opt" =~ "-E" ]]; then
+if [[ "$opt" =~ "-K -E" ]]; then
  cat $fifo2 &
  if [[ -n "$term" ]] || [[ -t 0 ]]; then
    cat <<< "\"$fzf\" $opts > $fifo2; out=\$? $close; exit \$out" >> $argsf
@@ -209,7 +205,15 @@ if [[ "$opt" =~ "-E" ]]; then
    cat <&0 > $fifo1 &
  fi

-  tmux popup -d "$PWD" $opt "bash $argsf" > /dev/null 2>&1
+  # tmux dropped the support for `-K`, `-R` to popup command
+  #   TODO: We can remove this once tmux 3.2 is released
+  if [[ ! "$(tmux popup --help 2>&1)" =~ '-R shell-command' ]]; then
+    opt="${opt/-K/}"
+  else
+    opt="${opt} -R"
+  fi
+
+  tmux popup -d "$PWD" "${tmux_args[@]}" $opt "bash $argsf" > /dev/null 2>&1
  exit $?
 fi

@@ -223,7 +227,7 @@ else
 fi
 tmux set-window-option synchronize-panes off \;\
  set-window-option remain-on-exit off \;\
-  split-window -c "$PWD" $opt "bash -c 'exec -a fzf bash $argsf'" $swap \
+  split-window -c "$PWD" $opt "${tmux_args[@]}" "bash -c 'exec -a fzf bash $argsf'" $swap \
  > /dev/null 2>&1 || { "$fzf" "${args[@]}"; exit $?; }
 cat $fifo2
 exit "$(cat $fifo3)"
--- a/go.mod
+++ b/go.mod
@@ -1,20 +1,20 @@
 module github.com/junegunn/fzf

 require (
-	github.com/gdamore/tcell/v2 v2.5.3
-	github.com/mattn/go-isatty v0.0.16
-	github.com/mattn/go-runewidth v0.0.14
+	github.com/gdamore/tcell v1.4.0
+	github.com/mattn/go-isatty v0.0.14
+	github.com/mattn/go-runewidth v0.0.13
 	github.com/mattn/go-shellwords v1.0.12
-	github.com/rivo/uniseg v0.4.2
-	github.com/saracen/walker v0.1.3
-	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
+	github.com/rivo/uniseg v0.2.0
+	github.com/saracen/walker v0.1.2
+	golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 )

 require (
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/text v0.3.7 // indirect
 )

--- a/go.sum
+++ b/go.sum
@@ -1,29 +1,29 @@
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell/v2 v2.5.3 h1:b9XQrT6QGbgI7JvZOJXFNczOQeIYbo8BfeSMzt2sAV0=
-github.com/gdamore/tcell/v2 v2.5.3/go.mod h1:wSkrPaXoiIWZqW/g7Px4xc79di6FTcpB8tvaKJ6uGBo=
+github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU=
+github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
-github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/saracen/walker v0.1.3 h1:YtcKKmpRPy6XJTHJ75J2QYXXZYWnZNQxPCVqZSHVV/g=
-github.com/saracen/walker v0.1.3/go.mod h1:FU+7qU8DeQQgSZDmmThMJi93kPkLFgy0oVAcLxurjIk=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+github.com/saracen/walker v0.1.2 h1:/o1TxP82n8thLvmL4GpJXduYaRmJ7qXp8u9dSlV0zmo=
+github.com/saracen/walker v0.1.2/go.mod h1:0oKYMsKVhSJ+ful4p/XbjvXbMgLEkLITZaxozsl4CGE=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 h1:QyVthZKMsyaQwBTJE04jdNN0Pp5Fn9Qga0mrgxyERQM=
+golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- a/33
+++ b/33
@@ -2,7 +2,7 @@

 set -u

-version=0.35.1
+version=0.31.0
 auto_completion=
 key_bindings=
 update_config=2
@@ -168,22 +168,21 @@ archi=$(uname -sm)
 binary_available=1
 binary_error=""
 case "$archi" in
-  Darwin\ arm64)      download fzf-$version-darwin_arm64.zip     ;;
-  Darwin\ x86_64)     download fzf-$version-darwin_amd64.zip     ;;
-  Linux\ armv5*)      download fzf-$version-linux_armv5.tar.gz   ;;
-  Linux\ armv6*)      download fzf-$version-linux_armv6.tar.gz   ;;
-  Linux\ armv7*)      download fzf-$version-linux_armv7.tar.gz   ;;
-  Linux\ armv8*)      download fzf-$version-linux_arm64.tar.gz   ;;
-  Linux\ aarch64*)    download fzf-$version-linux_arm64.tar.gz   ;;
-  Linux\ loongarch64) download fzf-$version-linux_loong64.tar.gz ;;
-  Linux\ *64)         download fzf-$version-linux_amd64.tar.gz   ;;
-  FreeBSD\ *64)       download fzf-$version-freebsd_amd64.tar.gz ;;
-  OpenBSD\ *64)       download fzf-$version-openbsd_amd64.tar.gz ;;
-  CYGWIN*\ *64)       download fzf-$version-windows_amd64.zip    ;;
-  MINGW*\ *64)        download fzf-$version-windows_amd64.zip    ;;
-  MSYS*\ *64)         download fzf-$version-windows_amd64.zip    ;;
-  Windows*\ *64)      download fzf-$version-windows_amd64.zip    ;;
-  *)                  binary_available=0 binary_error=1          ;;
+  Darwin\ arm64)   download fzf-$version-darwin_arm64.zip     ;;
+  Darwin\ x86_64)  download fzf-$version-darwin_amd64.zip     ;;
+  Linux\ armv5*)   download fzf-$version-linux_armv5.tar.gz   ;;
+  Linux\ armv6*)   download fzf-$version-linux_armv6.tar.gz   ;;
+  Linux\ armv7*)   download fzf-$version-linux_armv7.tar.gz   ;;
+  Linux\ armv8*)   download fzf-$version-linux_arm64.tar.gz   ;;
+  Linux\ aarch64*) download fzf-$version-linux_arm64.tar.gz   ;;
+  Linux\ *64)      download fzf-$version-linux_amd64.tar.gz   ;;
+  FreeBSD\ *64)    download fzf-$version-freebsd_amd64.tar.gz ;;
+  OpenBSD\ *64)    download fzf-$version-openbsd_amd64.tar.gz ;;
+  CYGWIN*\ *64)    download fzf-$version-windows_amd64.zip    ;;
+  MINGW*\ *64)     download fzf-$version-windows_amd64.zip    ;;
+  MSYS*\ *64)      download fzf-$version-windows_amd64.zip    ;;
+  Windows*\ *64)   download fzf-$version-windows_amd64.zip    ;;
+  *)               binary_available=0 binary_error=1 ;;
 esac

 cd "$fzf_base"
--- a/install.ps1
+++ b/install.ps1
@@ -1,4 +1,4 @@
-$version="0.35.1"
+$version="0.31.0"

 $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

--- a/main.go
+++ b/main.go
@@ -5,7 +5,7 @@ import (
 	"github.com/junegunn/fzf/src/protector"
 )

-var version string = "0.35"
+var version string = "0.31"
 var revision string = "devel"

 func main() {
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf-tmux 1 "Nov 2022" "fzf 0.35.1" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Jul 2022" "fzf 0.31.0" "fzf-tmux - open fzf in tmux split pane"

 .SH NAME
 fzf-tmux - open fzf in tmux split pane
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Nov 2022" "fzf 0.35.1" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Jul 2022" "fzf 0.31.0" "fzf - a command-line fuzzy finder"

 .SH NAME
 fzf - a command-line fuzzy finder
@@ -51,18 +51,6 @@ Case-sensitive match
 .B "--literal"
 Do not normalize latin script letters for matching.
 .TP
-.BI "--scheme=" SCHEME
-Choose scoring scheme tailored for different types of input.
-
-.br
-.BR default "  Generic scoring scheme designed to work well with any type of input"
-.br
-.BR path "     Scoring scheme for paths (additional bonus point only after path separator)
-.br
-.BR history "  Scoring scheme for command history (no additional bonus points).
-         Sets \fB--tiebreak=index\fR as well.
-.br
-.TP
 .BI "--algo=" TYPE
 Fuzzy matching algorithm (default: v2)

@@ -107,8 +95,6 @@ Comma-separated list of sort criteria to apply when the scores are tied.
 .br
 .BR length "  Prefers line with shorter length"
 .br
-.BR chunk "   Prefers line with shorter matched chunk (delimited by whitespaces)"
-.br
 .BR begin "   Prefers line with matched substring closer to the beginning"
 .br
 .BR end "     Prefers line with matched substring closer to the end"
@@ -177,11 +163,9 @@ actions are affected:
 Label characters for \fBjump\fR and \fBjump-accept\fR
 .SS Layout
 .TP
-.BI "--height=" "[~]HEIGHT[%]"
+.BI "--height=" "HEIGHT[%]"
 Display fzf window below the cursor with the given height instead of using
-the full screen. When prefixed with \fB~\fR, fzf will automatically determine
-the height in the range according to the input size. Note that adaptive height
-is not compatible with top/bottom margin and padding given in percent size.
+the full screen.
 .TP
 .BI "--min-height=" "HEIGHT"
 Minimum height when \fB--height\fR is given in percent (default: 10).
@@ -203,25 +187,21 @@ Choose the layout (default: default)
 A synonym for \fB--layout=reverse\fB

 .TP
-.BI "--border" [=BORDER_OPT]
+.BI "--border" [=STYLE]
 Draw border around the finder

 .br
-.BR rounded "       Border with rounded corners (default)"
+.BR rounded "     Border with rounded corners (default)"
 .br
-.BR sharp "         Border with sharp corners"
+.BR sharp "       Border with sharp corners"
 .br
-.BR bold "          Border with bold lines"
+.BR horizontal "  Horizontal lines above and below the finder"
 .br
-.BR double "        Border with double lines"
+.BR vertical "    Vertical lines on each side of the finder"
 .br
-.BR horizontal "    Horizontal lines above and below the finder"
+.BR top
 .br
-.BR vertical "      Vertical lines on each side of the finder"
-.br
-.BR top " (up)"
-.br
-.BR bottom " (down)"
+.BR bottom
 .br
 .BR left
 .br
@@ -230,54 +210,9 @@ Draw border around the finder
 .BR none
 .br

-.TP
-.BI "--border-label" [=LABEL]
-Label to print on the horizontal border line. Should be used with one of the
-following \fB--border\fR options.
-
-.br
-.B * rounded
-.br
-.B * sharp
-.br
-.B * bold
-.br
-.B * double
-.br
-.B * horizontal
-.br
-.BR "* top" " (up)"
-.br
-.BR "* bottom" " (down)"
-.br
-
-.br
-e.g.
-  \fB# ANSI color codes are supported
-  # (with https://github.com/busyloop/lolcat)
-  label=$(curl -s http://metaphorpsum.com/sentences/1 | lolcat -f)
-
-  # Border label at the center
-  fzf --height=10 --border --border-label="╢ $label ╟" --color=label:italic:black
-
-  # Left-aligned (positive integer)
-  fzf --height=10 --border --border-label="╢ $label ╟" --border-label-pos=3 --color=label:italic:black
-
-  # Right-aligned (negative integer) on the bottom line (:bottom)
-  fzf --height=10 --border --border-label="╢ $label ╟" --border-label-pos=-3:bottom --color=label:italic:black\fR
-
-.TP
-.BI "--border-label-pos" [=N[:top|bottom]]
-Position of the border label on the border line. Specify a positive integer as
-the column position from the left. Specify a negative integer to right-align
-the label. Label is printed on the top border line by default, add
-\fB:bottom\fR to put it on the border line on the bottom. The default value
-\fB0 (or \fBcenter\fR) will put the label at the center of the border line.
-
 .TP
 .B "--no-unicode"
-Use ASCII characters instead of Unicode drawing characters to draw borders,
-the spinner and the horizontal separator.
+Use ASCII characters instead of Unicode box drawing characters to draw border

 .TP
 .BI "--margin=" MARGIN
@@ -330,7 +265,7 @@ e.g.

 .TP
 .BI "--info=" "STYLE"
-Determines the display style of finder info (match counters).
+Determines the display style of finder info.

 .br
 .BR default "       Display on the next line to the prompt"
@@ -344,18 +279,6 @@ Determines the display style of finder info (match counters).
 .B "--no-info"
 A synonym for \fB--info=hidden\fB

-.TP
-.BI "--separator=" "STR"
-The given string will be repeated to form the horizontal separator on the info
-line (default: '─' or '-' depending on \fB--no-unicode\fR).
-
-ANSI color codes are supported.
-
-.TP
-.B "--no-separator"
-Do not display horizontal separator on the info line. A synonym for
-\fB--separator=''\fB
-
 .TP
 .BI "--prompt=" "STR"
 Input prompt (default: '> ')
@@ -416,9 +339,7 @@ color mappings.
    \fBquery      \fRQuery string
    \fBdisabled   \fRQuery string when search is disabled
    \fBinfo       \fRInfo line (match counters)
-    \fBseparator  \fRHorizontal separator on info line (match counters)
    \fBborder     \fRBorder around the window (\fB--border\fR and \fB--preview\fR)
-    \fBlabel      \fRBorder label (\fB--border-label\fR and \fB--preview-label\fR)
    \fBprompt     \fRPrompt
    \fBpointer    \fRPointer to the current line
    \fBmarker     \fRMulti-select marker
@@ -455,7 +376,6 @@ color mappings.
    \fBreverse\fR
    \fBdim\fR
    \fBitalic\fR
-    \fBstrikethrough\fR

 .B EXAMPLES:

@@ -549,37 +469,6 @@ e.g.
        sleep 0.01
      done'\fR
 .RE
-
-.TP
-.BI "--preview-label" [=LABEL]
-Label to print on the horizontal border line of the preview window.
-Should be used with one of the following \fB--preview-window\fR options.
-
-.br
-.B * border-rounded (default)
-.br
-.B * border-sharp
-.br
-.B * border-bold
-.br
-.B * border-double
-.br
-.B * border-horizontal
-.br
-.B * border-top
-.br
-.B * border-bottom
-.br
-
-.TP
-.BI "--preview-label-pos" [=N[:top|bottom]]
-Position of the border label on the border line of the preview window. Specify
-a positive integer as the column position from the left. Specify a negative
-integer to right-align the label. Label is printed on the top border line by
-default, add \fB:bottom\fR to put it on the border line on the bottom. The
-default value 0 (or \fBcenter\fR) will put the label at the center of the
-border line.
-
 .TP
 .BI "--preview-window=" "[POSITION][,SIZE[%]][,border-BORDER_OPT][,[no]wrap][,[no]follow][,[no]cycle][,[no]hidden][,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES][,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]"

@@ -712,6 +601,12 @@ Read input delimited by ASCII NUL characters instead of newline characters
 .B "--print0"
 Print output delimited by ASCII NUL characters instead of newline characters
 .TP
+.B "--no-clear"
+Do not clear finder interface on exit. If fzf was started in full screen mode,
+it will not switch back to the original screen, so you'll have to manually run
+\fBtput rmcup\fR to return. This option can be used to avoid flickering of the
+screen when your application needs to start fzf multiple times in order.
+.TP
 .B "--sync"
 Synchronous search for multi-staged filtering. If specified, fzf will launch
 ncurses finder only after the input stream is complete.
@@ -905,15 +800,6 @@ e.g.
 or any single character

 .SS AVAILABLE EVENTS:
-\fIstart\fR
-.RS
-Triggered only once when fzf finder starts. Since fzf consumes the input stream
-asynchronously, the input list is not available unless you use \fI--sync\fR.
-
-e.g.
-     \fB# Move cursor to the last item and select all items
-     seq 1000 | fzf --multi --sync --bind start:last+select-all\fR
-.RE
 \fIchange\fR
 .RS
 Triggered whenever the query string is changed
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -143,7 +143,7 @@ function! fzf#install()
    if !filereadable(script)
      throw script.' not found'
    endif
-    let script = 'powershell -ExecutionPolicy Bypass -file ' . shellescape(script)
+    let script = 'powershell -ExecutionPolicy Bypass -file ' . script
  else
    let script = s:base_dir.'/install'
    if !executable(script)
@@ -164,7 +164,7 @@ function s:get_version(bin)
  if has_key(s:versions, a:bin)
    return s:versions[a:bin]
  end
-  let command = (&shell =~ 'powershell' ? '&' : '') . s:fzf_call('shellescape', a:bin) . ' --version --no-height'
+  let command = fzf#shellescape(a:bin) . ' --version --no-height'
  let output = systemlist(command)
  if v:shell_error || empty(output)
    return ''
@@ -342,8 +342,7 @@ function! s:common_sink(action, lines) abort
 endfunction

 function! s:get_color(attr, ...)
-  " Force 24 bit colors: g:fzf_force_termguicolors (temporary workaround for https://github.com/junegunn/fzf.vim/issues/1152)
-  let gui = get(g:, 'fzf_force_termguicolors', 0) || (!s:is_win && !has('win32unix') && has('termguicolors') && &termguicolors)
+  let gui = !s:is_win && !has('win32unix') && has('termguicolors') && &termguicolors
  let fam = gui ? 'gui' : 'cterm'
  let pat = gui ? '^#[a-f0-9]\+' : '^[0-9]\+$'
  for group in a:000
@@ -464,7 +463,7 @@ try
  let temps  = { 'result': s:fzf_tempname() }
  let optstr = s:evaluate_opts(get(dict, 'options', ''))
  try
-    let fzf_exec = shellescape(fzf#exec())
+    let fzf_exec = fzf#shellescape(fzf#exec())
  catch
    throw v:exception
  endtry
@@ -973,16 +972,16 @@ function! s:callback(dict, lines) abort
 endfunction

 if has('nvim')
-  function s:create_popup(opts) abort
+  function s:create_popup(hl, opts) abort
    let buf = nvim_create_buf(v:false, v:true)
    let opts = extend({'relative': 'editor', 'style': 'minimal'}, a:opts)
    let win = nvim_open_win(buf, v:true, opts)
-    silent! call setwinvar(win, '&winhighlight', 'Pmenu:,Normal:Normal')
+    call setwinvar(win, '&winhighlight', 'NormalFloat:'..a:hl)
    call setwinvar(win, '&colorcolumn', '')
    return buf
  endfunction
 else
-  function! s:create_popup(opts) abort
+  function! s:create_popup(hl, opts) abort
    let s:popup_create = {buf -> popup_create(buf, #{
      \ line: a:opts.row,
      \ col: a:opts.col,
@@ -1017,7 +1016,7 @@ function! s:popup(opts) abort
  let row += !has('nvim')
  let col += !has('nvim')

-  call s:create_popup({
+  call s:create_popup('Normal', {
    \ 'row': row, 'col': col, 'width': width, 'height': height
  \ })
 endfunction
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -37,7 +37,7 @@ bind '"\e[0n": redraw-current-line' 2> /dev/null
 __fzf_comprun() {
  if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then
    _fzf_comprun "$@"
-  elif [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; }; then
+  elif [[ -n "$TMUX_PANE" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "$FZF_TMUX_OPTS" ]]; }; then
    shift
    fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- "$@"
  else
@@ -55,8 +55,8 @@ __fzf_orig_completion() {
      cmd="${BASH_REMATCH[3]}"
      [[ "$f" = _fzf_* ]] && continue
      printf -v "_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}" "%s" "${comp} %s ${cmd} #${f}"
-      if [[ "$l" = *" -o nospace "* ]] && [[ ! "${__fzf_nospace_commands-}" = *" $cmd "* ]]; then
-        __fzf_nospace_commands="${__fzf_nospace_commands-} $cmd "
+      if [[ "$l" = *" -o nospace "* ]] && [[ ! "$__fzf_nospace_commands" = *" $cmd "* ]]; then
+        __fzf_nospace_commands="$__fzf_nospace_commands $cmd "
      fi
    fi
  done
@@ -139,18 +139,17 @@ _fzf_handle_dynamic_completion() {
  shift
  orig_cmd="$1"
  orig_var="_fzf_orig_completion_$cmd"
-  orig="${!orig_var-}"
-  orig="${orig##*#}"
+  orig="${!orig_var##*#}"
  if [[ -n "$orig" ]] && type "$orig" > /dev/null 2>&1; then
    $orig "$@"
-  elif [[ -n "${_fzf_completion_loader-}" ]]; then
+  elif [[ -n "$_fzf_completion_loader" ]]; then
    orig_complete=$(complete -p "$orig_cmd" 2> /dev/null)
    _completion_loader "$@"
    ret=$?
    # _completion_loader may not have updated completion for the command
    if [[ "$(complete -p "$orig_cmd" 2> /dev/null)" != "$orig_complete" ]]; then
      __fzf_orig_completion < <(complete -p "$orig_cmd" 2> /dev/null)
-      if [[ "${__fzf_nospace_commands-}" = *" $orig_cmd "* ]]; then
+      if [[ "$__fzf_nospace_commands" = *" $orig_cmd "* ]]; then
        eval "${orig_complete/ -F / -o nospace -F }"
      else
        eval "$orig_complete"
@@ -162,11 +161,7 @@ _fzf_handle_dynamic_completion() {

 __fzf_generic_path_completion() {
  local cur base dir leftover matches trigger cmd
-  cmd="${COMP_WORDS[0]}"
-  if [[ $cmd == \\* ]]; then
-    cmd="${cmd:1}"
-  fi
-  cmd="${cmd//[^A-Za-z0-9_=]/_}"
+  cmd="${COMP_WORDS[0]//[^A-Za-z0-9_=]/_}"
  COMPREPLY=()
  trigger=${FZF_COMPLETION_TRIGGER-'**'}
  cur="${COMP_WORDS[COMP_CWORD]}"
@@ -174,7 +169,6 @@ __fzf_generic_path_completion() {
    base=${cur:0:${#cur}-${#trigger}}
    eval "base=$base"

-    dir=
    [[ $base = *"/"* ]] && dir="$base"
    while true; do
      if [[ -z "$dir" ]] || [[ -d "$dir" ]]; then
@@ -182,11 +176,11 @@ __fzf_generic_path_completion() {
        leftover=${leftover/#\/}
        [[ -z "$dir" ]] && dir='.'
        [[ "$dir" != "/" ]] && dir="${dir/%\//}"
-        matches=$(eval "$1 $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $2" __fzf_comprun "$4" -q "$leftover" | while read -r item; do
-          printf "%q " "${item%$3}$3"
+        matches=$(eval "$1 $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS $2" __fzf_comprun "$4" -q "$leftover" | while read -r item; do
+          printf "%q$3 " "$item"
        done)
        matches=${matches% }
-        [[ -z "$3" ]] && [[ "${__fzf_nospace_commands-}" = *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
+        [[ -z "$3" ]] && [[ "$__fzf_nospace_commands" = *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
        if [[ -n "$matches" ]]; then
          COMPREPLY=( "$matches" )
        else
@@ -238,7 +232,7 @@ _fzf_complete() {
  if [[ "$cur" == *"$trigger" ]]; then
    cur=${cur:0:${#cur}-${#trigger}}

-    selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | tr '\n' ' ')
+    selected=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS $str_arg" __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | $post | tr '\n' ' ')
    selected=${selected% } # Strip trailing space not to repeat "-o nospace"
    if [[ -n "$selected" ]]; then
      COMPREPLY=("$selected")
@@ -281,7 +275,7 @@ _fzf_proc_completion_post() {

 _fzf_host_completion() {
  _fzf_complete +m -- "$@" < <(
-    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
+    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \
        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
        awk '{if (length($2) > 0) {print $2}}' | sort -u
@@ -290,13 +284,13 @@ _fzf_host_completion() {

 _fzf_var_completion() {
  _fzf_complete -m -- "$@" < <(
-    declare -xp | sed -En 's|^declare [^ ]+ ([^=]+).*|\1|p'
+    declare -xp | sed 's/=.*//' | sed 's/.* //'
  )
 }

 _fzf_alias_completion() {
  _fzf_complete -m -- "$@" < <(
-    alias | sed -En 's|^alias ([^=]+).*|\1|p'
+    alias | sed 's/=.*//' | sed 's/.* //'
  )
 }

@@ -331,7 +325,7 @@ __fzf_defc() {
  func="$2"
  opts="$3"
  orig_var="_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}"
-  orig="${!orig_var-}"
+  orig="${!orig_var}"
  if [[ -n "$orig" ]]; then
    printf -v def "$orig" "$func"
    eval "$def"
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -99,9 +99,9 @@ fi
 __fzf_comprun() {
  if [[ "$(type _fzf_comprun 2>&1)" =~ function ]]; then
    _fzf_comprun "$@"
-  elif [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; }; then
+  elif [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; }; then
    shift
-    if [ -n "${FZF_TMUX_OPTS-}" ]; then
+    if [ -n "$FZF_TMUX_OPTS" ]; then
      fzf-tmux ${(Q)${(Z+n+)FZF_TMUX_OPTS}} -- "$@"
    else
      fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%} -- "$@"
@@ -145,9 +145,8 @@ __fzf_generic_path_completion() {
      leftover=${leftover/#\/}
      [ -z "$dir" ] && dir='.'
      [ "$dir" != "/" ] && dir="${dir/%\//}"
-      matches=$(eval "$compgen $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-}" __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" | while read item; do
-        item="${item%$suffix}$suffix"
-        echo -n "${(q)item} "
+      matches=$(eval "$compgen $(printf %q "$dir")" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS" __fzf_comprun "$cmd" ${(Q)${(Z+n+)fzf_opts}} -q "$leftover" | while read item; do
+        echo -n "${(q)item}$suffix "
      done)
      matches=${matches% }
      if [ -n "$matches" ]; then
@@ -184,7 +183,7 @@ _fzf_complete() {
  args=("$@")
  sep=
  for i in {0..${#args[@]}}; do
-    if [[ "${args[$i]-}" = -- ]]; then
+    if [[ "${args[$i]}" = -- ]]; then
      sep=$i
      break
    fi
@@ -208,7 +207,7 @@ _fzf_complete() {
  type $post > /dev/null 2>&1 || post=cat

  _fzf_feed_fifo "$fifo"
-  matches=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_COMPLETION_OPTS-} $str_arg" __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
+  matches=$(FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS $str_arg" __fzf_comprun "$cmd" "${args[@]}" -q "${(Q)prefix}" < "$fifo" | $post | tr '\n' ' ')
  if [ -n "$matches" ]; then
    LBUFFER="$lbuf$matches"
  fi
@@ -225,7 +224,7 @@ _fzf_complete_telnet() {
 _fzf_complete_ssh() {
  _fzf_complete +m -- "$@" < <(
    setopt localoptions nonomatch
-    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \
+    command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \
        <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \
        <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') |
        awk '{if (length($2) > 0) {print $2}}' | sort -u
@@ -279,8 +278,8 @@ fzf-completion() {
  [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("")

  # When the trigger starts with ';', it becomes a separate token
-  if [[ ${LBUFFER} = *"${tokens[-2]-}${tokens[-1]}" ]]; then
-    tokens[-2]="${tokens[-2]-}${tokens[-1]}"
+  if [[ ${LBUFFER} = *"${tokens[-2]}${tokens[-1]}" ]]; then
+    tokens[-2]="${tokens[-2]}${tokens[-1]}"
    tokens=(${tokens[0,-2]})
  fi

--- a/shell/key-bindings.bash
+++ b/shell/key-bindings.bash
@@ -19,7 +19,7 @@ __fzf_select__() {
    -o -type f -print \
    -o -type d -print \
    -o -type l -print 2> /dev/null | cut -b3-"}"
-  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-} -m"
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS -m"
  eval "$cmd" |
    FZF_DEFAULT_OPTS="$opts" $(__fzfcmd) "$@" |
    while read -r item; do
@@ -30,7 +30,7 @@ __fzf_select__() {
 if [[ $- =~ i ]]; then

 __fzfcmd() {
-  [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; } &&
+  [[ -n "$TMUX_PANE" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "$FZF_TMUX_OPTS" ]]; } &&
    echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
 }

@@ -44,13 +44,13 @@ __fzf_cd__() {
  local cmd opts dir
  cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
    -o -type d -print 2> /dev/null | cut -b3-"}"
-  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-} +m"
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore --reverse $FZF_DEFAULT_OPTS $FZF_ALT_C_OPTS +m"
  dir=$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" $(__fzfcmd)) && printf 'builtin cd -- %q' "$dir"
 }

 __fzf_history__() {
  local output opts script
-  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} +m --read0"
+  opts="--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort $FZF_CTRL_R_OPTS +m --read0"
  script='BEGIN { getc; $/ = "\n\t"; $HISTCOUNT = $ENV{last_hist} + 1 } s/^[ *]//; print $HISTCOUNT - $. . "\t$_" if !$seen{$_}++'
  output=$(
    builtin fc -lnr -2147483648 |
--- a/shell/key-bindings.fish
+++ b/shell/key-bindings.fish
@@ -53,7 +53,7 @@ function fzf_key_bindings
  function fzf-history-widget -d "Show command history"
    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
    begin
-      set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT $FZF_DEFAULT_OPTS --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore $FZF_CTRL_R_OPTS +m"
+      set -lx FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT $FZF_DEFAULT_OPTS --tiebreak=index --bind=ctrl-r:toggle-sort,ctrl-z:ignore $FZF_CTRL_R_OPTS +m"

      set -l FISH_MAJOR (echo $version | cut -f1 -d.)
      set -l FISH_MINOR (echo $version | cut -f2 -d.)
@@ -87,7 +87,7 @@ function fzf_key_bindings
      eval "$FZF_ALT_C_COMMAND | "(__fzfcmd)' +m --query "'$fzf_query'"' | read -l result

      if [ -n "$result" ]
-        cd -- $result
+        builtin cd -- $result

        # Remove last token from commandline.
        commandline -t ""
--- a/shell/key-bindings.zsh
+++ b/shell/key-bindings.zsh
@@ -46,7 +46,7 @@ __fsel() {
    -o -type l -print 2> /dev/null | cut -b3-"}"
  setopt localoptions pipefail no_aliases 2> /dev/null
  local item
-  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" | while read item; do
+  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS" $(__fzfcmd) -m "$@" | while read item; do
    echo -n "${(q)item} "
  done
  local ret=$?
@@ -55,7 +55,7 @@ __fsel() {
 }

 __fzfcmd() {
-  [ -n "${TMUX_PANE-}" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "${FZF_TMUX_OPTS-}" ]; } &&
+  [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; } &&
    echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
 }

@@ -75,7 +75,7 @@ fzf-cd-widget() {
  local cmd="${FZF_ALT_C_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
    -o -type d -print 2> /dev/null | cut -b3-"}"
  setopt localoptions pipefail no_aliases 2> /dev/null
-  local dir="$(eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m)"
+  local dir="$(eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --bind=ctrl-z:ignore $FZF_DEFAULT_OPTS $FZF_ALT_C_OPTS" $(__fzfcmd) +m)"
  if [[ -z "$dir" ]]; then
    zle redisplay
    return 0
@@ -97,8 +97,8 @@ bindkey -M viins '\ec' fzf-cd-widget
 fzf-history-widget() {
  local selected num
  setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null
-  selected=( $(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
-    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
+  selected=( $(fc -rl 1 | awk '{ cmd=$0; sub(/^\s*[0-9]+\**\s+/, "", cmd); if (!seen[cmd]++) print $0 }' |
+    FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} $FZF_DEFAULT_OPTS -n2..,.. --tiebreak=index --bind=ctrl-r:toggle-sort,ctrl-z:ignore $FZF_CTRL_R_OPTS --query=${(qqq)LBUFFER} +m" $(__fzfcmd)) )
  local ret=$?
  if [ -n "$selected" ]; then
    num=$selected[1]
--- a/src/algo/algo.go
+++ b/src/algo/algo.go
@@ -80,7 +80,6 @@ Scoring criteria
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"strings"
 	"unicode"
 	"unicode/utf8"
@@ -90,10 +89,6 @@ import (

 var DEBUG bool

-var delimiterChars = "/,:;|"
-
-const whiteChars = " \t\n\v\f\r\x85\xA0"
-
 func indexAt(index int, max int, forward bool) int {
 	if forward {
 		return index
@@ -145,51 +140,16 @@ const (
 	bonusFirstCharMultiplier = 2
 )

-var (
-	// Extra bonus for word boundary after whitespace character or beginning of the string
-	bonusBoundaryWhite int16 = bonusBoundary + 2
-
-	// Extra bonus for word boundary after slash, colon, semi-colon, and comma
-	bonusBoundaryDelimiter int16 = bonusBoundary + 1
-
-	initialCharClass charClass = charWhite
-)
-
 type charClass int

 const (
-	charWhite charClass = iota
-	charNonWord
-	charDelimiter
+	charNonWord charClass = iota
 	charLower
 	charUpper
 	charLetter
 	charNumber
 )

-func Init(scheme string) bool {
-	switch scheme {
-	case "default":
-		bonusBoundaryWhite = bonusBoundary + 2
-		bonusBoundaryDelimiter = bonusBoundary + 1
-	case "path":
-		bonusBoundaryWhite = bonusBoundary
-		bonusBoundaryDelimiter = bonusBoundary + 1
-		if os.PathSeparator == '/' {
-			delimiterChars = "/"
-		} else {
-			delimiterChars = string([]rune{os.PathSeparator, '/'})
-		}
-		initialCharClass = charDelimiter
-	case "history":
-		bonusBoundaryWhite = bonusBoundary
-		bonusBoundaryDelimiter = bonusBoundary
-	default:
-		return false
-	}
-	return true
-}
-
 func posArray(withPos bool, len int) *[]int {
 	if withPos {
 		pos := make([]int, 0, len)
@@ -221,10 +181,6 @@ func charClassOfAscii(char rune) charClass {
 		return charUpper
 	} else if char >= '0' && char <= '9' {
 		return charNumber
-	} else if strings.IndexRune(whiteChars, char) >= 0 {
-		return charWhite
-	} else if strings.IndexRune(delimiterChars, char) >= 0 {
-		return charDelimiter
 	}
 	return charNonWord
 }
@@ -238,10 +194,6 @@ func charClassOfNonAscii(char rune) charClass {
 		return charNumber
 	} else if unicode.IsLetter(char) {
 		return charLetter
-	} else if unicode.IsSpace(char) {
-		return charWhite
-	} else if strings.IndexRune(delimiterChars, char) >= 0 {
-		return charDelimiter
 	}
 	return charNonWord
 }
@@ -254,33 +206,22 @@ func charClassOf(char rune) charClass {
 }

 func bonusFor(prevClass charClass, class charClass) int16 {
-	if class > charNonWord {
-		if prevClass == charWhite {
-			// Word boundary after whitespace
-			return bonusBoundaryWhite
-		} else if prevClass == charDelimiter {
-			// Word boundary after a delimiter character
-			return bonusBoundaryDelimiter
-		} else if prevClass == charNonWord {
-			// Word boundary
-			return bonusBoundary
-		}
-	}
-	if prevClass == charLower && class == charUpper ||
+	if prevClass == charNonWord && class != charNonWord {
+		// Word boundary
+		return bonusBoundary
+	} else if prevClass == charLower && class == charUpper ||
 		prevClass != charNumber && class == charNumber {
 		// camelCase letter123
 		return bonusCamel123
 	} else if class == charNonWord {
 		return bonusNonWord
-	} else if class == charWhite {
-		return bonusBoundaryWhite
 	}
 	return 0
 }

 func bonusAt(input *util.Chars, idx int) int16 {
 	if idx == 0 {
-		return bonusBoundaryWhite
+		return bonusBoundary
 	}
 	return bonusFor(charClassOf(input.Get(idx-1)), charClassOf(input.Get(idx)))
 }
@@ -436,7 +377,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 	// Phase 2. Calculate bonus for each point
 	maxScore, maxScorePos := int16(0), 0
 	pidx, lastIdx := 0, 0
-	pchar0, pchar, prevH0, prevClass, inGap := pattern[0], pattern[0], int16(0), initialCharClass, false
+	pchar0, pchar, prevH0, prevClass, inGap := pattern[0], pattern[0], int16(0), charNonWord, false
 	Tsub := T[idx:]
 	H0sub, C0sub, Bsub := H0[idx:][:len(Tsub)], C0[idx:][:len(Tsub)], B[idx:][:len(Tsub)]
 	for off, char := range Tsub {
@@ -476,7 +417,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 			C0sub[off] = 1
 			if M == 1 && (forward && score > maxScore || !forward && score >= maxScore) {
 				maxScore, maxScorePos = score, idx+off
-				if forward && bonus >= bonusBoundary {
+				if forward && bonus == bonusBoundary {
 					break
 				}
 			}
@@ -545,14 +486,11 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 				s1 = Hdiag[off] + scoreMatch
 				b := Bsub[off]
 				consecutive = Cdiag[off] + 1
-				if consecutive > 1 {
-					fb := B[col-int(consecutive)+1]
-					// Break consecutive chunk
-					if b >= bonusBoundary && b > fb {
-						consecutive = 1
-					} else {
-						b = util.Max16(b, util.Max16(bonusConsecutive, fb))
-					}
+				// Break consecutive chunk
+				if b == bonusBoundary {
+					consecutive = 1
+				} else if consecutive > 1 {
+					b = util.Max16(b, util.Max16(bonusConsecutive, B[col-int(consecutive)+1]))
 				}
 				if s1+b < s2 {
 					s1 += Bsub[off]
@@ -617,7 +555,7 @@ func FuzzyMatchV2(caseSensitive bool, normalize bool, forward bool, input *util.
 func calculateScore(caseSensitive bool, normalize bool, text *util.Chars, pattern []rune, sidx int, eidx int, withPos bool) (int, *[]int) {
 	pidx, score, inGap, consecutive, firstBonus := 0, 0, false, 0, int16(0)
 	pos := posArray(withPos, len(pattern))
-	prevClass := charWhite
+	prevClass := charNonWord
 	if sidx > 0 {
 		prevClass = charClassOf(text.Get(sidx - 1))
 	}
@@ -645,7 +583,7 @@ func calculateScore(caseSensitive bool, normalize bool, text *util.Chars, patter
 				firstBonus = bonus
 			} else {
 				// Break consecutive chunk
-				if bonus >= bonusBoundary && bonus > firstBonus {
+				if bonus == bonusBoundary {
 					firstBonus = bonus
 				}
 				bonus = util.Max16(util.Max16(bonus, firstBonus), bonusConsecutive)
@@ -803,7 +741,7 @@ func ExactMatchNaive(caseSensitive bool, normalize bool, forward bool, text *uti
 				if bonus > bestBonus {
 					bestPos, bestBonus = index, bonus
 				}
-				if bonus >= bonusBoundary {
+				if bonus == bonusBoundary {
 					break
 				}
 				index -= pidx - 1
@@ -939,8 +877,8 @@ func EqualMatch(caseSensitive bool, normalize bool, forward bool, text *util.Cha
 		match = runesStr == string(pattern)
 	}
 	if match {
-		return Result{trimmedLen, trimmedLen + lenPattern, (scoreMatch+int(bonusBoundaryWhite))*lenPattern +
-			(bonusFirstCharMultiplier-1)*int(bonusBoundaryWhite)}, nil
+		return Result{trimmedLen, trimmedLen + lenPattern, (scoreMatch+bonusBoundary)*lenPattern +
+			(bonusFirstCharMultiplier-1)*bonusBoundary}, nil
 	}
 	return Result{-1, -1, 0}, nil
 }
--- a/src/algo/algo_test.go
+++ b/src/algo/algo_test.go
@@ -45,29 +45,29 @@ func TestFuzzyMatch(t *testing.T) {
 			assertMatch(t, fn, false, forward, "fooBarbaz1", "oBZ", 2, 9,
 				scoreMatch*3+bonusCamel123+scoreGapStart+scoreGapExtension*3)
 			assertMatch(t, fn, false, forward, "foo bar baz", "fbb", 0, 9,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+
-					int(bonusBoundaryWhite)*2+2*scoreGapStart+4*scoreGapExtension)
+				scoreMatch*3+bonusBoundary*bonusFirstCharMultiplier+
+					bonusBoundary*2+2*scoreGapStart+4*scoreGapExtension)
 			assertMatch(t, fn, false, forward, "/AutomatorDocument.icns", "rdoc", 9, 13,
 				scoreMatch*4+bonusCamel123+bonusConsecutive*2)
 			assertMatch(t, fn, false, forward, "/man1/zshcompctl.1", "zshc", 6, 10,
-				scoreMatch*4+int(bonusBoundaryDelimiter)*bonusFirstCharMultiplier+int(bonusBoundaryDelimiter)*3)
+				scoreMatch*4+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary*3)
 			assertMatch(t, fn, false, forward, "/.oh-my-zsh/cache", "zshc", 8, 13,
-				scoreMatch*4+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary*2+scoreGapStart+int(bonusBoundaryDelimiter))
+				scoreMatch*4+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary*3+scoreGapStart)
 			assertMatch(t, fn, false, forward, "ab0123 456", "12356", 3, 10,
 				scoreMatch*5+bonusConsecutive*3+scoreGapStart+scoreGapExtension)
 			assertMatch(t, fn, false, forward, "abc123 456", "12356", 3, 10,
 				scoreMatch*5+bonusCamel123*bonusFirstCharMultiplier+bonusCamel123*2+bonusConsecutive+scoreGapStart+scoreGapExtension)
 			assertMatch(t, fn, false, forward, "foo/bar/baz", "fbb", 0, 9,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+
-					int(bonusBoundaryDelimiter)*2+2*scoreGapStart+4*scoreGapExtension)
+				scoreMatch*3+bonusBoundary*bonusFirstCharMultiplier+
+					bonusBoundary*2+2*scoreGapStart+4*scoreGapExtension)
 			assertMatch(t, fn, false, forward, "fooBarBaz", "fbb", 0, 7,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+
+				scoreMatch*3+bonusBoundary*bonusFirstCharMultiplier+
 					bonusCamel123*2+2*scoreGapStart+2*scoreGapExtension)
 			assertMatch(t, fn, false, forward, "foo barbaz", "fbb", 0, 8,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryWhite)+
+				scoreMatch*3+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary+
 					scoreGapStart*2+scoreGapExtension*3)
 			assertMatch(t, fn, false, forward, "fooBar Baz", "foob", 0, 4,
-				scoreMatch*4+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryWhite)*3)
+				scoreMatch*4+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary*3)
 			assertMatch(t, fn, false, forward, "xFoo-Bar Baz", "foo-b", 1, 6,
 				scoreMatch*5+bonusCamel123*bonusFirstCharMultiplier+bonusCamel123*2+
 					bonusNonWord+bonusBoundary)
@@ -75,14 +75,14 @@ func TestFuzzyMatch(t *testing.T) {
 			assertMatch(t, fn, true, forward, "fooBarbaz", "oBz", 2, 9,
 				scoreMatch*3+bonusCamel123+scoreGapStart+scoreGapExtension*3)
 			assertMatch(t, fn, true, forward, "Foo/Bar/Baz", "FBB", 0, 9,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryDelimiter)*2+
+				scoreMatch*3+bonusBoundary*(bonusFirstCharMultiplier+2)+
 					scoreGapStart*2+scoreGapExtension*4)
 			assertMatch(t, fn, true, forward, "FooBarBaz", "FBB", 0, 7,
-				scoreMatch*3+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+bonusCamel123*2+
+				scoreMatch*3+bonusBoundary*bonusFirstCharMultiplier+bonusCamel123*2+
 					scoreGapStart*2+scoreGapExtension*2)
 			assertMatch(t, fn, true, forward, "FooBar Baz", "FooB", 0, 4,
-				scoreMatch*4+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryWhite)*2+
-					util.Max(bonusCamel123, int(bonusBoundaryWhite)))
+				scoreMatch*4+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary*2+
+					util.Max(bonusCamel123, bonusBoundary))

 			// Consecutive bonus updated
 			assertMatch(t, fn, true, forward, "foo-bar", "o-ba", 2, 6,
@@ -98,10 +98,10 @@ func TestFuzzyMatch(t *testing.T) {

 func TestFuzzyMatchBackward(t *testing.T) {
 	assertMatch(t, FuzzyMatchV1, false, true, "foobar fb", "fb", 0, 4,
-		scoreMatch*2+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+
+		scoreMatch*2+bonusBoundary*bonusFirstCharMultiplier+
 			scoreGapStart+scoreGapExtension)
 	assertMatch(t, FuzzyMatchV1, false, false, "foobar fb", "fb", 7, 9,
-		scoreMatch*2+int(bonusBoundaryWhite)*bonusFirstCharMultiplier+int(bonusBoundaryWhite))
+		scoreMatch*2+bonusBoundary*bonusFirstCharMultiplier+bonusBoundary)
 }

 func TestExactMatchNaive(t *testing.T) {
@@ -114,9 +114,9 @@ func TestExactMatchNaive(t *testing.T) {
 		assertMatch(t, ExactMatchNaive, false, dir, "/AutomatorDocument.icns", "rdoc", 9, 13,
 			scoreMatch*4+bonusCamel123+bonusConsecutive*2)
 		assertMatch(t, ExactMatchNaive, false, dir, "/man1/zshcompctl.1", "zshc", 6, 10,
-			scoreMatch*4+int(bonusBoundaryDelimiter)*(bonusFirstCharMultiplier+3))
+			scoreMatch*4+bonusBoundary*(bonusFirstCharMultiplier+3))
 		assertMatch(t, ExactMatchNaive, false, dir, "/.oh-my-zsh/cache", "zsh/c", 8, 13,
-			scoreMatch*5+bonusBoundary*(bonusFirstCharMultiplier+3)+int(bonusBoundaryDelimiter))
+			scoreMatch*5+bonusBoundary*(bonusFirstCharMultiplier+4))
 	}
 }

@@ -128,7 +128,7 @@ func TestExactMatchNaiveBackward(t *testing.T) {
 }

 func TestPrefixMatch(t *testing.T) {
-	score := scoreMatch*3 + int(bonusBoundaryWhite)*bonusFirstCharMultiplier + int(bonusBoundaryWhite)*2
+	score := (scoreMatch+bonusBoundary)*3 + bonusBoundary*(bonusFirstCharMultiplier-1)

 	for _, dir := range []bool{true, false} {
 		assertMatch(t, PrefixMatch, true, dir, "fooBarbaz", "Foo", -1, -1, 0)
@@ -156,10 +156,9 @@ func TestSuffixMatch(t *testing.T) {
 		// Strip trailing white space from the string
 		assertMatch(t, SuffixMatch, false, dir, "fooBarbaz ", "baz", 6, 9,
 			scoreMatch*3+bonusConsecutive*2)
-
 		// Only when the pattern doesn't end with a space
 		assertMatch(t, SuffixMatch, false, dir, "fooBarbaz ", "baz ", 6, 10,
-			scoreMatch*4+bonusConsecutive*2+int(bonusBoundaryWhite))
+			scoreMatch*4+bonusConsecutive*2+bonusNonWord)
 	}
 }

@@ -183,9 +182,9 @@ func TestNormalize(t *testing.T) {
 				input, pattern, sidx, eidx, score)
 		}
 	}
-	test("Só Danço Samba", "So", 0, 2, 62, FuzzyMatchV1, FuzzyMatchV2, PrefixMatch, ExactMatchNaive)
-	test("Só Danço Samba", "sodc", 0, 7, 97, FuzzyMatchV1, FuzzyMatchV2)
-	test("Danço", "danco", 0, 5, 140, FuzzyMatchV1, FuzzyMatchV2, PrefixMatch, SuffixMatch, ExactMatchNaive, EqualMatch)
+	test("Só Danço Samba", "So", 0, 2, 56, FuzzyMatchV1, FuzzyMatchV2, PrefixMatch, ExactMatchNaive)
+	test("Só Danço Samba", "sodc", 0, 7, 89, FuzzyMatchV1, FuzzyMatchV2)
+	test("Danço", "danco", 0, 5, 128, FuzzyMatchV1, FuzzyMatchV2, PrefixMatch, SuffixMatch, ExactMatchNaive, EqualMatch)
 }

 func TestLongString(t *testing.T) {
--- a/src/ansi.go
+++ b/src/ansi.go
@@ -55,9 +55,6 @@ func (s *ansiState) ToString() string {
 	if s.attr&tui.Reverse > 0 {
 		ret += "7;"
 	}
-	if s.attr&tui.StrikeThrough > 0 {
-		ret += "9;"
-	}
 	ret += toAnsiString(s.fg, 30) + toAnsiString(s.bg, 40)

 	return "\x1b[" + strings.TrimSuffix(ret, ";") + "m"
@@ -88,7 +85,7 @@ func isPrint(c uint8) bool {
 }

 func matchOperatingSystemCommand(s string) int {
-	// `\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)`
+	// `\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)`
 	//                        ^ match starting here
 	//
 	i := 5 // prefix matched in nextAnsiEscapeSequence()
@@ -106,37 +103,30 @@ func matchOperatingSystemCommand(s string) int {
 }

 func matchControlSequence(s string) int {
-	// `\x1b[\\[()][0-9;:?]*[a-zA-Z@]`
-	//                     ^ match starting here
+	// `\x1b[\\[()][0-9;?]*[a-zA-Z@]`
+	//                    ^ match starting here
 	//
 	i := 2 // prefix matched in nextAnsiEscapeSequence()
-	for ; i < len(s); i++ {
+	for ; i < len(s) && (isNumeric(s[i]) || s[i] == ';' || s[i] == '?'); i++ {
+	}
+	if i < len(s) {
 		c := s[i]
-		switch c {
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ';', ':', '?':
-			// ok
-		default:
-			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '@' {
-				return i + 1
-			}
-			return -1
+		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '@' {
+			return i + 1
 		}
 	}
 	return -1
 }

 func isCtrlSeqStart(c uint8) bool {
-	switch c {
-	case '\\', '[', '(', ')':
-		return true
-	}
-	return false
+	return c == '\\' || c == '[' || c == '(' || c == ')'
 }

 // nextAnsiEscapeSequence returns the ANSI escape sequence and is equivalent to
 // calling FindStringIndex() on the below regex (which was originally used):
 //
-// "(?:\x1b[\\[()][0-9;:?]*[a-zA-Z@]|\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)"
+// "(?:\x1b[\\[()][0-9;?]*[a-zA-Z@]|\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)"
+//
 func nextAnsiEscapeSequence(s string) (int, int) {
 	// fast check for ANSI escape sequences
 	i := 0
@@ -164,16 +154,16 @@ Loop:
 				return i - n, i + 1
 			}
 		case '\x1b':
-			// match: `\x1b[\\[()][0-9;:?]*[a-zA-Z@]`
+			// match: `\x1b[\\[()][0-9;?]*[a-zA-Z@]`
 			if i+2 < len(s) && isCtrlSeqStart(s[i+1]) {
 				if j := matchControlSequence(s[i:]); j != -1 {
 					return i, i + j
 				}
 			}

-			// match: `\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)`
+			// match: `\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)`
 			if i+5 < len(s) && s[i+1] == ']' && isNumeric(s[i+2]) &&
-				(s[i+3] == ';' || s[i+3] == ':') && isPrint(s[i+4]) {
+				s[i+3] == ';' && isPrint(s[i+4]) {

 				if j := matchOperatingSystemCommand(s[i:]); j != -1 {
 					return i, i + j
@@ -290,20 +280,9 @@ func extractColor(str string, state *ansiState, proc func(string, *ansiState) bo
 	return trimmed, nil, state
 }

-func parseAnsiCode(s string, delimiter byte) (int, byte, string) {
+func parseAnsiCode(s string) (int, string) {
 	var remaining string
-	i := -1
-	if delimiter == 0 {
-		// Faster than strings.IndexAny(";:")
-		i = strings.IndexByte(s, ';')
-		if i < 0 {
-			i = strings.IndexByte(s, ':')
-		}
-	} else {
-		i = strings.IndexByte(s, delimiter)
-	}
-	if i >= 0 {
-		delimiter = s[i]
+	if i := strings.IndexByte(s, ';'); i >= 0 {
 		remaining = s[i+1:]
 		s = s[:i]
 	}
@@ -315,14 +294,14 @@ func parseAnsiCode(s string, delimiter byte) (int, byte, string) {
 		for _, ch := range []byte(s) {
 			ch -= '0'
 			if ch > 9 {
-				return -1, delimiter, remaining
+				return -1, remaining
 			}
 			code = code*10 + int(ch)
 		}
-		return code, delimiter, remaining
+		return code, remaining
 	}

-	return -1, delimiter, remaining
+	return -1, remaining
 }

 func interpretCode(ansiCode string, prevState *ansiState) ansiState {
@@ -350,10 +329,9 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 	state256 := 0
 	ptr := &state.fg

-	var delimiter byte = 0
 	for len(ansiCode) != 0 {
 		var num int
-		if num, delimiter, ansiCode = parseAnsiCode(ansiCode, delimiter); num != -1 {
+		if num, ansiCode = parseAnsiCode(ansiCode); num != -1 {
 			switch state256 {
 			case 0:
 				switch num {
@@ -379,8 +357,6 @@ func interpretCode(ansiCode string, prevState *ansiState) ansiState {
 					state.attr = state.attr | tui.Blink
 				case 7:
 					state.attr = state.attr | tui.Reverse
-				case 9:
-					state.attr = state.attr | tui.StrikeThrough
 				case 23: // tput rmso
 					state.attr = state.attr &^ tui.Italic
 				case 24: // tput rmul
--- a/src/ansi_test.go
+++ b/src/ansi_test.go
@@ -15,14 +15,14 @@ import (
 // testing nextAnsiEscapeSequence().
 //
 // References:
-//   - https://github.com/gnachman/iTerm2
-//   - https://web.archive.org/web/20090204053813/http://ascii-table.com/ansi-escape-sequences.php
-//     (archived from http://ascii-table.com/ansi-escape-sequences.php)
-//   - https://web.archive.org/web/20090227051140/http://ascii-table.com/ansi-escape-sequences-vt-100.php
-//     (archived from http://ascii-table.com/ansi-escape-sequences-vt-100.php)
-//   - http://tldp.org/HOWTO/Bash-Prompt-HOWTO/x405.html
-//   - https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
-var ansiRegexReference = regexp.MustCompile("(?:\x1b[\\[()][0-9;:]*[a-zA-Z@]|\x1b][0-9][;:][[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)")
+// 	- https://github.com/gnachman/iTerm2
+// 	- https://web.archive.org/web/20090204053813/http://ascii-table.com/ansi-escape-sequences.php
+//      (archived from http://ascii-table.com/ansi-escape-sequences.php)
+// 	- https://web.archive.org/web/20090227051140/http://ascii-table.com/ansi-escape-sequences-vt-100.php
+//      (archived from http://ascii-table.com/ansi-escape-sequences-vt-100.php)
+// 	- http://tldp.org/HOWTO/Bash-Prompt-HOWTO/x405.html
+// 	- https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+var ansiRegexReference = regexp.MustCompile("(?:\x1b[\\[()][0-9;]*[a-zA-Z@]|\x1b][0-9];[[:print:]]+(?:\x1b\\\\|\x07)|\x1b.|[\x0e\x0f]|.\x08)")

 func testParserReference(t testing.TB, str string) {
 	t.Helper()
@@ -358,7 +358,6 @@ func TestAnsiCodeStringConversion(t *testing.T) {
 	assert("\x1b[31m", &ansiState{fg: 4, bg: 4, lbg: -1}, "\x1b[31;44m")
 	assert("\x1b[1;2;31m", &ansiState{fg: 2, bg: -1, attr: tui.Reverse, lbg: -1}, "\x1b[1;2;7;31;49m")
 	assert("\x1b[38;5;100;48;5;200m", nil, "\x1b[38;5;100;48;5;200m")
-	assert("\x1b[38:5:100:48:5:200m", nil, "\x1b[38;5;100;48;5;200m")
 	assert("\x1b[48;5;100;38;5;200m", nil, "\x1b[38;5;200;48;5;100m")
 	assert("\x1b[48;5;100;38;2;10;20;30;1m", nil, "\x1b[1;38;2;10;20;30;48;5;100m")
 	assert("\x1b[48;5;100;38;2;10;20;30;7m",
@@ -378,7 +377,7 @@ func TestParseAnsiCode(t *testing.T) {
 		{"-2", "", -1},
 	}
 	for _, x := range tests {
-		n, _, s := parseAnsiCode(x.In, 0)
+		n, s := parseAnsiCode(x.In)
 		if n != x.N || s != x.Exp {
 			t.Fatalf("%q: got: (%d %q) want: (%d %q)", x.In, n, s, x.N, x.Exp)
 		}
@@ -386,9 +385,9 @@ func TestParseAnsiCode(t *testing.T) {
 }

 // kernel/bpf/preload/iterators/README
-const ansiBenchmarkString = "\x1b[38;5;81m\x1b[01;31m\x1b[Kkernel/\x1b[0m\x1b[38:5:81mbpf/" +
-	"\x1b[0m\x1b[38:5:81mpreload/\x1b[0m\x1b[38;5;81miterators/" +
-	"\x1b[0m\x1b[38:5:149mMakefile\x1b[m\x1b[K\x1b[0m"
+const ansiBenchmarkString = "\x1b[38;5;81m\x1b[01;31m\x1b[Kkernel/\x1b[0m\x1b[38;5;81mbpf/" +
+	"\x1b[0m\x1b[38;5;81mpreload/\x1b[0m\x1b[38;5;81miterators/" +
+	"\x1b[0m\x1b[38;5;149mMakefile\x1b[m\x1b[K\x1b[0m"

 func BenchmarkNextAnsiEscapeSequence(b *testing.B) {
 	b.SetBytes(int64(len(ansiBenchmarkString)))
--- a/src/core.go
+++ b/src/core.go
@@ -1,4 +1,28 @@
-// Package fzf implements fzf, a command-line fuzzy finder.
+/*
+Package fzf implements fzf, a command-line fuzzy finder.
+
+The MIT License (MIT)
+
+Copyright (c) 2013-2021 Junegunn Choi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
 package fzf

 import (
@@ -122,20 +146,18 @@ func Run(opts *Options, version string, revision string) {

 	// Matcher
 	forward := true
-	withPos := false
-	for idx := len(opts.Criteria) - 1; idx > 0; idx-- {
-		switch opts.Criteria[idx] {
-		case byChunk:
-			withPos = true
-		case byEnd:
+	for _, cri := range opts.Criteria[1:] {
+		if cri == byEnd {
 			forward = false
-		case byBegin:
-			forward = true
+			break
+		}
+		if cri == byBegin {
+			break
 		}
 	}
 	patternBuilder := func(runes []rune) *Pattern {
 		return BuildPattern(
-			opts.Fuzzy, opts.FuzzyAlgo, opts.Extended, opts.Case, opts.Normalize, forward, withPos,
+			opts.Fuzzy, opts.FuzzyAlgo, opts.Extended, opts.Case, opts.Normalize, forward,
 			opts.Filter == nil, opts.Nth, opts.Delimiter, runes)
 	}
 	matcher := NewMatcher(patternBuilder, sort, opts.Tac, eventBox)
@@ -194,17 +216,10 @@ func Run(opts *Options, version string, revision string) {

 	// Terminal I/O
 	terminal := NewTerminal(opts, eventBox)
-	maxFit := 0 // Maximum number of items that can fit on screen
-	padHeight := 0
-	heightUnknown := opts.Height.auto
-	if heightUnknown {
-		maxFit, padHeight = terminal.MaxFitAndPad(opts)
-	}
 	deferred := opts.Select1 || opts.Exit0
 	go terminal.Loop()
-	if !deferred && !heightUnknown {
-		// Start right away
-		terminal.startChan <- fitpad{-1, -1}
+	if !deferred {
+		terminal.startChan <- true
 	}

 	// Event coordination
@@ -223,19 +238,7 @@ func Run(opts *Options, version string, revision string) {
 		go reader.restart(command)
 	}
 	eventBox.Watch(EvtReadNew)
-	total := 0
 	query := []rune{}
-	determine := func(final bool) {
-		if heightUnknown {
-			if total >= maxFit || final {
-				heightUnknown = false
-				terminal.startChan <- fitpad{util.Min(total, maxFit), padHeight}
-			}
-		} else if deferred {
-			deferred = false
-			terminal.startChan <- fitpad{-1, -1}
-		}
-	}
 	for {
 		delay := true
 		ticks++
@@ -268,15 +271,11 @@ func Run(opts *Options, version string, revision string) {
 						reading = reading && evt == EvtReadNew
 					}
 					snapshot, count := chunkList.Snapshot()
-					total = count
-					terminal.UpdateCount(total, !reading, value.(*string))
+					terminal.UpdateCount(count, !reading, value.(*string))
 					if opts.Sync {
 						opts.Sync = false
 						terminal.UpdateList(PassMerger(&snapshot, opts.Tac), false)
 					}
-					if heightUnknown && !deferred {
-						determine(!reading)
-					}
 					reset := clearCache()
 					matcher.Reset(snapshot, input(reset), false, !reading, sort, reset)

@@ -318,7 +317,8 @@ func Run(opts *Options, version string, revision string) {
 						if deferred {
 							count := val.Length()
 							if opts.Select1 && count > 1 || opts.Exit0 && !opts.Select1 && count > 0 {
-								determine(val.final)
+								deferred = false
+								terminal.startChan <- true
 							} else if val.final {
 								if opts.Exit0 && count == 0 || opts.Select1 && count == 1 {
 									if opts.PrintQuery {
@@ -335,7 +335,8 @@ func Run(opts *Options, version string, revision string) {
 									}
 									os.Exit(exitNoMatch)
 								}
-								determine(val.final)
+								deferred = false
+								terminal.startChan <- true
 							}
 						}
 						terminal.UpdateList(val, clearSelection())
--- a/src/options.go
+++ b/src/options.go
@@ -18,107 +18,95 @@ import (
 const usage = `usage: fzf [options]

  Search
-    -x, --extended         Extended-search mode
-                           (enabled by default; +x or --no-extended to disable)
-    -e, --exact            Enable Exact-match
-    -i                     Case-insensitive match (default: smart-case match)
-    +i                     Case-sensitive match
-    --scheme=SCHEME        Scoring scheme [default|path|history]
-    --literal              Do not normalize latin script letters before matching
-    -n, --nth=N[,..]       Comma-separated list of field index expressions
-                           for limiting search scope. Each can be a non-zero
-                           integer or a range expression ([BEGIN]..[END]).
-    --with-nth=N[,..]      Transform the presentation of each line using
-                           field index expressions
-    -d, --delimiter=STR    Field delimiter regex (default: AWK-style)
-    +s, --no-sort          Do not sort the result
-    --tac                  Reverse the order of the input
-    --disabled             Do not perform search
-    --tiebreak=CRI[,..]    Comma-separated list of sort criteria to apply
-                           when the scores are tied [length|chunk|begin|end|index]
-                           (default: length)
+    -x, --extended        Extended-search mode
+                          (enabled by default; +x or --no-extended to disable)
+    -e, --exact           Enable Exact-match
+    --algo=TYPE           Fuzzy matching algorithm: [v1|v2] (default: v2)
+    -i                    Case-insensitive match (default: smart-case match)
+    +i                    Case-sensitive match
+    --literal             Do not normalize latin script letters before matching
+    -n, --nth=N[,..]      Comma-separated list of field index expressions
+                          for limiting search scope. Each can be a non-zero
+                          integer or a range expression ([BEGIN]..[END]).
+    --with-nth=N[,..]     Transform the presentation of each line using
+                          field index expressions
+    -d, --delimiter=STR   Field delimiter regex (default: AWK-style)
+    +s, --no-sort         Do not sort the result
+    --tac                 Reverse the order of the input
+    --disabled            Do not perform search
+    --tiebreak=CRI[,..]   Comma-separated list of sort criteria to apply
+                          when the scores are tied [length|begin|end|index]
+                          (default: length)

  Interface
-    -m, --multi[=MAX]      Enable multi-select with tab/shift-tab
-    --no-mouse             Disable mouse
-    --bind=KEYBINDS        Custom key bindings. Refer to the man page.
-    --cycle                Enable cyclic scroll
-    --keep-right           Keep the right end of the line visible on overflow
-    --scroll-off=LINES     Number of screen lines to keep above or below when
-                           scrolling to the top or to the bottom (default: 0)
-    --no-hscroll           Disable horizontal scroll
-    --hscroll-off=COLS     Number of screen columns to keep to the right of the
-                           highlighted substring (default: 10)
-    --filepath-word        Make word-wise movements respect path separators
-    --jump-labels=CHARS    Label characters for jump and jump-accept
+    -m, --multi[=MAX]     Enable multi-select with tab/shift-tab
+    --no-mouse            Disable mouse
+    --bind=KEYBINDS       Custom key bindings. Refer to the man page.
+    --cycle               Enable cyclic scroll
+    --keep-right          Keep the right end of the line visible on overflow
+    --scroll-off=LINES    Number of screen lines to keep above or below when
+                          scrolling to the top or to the bottom (default: 0)
+    --no-hscroll          Disable horizontal scroll
+    --hscroll-off=COLS    Number of screen columns to keep to the right of the
+                          highlighted substring (default: 10)
+    --filepath-word       Make word-wise movements respect path separators
+    --jump-labels=CHARS   Label characters for jump and jump-accept

  Layout
-    --height=[~]HEIGHT[%]  Display fzf window below the cursor with the given
-                           height instead of using fullscreen.
-                           If prefixed with '~', fzf will determine the height
-                           according to the input size.
-    --min-height=HEIGHT    Minimum height when --height is given in percent
-                           (default: 10)
-    --layout=LAYOUT        Choose layout: [default|reverse|reverse-list]
-    --border[=STYLE]       Draw border around the finder
-                           [rounded|sharp|horizontal|vertical|
-                            top|bottom|left|right|none] (default: rounded)
-    --border-label=LABEL   Label to print on the border
-    --border-label-pos=COL Position of the border label
-                           [POSITIVE_INTEGER: columns from left|
-                            NEGATIVE_INTEGER: columns from right][:bottom]
-                           (default: 0 or center)
-    --margin=MARGIN        Screen margin (TRBL | TB,RL | T,RL,B | T,R,B,L)
-    --padding=PADDING      Padding inside border (TRBL | TB,RL | T,RL,B | T,R,B,L)
-    --info=STYLE           Finder info style [default|inline|hidden]
-    --separator=STR        String to form horizontal separator on info line
-    --no-separator         Hide info line separator
-    --prompt=STR           Input prompt (default: '> ')
-    --pointer=STR          Pointer to the current line (default: '>')
-    --marker=STR           Multi-select marker (default: '>')
-    --header=STR           String to print as header
-    --header-lines=N       The first N lines of the input are treated as header
-    --header-first         Print header before the prompt line
-    --ellipsis=STR         Ellipsis to show when line is truncated (default: '..')
+    --height=HEIGHT[%]    Display fzf window below the cursor with the given
+                          height instead of using fullscreen
+    --min-height=HEIGHT   Minimum height when --height is given in percent
+                          (default: 10)
+    --layout=LAYOUT       Choose layout: [default|reverse|reverse-list]
+    --border[=STYLE]      Draw border around the finder
+                          [rounded|sharp|horizontal|vertical|
+                           top|bottom|left|right|none] (default: rounded)
+    --margin=MARGIN       Screen margin (TRBL | TB,RL | T,RL,B | T,R,B,L)
+    --padding=PADDING     Padding inside border (TRBL | TB,RL | T,RL,B | T,R,B,L)
+    --info=STYLE          Finder info style [default|inline|hidden]
+    --prompt=STR          Input prompt (default: '> ')
+    --pointer=STR         Pointer to the current line (default: '>')
+    --marker=STR          Multi-select marker (default: '>')
+    --header=STR          String to print as header
+    --header-lines=N      The first N lines of the input are treated as header
+    --header-first        Print header before the prompt line
+    --ellipsis=STR        Ellipsis to show when line is truncated (default: '..')

  Display
-    --ansi                 Enable processing of ANSI color codes
-    --tabstop=SPACES       Number of spaces for a tab character (default: 8)
-    --color=COLSPEC        Base scheme (dark|light|16|bw) and/or custom colors
-    --no-bold              Do not use bold text
+    --ansi                Enable processing of ANSI color codes
+    --tabstop=SPACES      Number of spaces for a tab character (default: 8)
+    --color=COLSPEC       Base scheme (dark|light|16|bw) and/or custom colors
+    --no-bold             Do not use bold text

  History
-    --history=FILE         History file
-    --history-size=N       Maximum number of history entries (default: 1000)
+    --history=FILE        History file
+    --history-size=N      Maximum number of history entries (default: 1000)

  Preview
-    --preview=COMMAND      Command to preview highlighted line ({})
-    --preview-window=OPT   Preview window layout (default: right:50%)
-                           [up|down|left|right][,SIZE[%]]
-                           [,[no]wrap][,[no]cycle][,[no]follow][,[no]hidden]
-                           [,border-BORDER_OPT]
-                           [,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES]
-                           [,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]
-    --preview-label=LABEL
-    --preview-label-pos=N  Same as --border-label and --border-label-pos,
-                           but for preview window
+    --preview=COMMAND     Command to preview highlighted line ({})
+    --preview-window=OPT  Preview window layout (default: right:50%)
+                          [up|down|left|right][,SIZE[%]]
+                          [,[no]wrap][,[no]cycle][,[no]follow][,[no]hidden]
+                          [,border-BORDER_OPT]
+                          [,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES]
+                          [,default][,<SIZE_THRESHOLD(ALTERNATIVE_LAYOUT)]

  Scripting
-    -q, --query=STR        Start the finder with the given query
-    -1, --select-1         Automatically select the only match
-    -0, --exit-0           Exit immediately when there's no match
-    -f, --filter=STR       Filter mode. Do not start interactive finder.
-    --print-query          Print query as the first line
-    --expect=KEYS          Comma-separated list of keys to complete fzf
-    --read0                Read input delimited by ASCII NUL characters
-    --print0               Print output delimited by ASCII NUL characters
-    --sync                 Synchronous search for multi-staged filtering
-    --version              Display version information and exit
+    -q, --query=STR       Start the finder with the given query
+    -1, --select-1        Automatically select the only match
+    -0, --exit-0          Exit immediately when there's no match
+    -f, --filter=STR      Filter mode. Do not start interactive finder.
+    --print-query         Print query as the first line
+    --expect=KEYS         Comma-separated list of keys to complete fzf
+    --read0               Read input delimited by ASCII NUL characters
+    --print0              Print output delimited by ASCII NUL characters
+    --sync                Synchronous search for multi-staged filtering
+    --version             Display version information and exit

  Environment variables
-    FZF_DEFAULT_COMMAND    Default command to use when input is tty
-    FZF_DEFAULT_OPTS       Default options
-                           (e.g. '--layout=reverse --inline-info')
+    FZF_DEFAULT_COMMAND   Default command to use when input is tty
+    FZF_DEFAULT_OPTS      Default options
+                          (e.g. '--layout=reverse --inline-info')

 `

@@ -137,18 +125,11 @@ type criterion int

 const (
 	byScore criterion = iota
-	byChunk
 	byLength
 	byBegin
 	byEnd
 )

-type heightSpec struct {
-	size    float64
-	percent bool
-	auto    bool
-}
-
 type sizeSpec struct {
 	size    float64
 	percent bool
@@ -183,12 +164,6 @@ const (
 	infoHidden
 )

-type labelOpts struct {
-	label  string
-	column int
-	bottom bool
-}
-
 type previewOpts struct {
 	command     string
 	position    windowPosition
@@ -204,27 +179,6 @@ type previewOpts struct {
 	alternative *previewOpts
 }

-func parseLabelPosition(opts *labelOpts, arg string) {
-	opts.column = 0
-	opts.bottom = false
-	for _, token := range splitRegexp.Split(strings.ToLower(arg), -1) {
-		switch token {
-		case "center":
-			opts.column = 0
-		case "bottom":
-			opts.bottom = true
-		case "top":
-			opts.bottom = false
-		default:
-			opts.column = atoi(token)
-		}
-	}
-}
-
-func (a previewOpts) aboveOrBelow() bool {
-	return a.size.size > 0 && (a.position == posUp || a.position == posDown)
-}
-
 func (a previewOpts) sameLayout(b previewOpts) bool {
 	return a.size == b.size && a.position == b.position && a.border == b.border && a.hidden == b.hidden && a.threshold == b.threshold &&
 		(a.alternative != nil && b.alternative != nil && a.alternative.sameLayout(*b.alternative) ||
@@ -237,67 +191,63 @@ func (a previewOpts) sameContentLayout(b previewOpts) bool {

 // Options stores the values of command-line options
 type Options struct {
-	Fuzzy        bool
-	FuzzyAlgo    algo.Algo
-	Scheme       string
-	Extended     bool
-	Phony        bool
-	Case         Case
-	Normalize    bool
-	Nth          []Range
-	WithNth      []Range
-	Delimiter    Delimiter
-	Sort         int
-	Tac          bool
-	Criteria     []criterion
-	Multi        int
-	Ansi         bool
-	Mouse        bool
-	Theme        *tui.ColorTheme
-	Black        bool
-	Bold         bool
-	Height       heightSpec
-	MinHeight    int
-	Layout       layoutType
-	Cycle        bool
-	KeepRight    bool
-	Hscroll      bool
-	HscrollOff   int
-	ScrollOff    int
-	FileWord     bool
-	InfoStyle    infoStyle
-	Separator    *string
-	JumpLabels   string
-	Prompt       string
-	Pointer      string
-	Marker       string
-	Query        string
-	Select1      bool
-	Exit0        bool
-	Filter       *string
-	ToggleSort   bool
-	Expect       map[tui.Event]string
-	Keymap       map[tui.Event][]*action
-	Preview      previewOpts
-	PrintQuery   bool
-	ReadZero     bool
-	Printer      func(string)
-	PrintSep     string
-	Sync         bool
-	History      *History
-	Header       []string
-	HeaderLines  int
-	HeaderFirst  bool
-	Ellipsis     string
-	Margin       [4]sizeSpec
-	Padding      [4]sizeSpec
-	BorderShape  tui.BorderShape
-	BorderLabel  labelOpts
-	PreviewLabel labelOpts
-	Unicode      bool
-	Tabstop      int
-	ClearOnExit  bool
-	Version      bool
+	Fuzzy       bool
+	FuzzyAlgo   algo.Algo
+	Extended    bool
+	Phony       bool
+	Case        Case
+	Normalize   bool
+	Nth         []Range
+	WithNth     []Range
+	Delimiter   Delimiter
+	Sort        int
+	Tac         bool
+	Criteria    []criterion
+	Multi       int
+	Ansi        bool
+	Mouse       bool
+	Theme       *tui.ColorTheme
+	Black       bool
+	Bold        bool
+	Height      sizeSpec
+	MinHeight   int
+	Layout      layoutType
+	Cycle       bool
+	KeepRight   bool
+	Hscroll     bool
+	HscrollOff  int
+	ScrollOff   int
+	FileWord    bool
+	InfoStyle   infoStyle
+	JumpLabels  string
+	Prompt      string
+	Pointer     string
+	Marker      string
+	Query       string
+	Select1     bool
+	Exit0       bool
+	Filter      *string
+	ToggleSort  bool
+	Expect      map[tui.Event]string
+	Keymap      map[tui.Event][]*action
+	Preview     previewOpts
+	PrintQuery  bool
+	ReadZero    bool
+	Printer     func(string)
+	PrintSep    string
+	Sync        bool
+	History     *History
+	Header      []string
+	HeaderLines int
+	HeaderFirst bool
+	Ellipsis    string
+	Margin      [4]sizeSpec
+	Padding     [4]sizeSpec
+	BorderShape tui.BorderShape
+	Unicode     bool
+	Tabstop     int
+	ClearOnExit bool
+	Version     bool
 }

 func defaultPreviewOpts(command string) previewOpts {
@@ -306,65 +256,61 @@ func defaultPreviewOpts(command string) previewOpts {

 func defaultOptions() *Options {
 	return &Options{
-		Fuzzy:        true,
-		FuzzyAlgo:    algo.FuzzyMatchV2,
-		Scheme:       "default",
-		Extended:     true,
-		Phony:        false,
-		Case:         CaseSmart,
-		Normalize:    true,
-		Nth:          make([]Range, 0),
-		WithNth:      make([]Range, 0),
-		Delimiter:    Delimiter{},
-		Sort:         1000,
-		Tac:          false,
-		Criteria:     []criterion{byScore, byLength},
-		Multi:        0,
-		Ansi:         false,
-		Mouse:        true,
-		Theme:        tui.EmptyTheme(),
-		Black:        false,
-		Bold:         true,
-		MinHeight:    10,
-		Layout:       layoutDefault,
-		Cycle:        false,
-		KeepRight:    false,
-		Hscroll:      true,
-		HscrollOff:   10,
-		ScrollOff:    0,
-		FileWord:     false,
-		InfoStyle:    infoDefault,
-		Separator:    nil,
-		JumpLabels:   defaultJumpLabels,
-		Prompt:       "> ",
-		Pointer:      ">",
-		Marker:       ">",
-		Query:        "",
-		Select1:      false,
-		Exit0:        false,
-		Filter:       nil,
-		ToggleSort:   false,
-		Expect:       make(map[tui.Event]string),
-		Keymap:       make(map[tui.Event][]*action),
-		Preview:      defaultPreviewOpts(""),
-		PrintQuery:   false,
-		ReadZero:     false,
-		Printer:      func(str string) { fmt.Println(str) },
-		PrintSep:     "\n",
-		Sync:         false,
-		History:      nil,
-		Header:       make([]string, 0),
-		HeaderLines:  0,
-		HeaderFirst:  false,
-		Ellipsis:     "..",
-		Margin:       defaultMargin(),
-		Padding:      defaultMargin(),
-		Unicode:      true,
-		Tabstop:      8,
-		BorderLabel:  labelOpts{},
-		PreviewLabel: labelOpts{},
-		ClearOnExit:  true,
-		Version:      false}
+		Fuzzy:       true,
+		FuzzyAlgo:   algo.FuzzyMatchV2,
+		Extended:    true,
+		Phony:       false,
+		Case:        CaseSmart,
+		Normalize:   true,
+		Nth:         make([]Range, 0),
+		WithNth:     make([]Range, 0),
+		Delimiter:   Delimiter{},
+		Sort:        1000,
+		Tac:         false,
+		Criteria:    []criterion{byScore, byLength},
+		Multi:       0,
+		Ansi:        false,
+		Mouse:       true,
+		Theme:       tui.EmptyTheme(),
+		Black:       false,
+		Bold:        true,
+		MinHeight:   10,
+		Layout:      layoutDefault,
+		Cycle:       false,
+		KeepRight:   false,
+		Hscroll:     true,
+		HscrollOff:  10,
+		ScrollOff:   0,
+		FileWord:    false,
+		InfoStyle:   infoDefault,
+		JumpLabels:  defaultJumpLabels,
+		Prompt:      "> ",
+		Pointer:     ">",
+		Marker:      ">",
+		Query:       "",
+		Select1:     false,
+		Exit0:       false,
+		Filter:      nil,
+		ToggleSort:  false,
+		Expect:      make(map[tui.Event]string),
+		Keymap:      make(map[tui.Event][]*action),
+		Preview:     defaultPreviewOpts(""),
+		PrintQuery:  false,
+		ReadZero:    false,
+		Printer:     func(str string) { fmt.Println(str) },
+		PrintSep:    "\n",
+		Sync:        false,
+		History:     nil,
+		Header:      make([]string, 0),
+		HeaderLines: 0,
+		HeaderFirst: false,
+		Ellipsis:    "..",
+		Margin:      defaultMargin(),
+		Padding:     defaultMargin(),
+		Unicode:     true,
+		Tabstop:     8,
+		ClearOnExit: true,
+		Version:     false}
 }

 func help(code int) {
@@ -494,25 +440,12 @@ func parseAlgo(str string) algo.Algo {
 	return algo.FuzzyMatchV2
 }

-func processScheme(opts *Options) {
-	if !algo.Init(opts.Scheme) {
-		errorExit("invalid scoring scheme (expected: default|path|history)")
-	}
-	if opts.Scheme == "history" {
-		opts.Criteria = []criterion{byScore}
-	}
-}
-
 func parseBorder(str string, optional bool) tui.BorderShape {
 	switch str {
 	case "rounded":
 		return tui.BorderRounded
 	case "sharp":
 		return tui.BorderSharp
-	case "bold":
-		return tui.BorderBold
-	case "double":
-		return tui.BorderDouble
 	case "horizontal":
 		return tui.BorderHorizontal
 	case "vertical":
@@ -531,7 +464,7 @@ func parseBorder(str string, optional bool) tui.BorderShape {
 		if optional && str == "" {
 			return tui.BorderRounded
 		}
-		errorExit("invalid border style (expected: rounded|sharp|bold|double|horizontal|vertical|top|bottom|left|right|none)")
+		errorExit("invalid border style (expected: rounded|sharp|horizontal|vertical|top|bottom|left|right|none)")
 	}
 	return tui.BorderNone
 }
@@ -586,8 +519,6 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
 			add(tui.Change)
 		case "backward-eof":
 			add(tui.BackwardEOF)
-		case "start":
-			add(tui.Start)
 		case "alt-enter", "alt-return":
 			chords[tui.CtrlAltKey('m')] = key
 		case "alt-space":
@@ -680,7 +611,6 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
 func parseTiebreak(str string) []criterion {
 	criteria := []criterion{byScore}
 	hasIndex := false
-	hasChunk := false
 	hasLength := false
 	hasBegin := false
 	hasEnd := false
@@ -697,9 +627,6 @@ func parseTiebreak(str string) []criterion {
 		switch str {
 		case "index":
 			check(&hasIndex, "index")
-		case "chunk":
-			check(&hasChunk, "chunk")
-			criteria = append(criteria, byChunk)
 		case "length":
 			check(&hasLength, "length")
 			criteria = append(criteria, byLength)
@@ -713,9 +640,6 @@ func parseTiebreak(str string) []criterion {
 			errorExit("invalid sort criterion: " + str)
 		}
 	}
-	if len(criteria) > 4 {
-		errorExit("at most 3 tiebreaks are allowed: " + str)
-	}
 	return criteria
 }

@@ -768,8 +692,6 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme {
 						cattr.Attr |= tui.Blink
 					case "reverse":
 						cattr.Attr |= tui.Reverse
-					case "strikethrough":
-						cattr.Attr |= tui.StrikeThrough
 					case "black":
 						cattr.Color = tui.Color(0)
 					case "red":
@@ -841,10 +763,6 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme {
 				mergeAttr(&theme.CurrentMatch)
 			case "border":
 				mergeAttr(&theme.Border)
-			case "separator":
-				mergeAttr(&theme.Separator)
-			case "label":
-				mergeAttr(&theme.BorderLabel)
 			case "prompt":
 				mergeAttr(&theme.Prompt)
 			case "spinner":
@@ -865,10 +783,7 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) *tui.ColorTheme {
 	return theme
 }

-var (
-	executeRegexp *regexp.Regexp
-	splitRegexp   *regexp.Regexp
-)
+var executeRegexp *regexp.Regexp

 func firstKey(keymap map[tui.Event]string) tui.Event {
 	for k := range keymap {
@@ -888,7 +803,6 @@ func init() {
 	// "~!@#$%^&*;/|".each_char.map { |c| Regexp.escape(c) }.map { |c| "#{c}[^#{c}]*#{c}" }.join('|')
 	executeRegexp = regexp.MustCompile(
 		`(?si)[:+](execute(?:-multi|-silent)?|reload|preview|change-prompt|change-preview-window|change-preview|(?:re|un)bind):.+|[:+](execute(?:-multi|-silent)?|reload|preview|change-prompt|change-preview-window|change-preview|(?:re|un)bind)(\([^)]*\)|\[[^\]]*\]|~[^~]*~|![^!]*!|@[^@]*@|\#[^\#]*\#|\$[^\$]*\$|%[^%]*%|\^[^\^]*\^|&[^&]*&|\*[^\*]*\*|;[^;]*;|/[^/]*/|\|[^\|]*\|)`)
-	splitRegexp = regexp.MustCompile("[,:]+")
 }

 func parseKeymap(keymap map[tui.Event][]*action, str string) {
@@ -1141,6 +1055,11 @@ func parseKeymap(keymap map[tui.Event][]*action, str string) {
 					}
 					if t == actUnbind || t == actRebind {
 						parseKeyChords(actionArg, spec[0:offset]+" target required")
+					} else if t == actChangePreviewWindow {
+						opts := previewOpts{}
+						for _, arg := range strings.Split(actionArg, "|") {
+							parsePreviewWindow(&opts, arg)
+						}
 					}
 				}
 			}
@@ -1220,17 +1139,9 @@ func parseSize(str string, maxPercent float64, label string) sizeSpec {
 	return sizeSpec{val, percent}
 }

-func parseHeight(str string) heightSpec {
-	heightSpec := heightSpec{}
-	if strings.HasPrefix(str, "~") {
-		heightSpec.auto = true
-		str = str[1:]
-	}
-
+func parseHeight(str string) sizeSpec {
 	size := parseSize(str, 100, "height")
-	heightSpec.size = size.size
-	heightSpec.percent = size.percent
-	return heightSpec
+	return size
 }

 func parseLayout(str string) layoutType {
@@ -1256,7 +1167,7 @@ func parseInfoStyle(str string) infoStyle {
 	case "hidden":
 		return infoHidden
 	default:
-		errorExit("invalid info style (expected: default|inline|hidden)")
+		errorExit("invalid info style (expected: default / inline / hidden)")
 	}
 	return infoDefault
 }
@@ -1303,19 +1214,15 @@ func parsePreviewWindow(opts *previewOpts, input string) {
 			opts.border = tui.BorderRounded
 		case "sharp", "border-sharp":
 			opts.border = tui.BorderSharp
-		case "border-bold":
-			opts.border = tui.BorderBold
-		case "border-double":
-			opts.border = tui.BorderDouble
 		case "noborder", "border-none":
 			opts.border = tui.BorderNone
 		case "border-horizontal":
 			opts.border = tui.BorderHorizontal
 		case "border-vertical":
 			opts.border = tui.BorderVertical
-		case "border-up", "border-top":
+		case "border-top":
 			opts.border = tui.BorderTop
-		case "border-down", "border-bottom":
+		case "border-bottom":
 			opts.border = tui.BorderBottom
 		case "border-left":
 			opts.border = tui.BorderLeft
@@ -1428,8 +1335,6 @@ func parseOptions(opts *Options, allArgs []string) {
 			opts.Normalize = true
 		case "--algo":
 			opts.FuzzyAlgo = parseAlgo(nextString(allArgs, &i, "algorithm required (v1|v2)"))
-		case "--scheme":
-			opts.Scheme = strings.ToLower(nextString(allArgs, &i, "scoring scheme required (default|path|history)"))
 		case "--expect":
 			for k, v := range parseKeyChords(nextString(allArgs, &i, "key names required"), "key names required") {
 				opts.Expect[k] = v
@@ -1529,12 +1434,6 @@ func parseOptions(opts *Options, allArgs []string) {
 			opts.InfoStyle = infoInline
 		case "--no-inline-info":
 			opts.InfoStyle = infoDefault
-		case "--separator":
-			separator := nextString(allArgs, &i, "separator character required")
-			opts.Separator = &separator
-		case "--no-separator":
-			nosep := ""
-			opts.Separator = &nosep
 		case "--jump-labels":
 			opts.JumpLabels = nextString(allArgs, &i, "label characters required")
 			validateJumpLabels = true
@@ -1603,11 +1502,11 @@ func parseOptions(opts *Options, allArgs []string) {
 			parsePreviewWindow(&opts.Preview,
 				nextString(allArgs, &i, "preview window layout required: [up|down|left|right][,SIZE[%]][,border-BORDER_OPT][,wrap][,cycle][,hidden][,+SCROLL[OFFSETS][/DENOM]][,~HEADER_LINES][,default]"))
 		case "--height":
-			opts.Height = parseHeight(nextString(allArgs, &i, "height required: [~]HEIGHT[%]"))
+			opts.Height = parseHeight(nextString(allArgs, &i, "height required: HEIGHT[%]"))
 		case "--min-height":
 			opts.MinHeight = nextInt(allArgs, &i, "height required: HEIGHT")
 		case "--no-height":
-			opts.Height = heightSpec{}
+			opts.Height = sizeSpec{}
 		case "--no-margin":
 			opts.Margin = defaultMargin()
 		case "--no-padding":
@@ -1617,20 +1516,6 @@ func parseOptions(opts *Options, allArgs []string) {
 		case "--border":
 			hasArg, arg := optionalNextString(allArgs, &i)
 			opts.BorderShape = parseBorder(arg, !hasArg)
-		case "--no-border-label":
-			opts.BorderLabel.label = ""
-		case "--border-label":
-			opts.BorderLabel.label = nextString(allArgs, &i, "label required")
-		case "--border-label-pos":
-			pos := nextString(allArgs, &i, "label position required (positive or negative integer or 'center')")
-			parseLabelPosition(&opts.BorderLabel, pos)
-		case "--no-preview-label":
-			opts.PreviewLabel.label = ""
-		case "--preview-label":
-			opts.PreviewLabel.label = nextString(allArgs, &i, "preview label required")
-		case "--preview-label-pos":
-			pos := nextString(allArgs, &i, "preview label position required (positive or negative integer or 'center')")
-			parseLabelPosition(&opts.PreviewLabel, pos)
 		case "--no-unicode":
 			opts.Unicode = false
 		case "--unicode":
@@ -1651,13 +1536,9 @@ func parseOptions(opts *Options, allArgs []string) {
 			opts.ClearOnExit = false
 		case "--version":
 			opts.Version = true
-		case "--":
-			// Ignored
 		default:
 			if match, value := optString(arg, "--algo="); match {
 				opts.FuzzyAlgo = parseAlgo(value)
-			} else if match, value := optString(arg, "--scheme="); match {
-				opts.Scheme = strings.ToLower(value)
 			} else if match, value := optString(arg, "-q", "--query="); match {
 				opts.Query = value
 			} else if match, value := optString(arg, "-f", "--filter="); match {
@@ -1666,14 +1547,6 @@ func parseOptions(opts *Options, allArgs []string) {
 				opts.Delimiter = delimiterRegexp(value)
 			} else if match, value := optString(arg, "--border="); match {
 				opts.BorderShape = parseBorder(value, false)
-			} else if match, value := optString(arg, "--border-label="); match {
-				opts.BorderLabel.label = value
-			} else if match, value := optString(arg, "--border-label-pos="); match {
-				parseLabelPosition(&opts.BorderLabel, value)
-			} else if match, value := optString(arg, "--preview-label="); match {
-				opts.PreviewLabel.label = value
-			} else if match, value := optString(arg, "--preview-label-pos="); match {
-				parseLabelPosition(&opts.PreviewLabel, value)
 			} else if match, value := optString(arg, "--prompt="); match {
 				opts.Prompt = value
 			} else if match, value := optString(arg, "--pointer="); match {
@@ -1698,8 +1571,6 @@ func parseOptions(opts *Options, allArgs []string) {
 				opts.Layout = parseLayout(value)
 			} else if match, value := optString(arg, "--info="); match {
 				opts.InfoStyle = parseInfoStyle(value)
-			} else if match, value := optString(arg, "--separator="); match {
-				opts.Separator = &value
 			} else if match, value := optString(arg, "--toggle-sort="); match {
 				parseToggleSort(opts.Keymap, value)
 			} else if match, value := optString(arg, "--expect="); match {
@@ -1811,7 +1682,6 @@ func postProcessOptions(opts *Options) {
 	}

 	// Extend the default key map
-	previewEnabled := len(opts.Preview.command) > 0 || hasPreviewAction(opts)
 	keymap := defaultKeymap()
 	for key, actions := range opts.Keymap {
 		var lastChangePreviewWindow *action
@@ -1822,18 +1692,8 @@ func postProcessOptions(opts *Options) {
 				opts.ToggleSort = true
 			case actChangePreviewWindow:
 				lastChangePreviewWindow = act
-				if !previewEnabled {
-					// Doesn't matter
-					continue
-				}
-				opts := previewOpts{}
-				for _, arg := range strings.Split(act.a, "|") {
-					// Make sure that each expression is valid
-					parsePreviewWindow(&opts, arg)
-				}
 			}
 		}
-
 		// Re-organize actions so that we only keep the last change-preview-window
 		// and it comes first in the list.
 		//  *  change-preview-window(up,+10)+preview(sleep 3; cat {})+change-preview-window(up,+20)
@@ -1851,19 +1711,6 @@ func postProcessOptions(opts *Options) {
 	}
 	opts.Keymap = keymap

-	if opts.Height.auto {
-		for _, s := range []sizeSpec{opts.Margin[0], opts.Margin[2]} {
-			if s.percent {
-				errorExit("adaptive height is not compatible with top/bottom percent margin")
-			}
-		}
-		for _, s := range []sizeSpec{opts.Padding[0], opts.Padding[2]} {
-			if s.percent {
-				errorExit("adaptive height is not compatible with top/bottom percent padding")
-			}
-		}
-	}
-
 	// If we're not using extended search mode, --nth option becomes irrelevant
 	// if it contains the whole range
 	if !opts.Extended || len(opts.Nth) == 1 {
@@ -1893,26 +1740,14 @@ func postProcessOptions(opts *Options) {
 		theme.Cursor = boldify(theme.Cursor)
 		theme.Spinner = boldify(theme.Spinner)
 	}
-
-	if opts.Scheme != "default" {
-		processScheme(opts)
-	}
-}
-
-func expectsArbitraryString(opt string) bool {
-	switch opt {
-	case "-q", "--query", "-f", "--filter", "--header", "--prompt":
-		return true
-	}
-	return false
 }

 // ParseOptions parses command-line options
 func ParseOptions() *Options {
 	opts := defaultOptions()

-	for idx, arg := range os.Args[1:] {
-		if arg == "--version" && (idx == 0 || idx > 0 && !expectsArbitraryString(os.Args[idx])) {
+	for _, arg := range os.Args[1:] {
+		if arg == "--version" {
 			opts.Version = true
 			return opts
 		}
--- a/src/pattern.go
+++ b/src/pattern.go
@@ -51,7 +51,6 @@ type Pattern struct {
 	caseSensitive bool
 	normalize     bool
 	forward       bool
-	withPos       bool
 	text          []rune
 	termSets      []termSet
 	sortable      bool
@@ -86,7 +85,7 @@ func clearChunkCache() {

 // BuildPattern builds Pattern object from the given arguments
 func BuildPattern(fuzzy bool, fuzzyAlgo algo.Algo, extended bool, caseMode Case, normalize bool, forward bool,
-	withPos bool, cacheable bool, nth []Range, delimiter Delimiter, runes []rune) *Pattern {
+	cacheable bool, nth []Range, delimiter Delimiter, runes []rune) *Pattern {

 	var asString string
 	if extended {
@@ -146,7 +145,6 @@ func BuildPattern(fuzzy bool, fuzzyAlgo algo.Algo, extended bool, caseMode Case,
 		caseSensitive: caseSensitive,
 		normalize:     normalize,
 		forward:       forward,
-		withPos:       withPos,
 		text:          []rune(asString),
 		termSets:      termSets,
 		sortable:      sortable,
@@ -304,13 +302,13 @@ func (p *Pattern) matchChunk(chunk *Chunk, space []Result, slab *util.Slab) []Re

 	if space == nil {
 		for idx := 0; idx < chunk.count; idx++ {
-			if match, _, _ := p.MatchItem(&chunk.items[idx], p.withPos, slab); match != nil {
+			if match, _, _ := p.MatchItem(&chunk.items[idx], false, slab); match != nil {
 				matches = append(matches, *match)
 			}
 		}
 	} else {
 		for _, result := range space {
-			if match, _, _ := p.MatchItem(result.item, p.withPos, slab); match != nil {
+			if match, _, _ := p.MatchItem(result.item, false, slab); match != nil {
 				matches = append(matches, *match)
 			}
 		}
--- a/src/pattern_test.go
+++ b/src/pattern_test.go
@@ -67,7 +67,7 @@ func TestParseTermsEmpty(t *testing.T) {
 func TestExact(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, false, true,
+	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, true,
 		[]Range{}, Delimiter{}, []rune("'abc"))
 	chars := util.ToChars([]byte("aabbcc abc"))
 	res, pos := algo.ExactMatchNaive(
@@ -83,7 +83,7 @@ func TestExact(t *testing.T) {
 func TestEqual(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, false, true, []Range{}, Delimiter{}, []rune("^AbC$"))
+	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, true, []Range{}, Delimiter{}, []rune("^AbC$"))

 	match := func(str string, sidxExpected int, eidxExpected int) {
 		chars := util.ToChars([]byte(str))
@@ -106,17 +106,17 @@ func TestEqual(t *testing.T) {
 func TestCaseSensitivity(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pat1 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseSmart, false, true, false, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat1 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseSmart, false, true, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat2 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseSmart, false, true, false, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat2 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseSmart, false, true, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat3 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseIgnore, false, true, false, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat3 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseIgnore, false, true, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat4 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseIgnore, false, true, false, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat4 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseIgnore, false, true, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat5 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseRespect, false, true, false, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat5 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseRespect, false, true, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat6 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseRespect, false, true, false, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat6 := BuildPattern(true, algo.FuzzyMatchV2, false, CaseRespect, false, true, true, []Range{}, Delimiter{}, []rune("Abc"))

 	if string(pat1.text) != "abc" || pat1.caseSensitive != false ||
 		string(pat2.text) != "Abc" || pat2.caseSensitive != true ||
@@ -129,7 +129,7 @@ func TestCaseSensitivity(t *testing.T) {
 }

 func TestOrigTextAndTransformed(t *testing.T) {
-	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, false, true, []Range{}, Delimiter{}, []rune("jg"))
+	pattern := BuildPattern(true, algo.FuzzyMatchV2, true, CaseSmart, false, true, true, []Range{}, Delimiter{}, []rune("jg"))
 	tokens := Tokenize("junegunn", Delimiter{})
 	trans := Transform(tokens, []Range{{1, 1}})

@@ -164,7 +164,7 @@ func TestOrigTextAndTransformed(t *testing.T) {
 func TestCacheKey(t *testing.T) {
 	test := func(extended bool, patStr string, expected string, cacheable bool) {
 		clearPatternCache()
-		pat := BuildPattern(true, algo.FuzzyMatchV2, extended, CaseSmart, false, true, false, true, []Range{}, Delimiter{}, []rune(patStr))
+		pat := BuildPattern(true, algo.FuzzyMatchV2, extended, CaseSmart, false, true, true, []Range{}, Delimiter{}, []rune(patStr))
 		if pat.CacheKey() != expected {
 			t.Errorf("Expected: %s, actual: %s", expected, pat.CacheKey())
 		}
@@ -188,7 +188,7 @@ func TestCacheKey(t *testing.T) {
 func TestCacheable(t *testing.T) {
 	test := func(fuzzy bool, str string, expected string, cacheable bool) {
 		clearPatternCache()
-		pat := BuildPattern(fuzzy, algo.FuzzyMatchV2, true, CaseSmart, true, true, false, true, []Range{}, Delimiter{}, []rune(str))
+		pat := BuildPattern(fuzzy, algo.FuzzyMatchV2, true, CaseSmart, true, true, true, []Range{}, Delimiter{}, []rune(str))
 		if pat.CacheKey() != expected {
 			t.Errorf("Expected: %s, actual: %s", expected, pat.CacheKey())
 		}
--- a/src/result.go
+++ b/src/result.go
@@ -49,22 +49,6 @@ func buildResult(item *Item, offsets []Offset, score int) Result {
 		case byScore:
 			// Higher is better
 			val = math.MaxUint16 - util.AsUint16(score)
-		case byChunk:
-			if validOffsetFound {
-				b := minBegin
-				e := maxEnd
-				for ; b >= 1; b-- {
-					if unicode.IsSpace(item.text.Get(b - 1)) {
-						break
-					}
-				}
-				for ; e < numChars; e++ {
-					if unicode.IsSpace(item.text.Get(e)) {
-						break
-					}
-				}
-				val = util.AsUint16(e - b)
-			}
 		case byLength:
 			val = item.TrimLength()
 		case byBegin, byEnd:
--- a/src/result_test.go
+++ b/src/result_test.go
@@ -54,9 +54,9 @@ func TestResultRank(t *testing.T) {
 	// FIXME global
 	sortCriteria = []criterion{byScore, byLength}

-	str := []rune("foo")
+	strs := [][]rune{[]rune("foo"), []rune("foobar"), []rune("bar"), []rune("baz")}
 	item1 := buildResult(
-		withIndex(&Item{text: util.RunesToChars(str)}, 1), []Offset{}, 2)
+		withIndex(&Item{text: util.RunesToChars(strs[0])}, 1), []Offset{}, 2)
 	if item1.points[3] != math.MaxUint16-2 || // Bonus
 		item1.points[2] != 3 || // Length
 		item1.points[1] != 0 || // Unused
@@ -65,7 +65,7 @@ func TestResultRank(t *testing.T) {
 		t.Error(item1)
 	}
 	// Only differ in index
-	item2 := buildResult(&Item{text: util.RunesToChars(str)}, []Offset{}, 2)
+	item2 := buildResult(&Item{text: util.RunesToChars(strs[0])}, []Offset{}, 2)

 	items := []Result{item1, item2}
 	sort.Sort(ByRelevance(items))
@@ -98,23 +98,6 @@ func TestResultRank(t *testing.T) {
 	}
 }

-func TestChunkTiebreak(t *testing.T) {
-	// FIXME global
-	sortCriteria = []criterion{byScore, byChunk}
-
-	score := 100
-	test := func(input string, offset Offset, chunk string) {
-		item := buildResult(withIndex(&Item{text: util.RunesToChars([]rune(input))}, 1), []Offset{offset}, score)
-		if !(item.points[3] == math.MaxUint16-uint16(score) && item.points[2] == uint16(len(chunk))) {
-			t.Error(item.points)
-		}
-	}
-	test("hello foobar goodbye", Offset{8, 9}, "foobar")
-	test("hello foobar goodbye", Offset{7, 18}, "foobar goodbye")
-	test("hello foobar goodbye", Offset{0, 1}, "hello")
-	test("hello foobar goodbye", Offset{5, 7}, "hello foobar") // TBD
-}
-
 func TestColorOffset(t *testing.T) {
 	// ------------ 20 ----  --  ----
 	//   ++++++++        ++++++++++
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -25,14 +25,14 @@ import (
 // import "github.com/pkg/profile"

 /*
-Placeholder regex is used to extract placeholders from fzf's template
-strings. Acts as input validation for parsePlaceholder function.
-Describes the syntax, but it is fairly lenient.
+	Placeholder regex is used to extract placeholders from fzf's template
+	strings. Acts as input validation for parsePlaceholder function.
+	Describes the syntax, but it is fairly lenient.

-The following pseudo regex has been reverse engineered from the
-implementation. It is overly strict, but better describes what's possible.
-As such it is not useful for validation, but rather to generate test
-cases for example.
+	The following pseudo regex has been reverse engineered from the
+	implementation. It is overly strict, but better describes whats possible.
+	As such it is not useful for validation, but rather to generate test
+	cases for example.

 	\\?(?:                                      # escaped type
 	    {\+?s?f?RANGE(?:,RANGE)*}               # token type
@@ -100,30 +100,15 @@ type itemLine struct {
 	result   Result
 }

-type fitpad struct {
-	fit int
-	pad int
-}
-
 var emptyLine = itemLine{}

-type labelPrinter func(tui.Window, int)
-
 // Terminal represents terminal input/output
 type Terminal struct {
 	initDelay          time.Duration
 	infoStyle          infoStyle
-	separator          labelPrinter
-	separatorLen       int
 	spinner            []string
 	prompt             func()
 	promptLen          int
-	borderLabel        labelPrinter
-	borderLabelLen     int
-	borderLabelOpts    labelOpts
-	previewLabel       labelPrinter
-	previewLabelLen    int
-	previewLabelOpts   labelOpts
 	pointer            string
 	pointerLen         int
 	pointerEmpty       string
@@ -198,7 +183,7 @@ type Terminal struct {
 	prevLines          []itemLine
 	suppress           bool
 	sigstop            bool
-	startChan          chan fitpad
+	startChan          chan bool
 	killChan           chan int
 	slab               *util.Slab
 	theme              *tui.ColorTheme
@@ -454,13 +439,6 @@ func makeSpinner(unicode bool) []string {
 	return []string{`-`, `\`, `|`, `/`, `-`, `\`, `|`, `/`}
 }

-func evaluateHeight(opts *Options, termHeight int) int {
-	if opts.Height.percent {
-		return util.Max(int(opts.Height.size*float64(termHeight)/100.0), opts.MinHeight)
-	}
-	return int(opts.Height.size)
-}
-
 // NewTerminal returns new Terminal object
 func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	input := trimQuery(opts.Query)
@@ -487,7 +465,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		strongAttr = tui.AttrRegular
 	}
 	var renderer tui.Renderer
-	fullscreen := !opts.Height.auto && (opts.Height.size == 0 || opts.Height.percent && opts.Height.size == 100)
+	fullscreen := opts.Height.size == 0 || opts.Height.percent && opts.Height.size == 100
 	if fullscreen {
 		if tui.HasFullscreenRenderer() {
 			renderer = tui.NewFullscreenRenderer(opts.Theme, opts.Black, opts.Mouse)
@@ -497,16 +475,24 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		}
 	} else {
 		maxHeightFunc := func(termHeight int) int {
-			// Minimum height required to render fzf excluding margin and padding
+			var maxHeight int
+			if opts.Height.percent {
+				maxHeight = util.Max(int(opts.Height.size*float64(termHeight)/100.0), opts.MinHeight)
+			} else {
+				maxHeight = int(opts.Height.size)
+			}
+
 			effectiveMinHeight := minHeight
-			if previewBox != nil && opts.Preview.aboveOrBelow() {
-				effectiveMinHeight += 1 + borderLines(opts.Preview.border)
+			if previewBox != nil && (opts.Preview.position == posUp || opts.Preview.position == posDown) {
+				effectiveMinHeight *= 2
 			}
 			if opts.InfoStyle != infoDefault {
 				effectiveMinHeight--
 			}
-			effectiveMinHeight += borderLines(opts.BorderShape)
-			return util.Min(termHeight, util.Max(evaluateHeight(opts, termHeight), effectiveMinHeight))
+			if opts.BorderShape != tui.BorderNone {
+				effectiveMinHeight += 2
+			}
+			return util.Min(termHeight, util.Max(maxHeight, effectiveMinHeight))
 		}
 		renderer = tui.NewLightRenderer(opts.Theme, opts.Black, opts.Mouse, opts.Tabstop, opts.ClearOnExit, false, maxHeightFunc)
 	}
@@ -524,7 +510,6 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	t := Terminal{
 		initDelay:          delay,
 		infoStyle:          opts.InfoStyle,
-		separator:          nil,
 		spinner:            makeSpinner(opts.Unicode),
 		queryLen:           [2]int{0, 0},
 		layout:             opts.Layout,
@@ -555,10 +540,6 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		padding:            opts.Padding,
 		unicode:            opts.Unicode,
 		borderShape:        opts.BorderShape,
-		borderLabel:        nil,
-		borderLabelOpts:    opts.BorderLabel,
-		previewLabel:       nil,
-		previewLabelOpts:   opts.PreviewLabel,
 		cleanExit:          opts.ClearOnExit,
 		paused:             opts.Phony,
 		strong:             strongAttr,
@@ -591,7 +572,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 		sigstop:            false,
 		slab:               util.MakeSlab(slab16Size, slab32Size),
 		theme:              opts.Theme,
-		startChan:          make(chan fitpad, 1),
+		startChan:          make(chan bool, 1),
 		killChan:           make(chan int),
 		tui:                renderer,
 		initFunc:           func() { renderer.Init() },
@@ -602,106 +583,10 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
 	// Pre-calculated empty pointer and marker signs
 	t.pointerEmpty = strings.Repeat(" ", t.pointerLen)
 	t.markerEmpty = strings.Repeat(" ", t.markerLen)
-	t.borderLabel, t.borderLabelLen = t.ansiLabelPrinter(opts.BorderLabel.label, &tui.ColBorderLabel, false)
-	t.previewLabel, t.previewLabelLen = t.ansiLabelPrinter(opts.PreviewLabel.label, &tui.ColBorderLabel, false)
-	if opts.Separator == nil || len(*opts.Separator) > 0 {
-		bar := "─"
-		if opts.Separator != nil {
-			bar = *opts.Separator
-		} else if !t.unicode {
-			bar = "-"
-		}
-		t.separator, t.separatorLen = t.ansiLabelPrinter(bar, &tui.ColSeparator, true)
-	}

 	return &t
 }

-func borderLines(shape tui.BorderShape) int {
-	switch shape {
-	case tui.BorderHorizontal, tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderDouble:
-		return 2
-	case tui.BorderTop, tui.BorderBottom:
-		return 1
-	}
-	return 0
-}
-
-// Extra number of lines needed to display fzf
-func (t *Terminal) extraLines() int {
-	extra := len(t.header0) + t.headerLines + 1
-	if !t.noInfoLine() {
-		extra++
-	}
-	return extra
-}
-
-func (t *Terminal) MaxFitAndPad(opts *Options) (int, int) {
-	_, screenHeight, marginInt, paddingInt := t.adjustMarginAndPadding()
-	padHeight := marginInt[0] + marginInt[2] + paddingInt[0] + paddingInt[2]
-	fit := screenHeight - padHeight - t.extraLines()
-	return fit, padHeight
-}
-
-func (t *Terminal) ansiLabelPrinter(str string, color *tui.ColorPair, fill bool) (labelPrinter, int) {
-	// Nothing to do
-	if len(str) == 0 {
-		return nil, 0
-	}
-
-	// Extract ANSI color codes
-	text, colors, _ := extractColor(str, nil, nil)
-	runes := []rune(text)
-
-	// Simpler printer for strings without ANSI colors or tab characters
-	if colors == nil && strings.IndexRune(str, '\t') < 0 {
-		length := runewidth.StringWidth(str)
-		if length == 0 {
-			return nil, 0
-		}
-		printFn := func(window tui.Window, limit int) {
-			if length > limit {
-				trimmedRunes, _ := t.trimRight(runes, limit)
-				window.CPrint(*color, string(trimmedRunes))
-			} else if fill {
-				window.CPrint(*color, util.RepeatToFill(str, length, limit))
-			} else {
-				window.CPrint(*color, str)
-			}
-		}
-		return printFn, len(text)
-	}
-
-	// Printer that correctly handles ANSI color codes and tab characters
-	item := &Item{text: util.RunesToChars(runes), colors: colors}
-	length := t.displayWidth(runes)
-	if length == 0 {
-		return nil, 0
-	}
-	result := Result{item: item}
-	var offsets []colorOffset
-	printFn := func(window tui.Window, limit int) {
-		if offsets == nil {
-			// tui.Col* are not initialized until renderer.Init()
-			offsets = result.colorOffsets(nil, t.theme, *color, *color, false)
-		}
-		for limit > 0 {
-			if length > limit {
-				trimmedRunes, _ := t.trimRight(runes, limit)
-				t.printColoredString(window, trimmedRunes, offsets, *color)
-				break
-			} else if fill {
-				t.printColoredString(window, runes, offsets, *color)
-				limit -= length
-			} else {
-				t.printColoredString(window, runes, offsets, *color)
-				break
-			}
-		}
-	}
-	return printFn, length
-}
-
 func (t *Terminal) parsePrompt(prompt string) (func(), int) {
 	var state *ansiState
 	trimmed, colors, _ := extractColor(prompt, state, nil)
@@ -840,23 +725,22 @@ func (t *Terminal) displayWidth(runes []rune) int {

 const (
 	minWidth  = 4
-	minHeight = 3
+	minHeight = 4
 )

 func calculateSize(base int, size sizeSpec, occupied int, minSize int, pad int) int {
 	max := base - occupied
-	if max < minSize {
-		max = minSize
-	}
 	if size.percent {
 		return util.Constrain(int(float64(base)*0.01*size.size), minSize, max)
 	}
 	return util.Constrain(int(size.size)+pad, minSize, max)
 }

-func (t *Terminal) adjustMarginAndPadding() (int, int, [4]int, [4]int) {
+func (t *Terminal) resizeWindows() {
 	screenWidth := t.tui.MaxX()
 	screenHeight := t.tui.MaxY()
+	t.prevLines = make([]itemLine, screenHeight)
+
 	marginInt := [4]int{}  // TRBL
 	paddingInt := [4]int{} // TRBL
 	sizeSpecToInt := func(index int, spec sizeSpec) int {
@@ -898,55 +782,38 @@ func (t *Terminal) adjustMarginAndPadding() (int, int, [4]int, [4]int) {
 			if idx == 3 {
 				extraMargin[idx] += 2
 			}
-		case tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderDouble:
+		case tui.BorderRounded, tui.BorderSharp:
 			extraMargin[idx] += 1 + idx%2
 		}
 		marginInt[idx] = sizeSpecToInt(idx, sizeSpec) + extraMargin[idx]
 	}

 	adjust := func(idx1 int, idx2 int, max int, min int) {
-		if min > max {
-			min = max
-		}
-		margin := marginInt[idx1] + marginInt[idx2] + paddingInt[idx1] + paddingInt[idx2]
-		if max-margin < min {
-			desired := max - min
-			paddingInt[idx1] = desired * paddingInt[idx1] / margin
-			paddingInt[idx2] = desired * paddingInt[idx2] / margin
-			marginInt[idx1] = util.Max(extraMargin[idx1], desired*marginInt[idx1]/margin)
-			marginInt[idx2] = util.Max(extraMargin[idx2], desired*marginInt[idx2]/margin)
+		if max >= min {
+			margin := marginInt[idx1] + marginInt[idx2] + paddingInt[idx1] + paddingInt[idx2]
+			if max-margin < min {
+				desired := max - min
+				paddingInt[idx1] = desired * paddingInt[idx1] / margin
+				paddingInt[idx2] = desired * paddingInt[idx2] / margin
+				marginInt[idx1] = util.Max(extraMargin[idx1], desired*marginInt[idx1]/margin)
+				marginInt[idx2] = util.Max(extraMargin[idx2], desired*marginInt[idx2]/margin)
+			}
 		}
 	}

+	previewVisible := t.isPreviewEnabled() && t.previewOpts.size.size > 0
 	minAreaWidth := minWidth
 	minAreaHeight := minHeight
-	if t.noInfoLine() {
-		minAreaHeight -= 1
-	}
-	if t.isPreviewVisible() {
-		minPreviewHeight := 1 + borderLines(t.previewOpts.border)
-		minPreviewWidth := 5
+	if previewVisible {
 		switch t.previewOpts.position {
 		case posUp, posDown:
-			minAreaHeight += minPreviewHeight
-			minAreaWidth = util.Max(minPreviewWidth, minAreaWidth)
+			minAreaHeight *= 2
 		case posLeft, posRight:
-			minAreaWidth += minPreviewWidth
-			minAreaHeight = util.Max(minPreviewHeight, minAreaHeight)
+			minAreaWidth *= 2
 		}
 	}
 	adjust(1, 3, screenWidth, minAreaWidth)
 	adjust(0, 2, screenHeight, minAreaHeight)
-
-	return screenWidth, screenHeight, marginInt, paddingInt
-}
-
-func (t *Terminal) resizeWindows() {
-	screenWidth, screenHeight, marginInt, paddingInt := t.adjustMarginAndPadding()
-	width := screenWidth - marginInt[1] - marginInt[3]
-	height := screenHeight - marginInt[0] - marginInt[2]
-
-	t.prevLines = make([]itemLine, screenHeight)
 	if t.border != nil {
 		t.border.Close()
 	}
@@ -965,6 +832,8 @@ func (t *Terminal) resizeWindows() {
 	// Reset preview version so that full redraw occurs
 	t.previewed.version = 0

+	width := screenWidth - marginInt[1] - marginInt[3]
+	height := screenHeight - marginInt[0] - marginInt[2]
 	switch t.borderShape {
 	case tui.BorderHorizontal:
 		t.border = t.tui.NewWindow(
@@ -990,22 +859,22 @@ func (t *Terminal) resizeWindows() {
 		t.border = t.tui.NewWindow(
 			marginInt[0], marginInt[3], width+2, height,
 			false, tui.MakeBorderStyle(tui.BorderRight, t.unicode))
-	case tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderDouble:
+	case tui.BorderRounded, tui.BorderSharp:
 		t.border = t.tui.NewWindow(
 			marginInt[0]-1, marginInt[3]-2, width+4, height+2,
 			false, tui.MakeBorderStyle(t.borderShape, t.unicode))
 	}

-	// Add padding to margin
+	// Add padding
 	for idx, val := range paddingInt {
 		marginInt[idx] += val
 	}
-	width -= paddingInt[1] + paddingInt[3]
-	height -= paddingInt[0] + paddingInt[2]
+	width = screenWidth - marginInt[1] - marginInt[3]
+	height = screenHeight - marginInt[0] - marginInt[2]

 	// Set up preview window
 	noBorder := tui.MakeBorderStyle(tui.BorderNone, t.unicode)
-	if t.isPreviewVisible() {
+	if previewVisible {
 		var resizePreviewWindows func(previewOpts previewOpts)
 		resizePreviewWindows = func(previewOpts previewOpts) {
 			hasThreshold := previewOpts.threshold > 0 && previewOpts.alternative != nil
@@ -1020,7 +889,7 @@ func (t *Terminal) resizeWindows() {
 				}
 				t.pborder = t.tui.NewWindow(y, x, w, h, true, previewBorder)
 				switch previewOpts.border {
-				case tui.BorderSharp, tui.BorderRounded, tui.BorderBold, tui.BorderDouble:
+				case tui.BorderSharp, tui.BorderRounded:
 					pwidth -= 4
 					pheight -= 2
 					x += 2
@@ -1100,34 +969,6 @@ func (t *Terminal) resizeWindows() {
 			width,
 			height, false, noBorder)
 	}
-
-	// Print border label
-	printLabel := func(window tui.Window, render labelPrinter, opts labelOpts, length int, borderShape tui.BorderShape) {
-		if window == nil || render == nil {
-			return
-		}
-
-		switch borderShape {
-		case tui.BorderHorizontal, tui.BorderTop, tui.BorderBottom, tui.BorderRounded, tui.BorderSharp, tui.BorderBold, tui.BorderDouble:
-			var col int
-			if opts.column == 0 {
-				col = util.Max(0, (window.Width()-length)/2)
-			} else if opts.column < 0 {
-				col = util.Max(0, window.Width()+opts.column+1-length)
-			} else {
-				col = util.Min(opts.column-1, window.Width()-length)
-			}
-			row := 0
-			if borderShape == tui.BorderBottom || opts.bottom {
-				row = window.Height() - 1
-			}
-			window.Move(row, col)
-			render(window, window.Width())
-		}
-	}
-	printLabel(t.border, t.borderLabel, t.borderLabelOpts, t.borderLabelLen, t.borderShape)
-	printLabel(t.pborder, t.previewLabel, t.previewLabelOpts, t.previewLabelLen, t.previewOpts.border)
-
 	for i := 0; i < t.window.Height(); i++ {
 		t.window.MoveAndClear(i, 0)
 	}
@@ -1267,15 +1108,8 @@ func (t *Terminal) printInfo() {
 	if t.failed != nil && t.count == 0 {
 		output = fmt.Sprintf("[Command failed: %s]", *t.failed)
 	}
-	maxWidth := t.window.Width() - pos
-	output = t.trimMessage(output, maxWidth)
+	output = t.trimMessage(output, t.window.Width()-pos)
 	t.window.CPrint(tui.ColInfo, output)
-
-	fillLength := maxWidth - len(output) - 2
-	if t.separatorLen > 0 && fillLength > 0 {
-		t.window.CPrint(tui.ColSeparator, " ")
-		t.separator(t.window, fillLength)
-	}
 }

 func (t *Terminal) printHeader() {
@@ -1514,11 +1348,6 @@ func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMat
 		displayWidth = t.displayWidthWithLimit(text, 0, displayWidth)
 	}

-	t.printColoredString(t.window, text, offsets, colBase)
-	return displayWidth
-}
-
-func (t *Terminal) printColoredString(window tui.Window, text []rune, offsets []colorOffset, colBase tui.ColorPair) {
 	var index int32
 	var substr string
 	var prefixWidth int
@@ -1528,11 +1357,11 @@ func (t *Terminal) printColoredString(window tui.Window, text []rune, offsets []
 		e := util.Constrain32(offset.offset[1], index, maxOffset)

 		substr, prefixWidth = t.processTabs(text[index:b], prefixWidth)
-		window.CPrint(colBase, substr)
+		t.window.CPrint(colBase, substr)

 		if b < e {
 			substr, prefixWidth = t.processTabs(text[b:e], prefixWidth)
-			window.CPrint(offset.color, substr)
+			t.window.CPrint(offset.color, substr)
 		}

 		index = e
@@ -1542,8 +1371,9 @@ func (t *Terminal) printColoredString(window tui.Window, text []rune, offsets []
 	}
 	if index < maxOffset {
 		substr, _ = t.processTabs(text[index:], prefixWidth)
-		window.CPrint(colBase, substr)
+		t.window.CPrint(colBase, substr)
 	}
+	return displayWidth
 }

 func (t *Terminal) renderPreviewSpinner() {
@@ -2033,10 +1863,6 @@ func (t *Terminal) isPreviewEnabled() bool {
 	return t.hasPreviewer() && t.previewer.enabled
 }

-func (t *Terminal) isPreviewVisible() bool {
-	return t.isPreviewEnabled() && t.previewOpts.size.size > 0
-}
-
 func (t *Terminal) hasPreviewWindow() bool {
 	return t.pwindow != nil && t.isPreviewEnabled()
 }
@@ -2136,28 +1962,7 @@ func (t *Terminal) cancelPreview() {
 // Loop is called to start Terminal I/O
 func (t *Terminal) Loop() {
 	// prof := profile.Start(profile.ProfilePath("/tmp/"))
-	fitpad := <-t.startChan
-	fit := fitpad.fit
-	if fit >= 0 {
-		pad := fitpad.pad
-		t.tui.Resize(func(termHeight int) int {
-			contentHeight := fit + t.extraLines()
-			if t.hasPreviewer() {
-				if t.previewOpts.aboveOrBelow() {
-					if t.previewOpts.size.percent {
-						newContentHeight := int(float64(contentHeight) * 100. / (100. - t.previewOpts.size.size))
-						contentHeight = util.Max(contentHeight+1+borderLines(t.previewOpts.border), newContentHeight)
-					} else {
-						contentHeight += int(t.previewOpts.size.size) + borderLines(t.previewOpts.border)
-					}
-				} else {
-					// Minimum height if preview window can appear
-					contentHeight = util.Max(contentHeight, 1+borderLines(t.previewOpts.border))
-				}
-			}
-			return util.Min(termHeight, contentHeight+pad)
-		})
-	}
+	<-t.startChan
 	{ // Late initialization
 		intChan := make(chan os.Signal, 1)
 		signal.Notify(intChan, os.Interrupt, syscall.SIGTERM)
@@ -2486,21 +2291,13 @@ func (t *Terminal) Loop() {
 	}()

 	looping := true
-	_, startEvent := t.keymap[tui.Start.AsEvent()]
-
 	for looping {
 		var newCommand *string
 		changed := false
 		beof := false
 		queryChanged := false

-		var event tui.Event
-		if startEvent {
-			event = tui.Start.AsEvent()
-			startEvent = false
-		} else {
-			event = t.tui.GetChar()
-		}
+		event := t.tui.GetChar()

 		t.mutex.Lock()
 		previousInput := t.input
--- a/src/terminal_test.go
+++ b/src/terminal_test.go
@@ -421,10 +421,10 @@ func TestPowershellCommands(t *testing.T) {
 }

 /*
-Test typical valid placeholders and parsing of them.
+	Test typical valid placeholders and parsing of them.

-Also since the parser assumes the input is matched with `placeholder` regex,
-the regex is tested here as well.
+	Also since the parser assumes the input is matched with `placeholder` regex,
+	the regex is tested here as well.
 */
 func TestParsePlaceholder(t *testing.T) {
 	// give, want pairs
--- a/src/tui/dummy.go
+++ b/src/tui/dummy.go
@@ -14,26 +14,24 @@ func (a Attr) Merge(b Attr) Attr {

 const (
 	AttrUndefined = Attr(0)
-	AttrRegular   = Attr(1 << 8)
-	AttrClear     = Attr(1 << 9)
+	AttrRegular   = Attr(1 << 7)
+	AttrClear     = Attr(1 << 8)

-	Bold          = Attr(1)
-	Dim           = Attr(1 << 1)
-	Italic        = Attr(1 << 2)
-	Underline     = Attr(1 << 3)
-	Blink         = Attr(1 << 4)
-	Blink2        = Attr(1 << 5)
-	Reverse       = Attr(1 << 6)
-	StrikeThrough = Attr(1 << 7)
+	Bold      = Attr(1)
+	Dim       = Attr(1 << 1)
+	Italic    = Attr(1 << 2)
+	Underline = Attr(1 << 3)
+	Blink     = Attr(1 << 4)
+	Blink2    = Attr(1 << 5)
+	Reverse   = Attr(1 << 6)
 )

-func (r *FullscreenRenderer) Init()                              {}
-func (r *FullscreenRenderer) Resize(maxHeightFunc func(int) int) {}
-func (r *FullscreenRenderer) Pause(bool)                         {}
-func (r *FullscreenRenderer) Resume(bool, bool)                  {}
-func (r *FullscreenRenderer) Clear()                             {}
-func (r *FullscreenRenderer) Refresh()                           {}
-func (r *FullscreenRenderer) Close()                             {}
+func (r *FullscreenRenderer) Init()             {}
+func (r *FullscreenRenderer) Pause(bool)        {}
+func (r *FullscreenRenderer) Resume(bool, bool) {}
+func (r *FullscreenRenderer) Clear()            {}
+func (r *FullscreenRenderer) Refresh()          {}
+func (r *FullscreenRenderer) Close()            {}

 func (r *FullscreenRenderer) GetChar() Event { return Event{} }
 func (r *FullscreenRenderer) MaxX() int      { return 0 }
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -189,10 +189,6 @@ func (r *LightRenderer) Init() {
 	}
 }

-func (r *LightRenderer) Resize(maxHeightFunc func(int) int) {
-	r.maxHeightFunc = maxHeightFunc
-}
-
 func (r *LightRenderer) makeSpace() {
 	r.stderr("\n")
 	r.csi("G")
@@ -544,8 +540,8 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {

 	t := atoi(elems[0], -1)
 	x := atoi(elems[1], -1) - 1
-	y := atoi(elems[2], -1) - 1 - r.yoffset
-	if t < 0 || x < 0 {
+	y := atoi(elems[2], -1) - 1
+	if t < 0 || x < 0 || y < 0 {
 		return Event{Invalid, 0, nil}
 	}
 	*sz += end + 1
@@ -680,9 +676,6 @@ func (r *LightRenderer) MaxX() int {
 }

 func (r *LightRenderer) MaxY() int {
-	if r.height == 0 {
-		r.updateTerminalSize()
-	}
 	return r.height
 }

@@ -712,7 +705,7 @@ func (r *LightRenderer) NewWindow(top int, left int, width int, height int, prev

 func (w *LightWindow) drawBorder() {
 	switch w.border.shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble:
+	case BorderRounded, BorderSharp:
 		w.drawBorderAround()
 	case BorderHorizontal:
 		w.drawBorderHorizontal(true, true)
@@ -863,9 +856,6 @@ func attrCodes(attr Attr) []string {
 	if (attr & Reverse) > 0 {
 		codes = append(codes, "7")
 	}
-	if (attr & StrikeThrough) > 0 {
-		codes = append(codes, "9")
-	}
 	return codes
 }

--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -8,8 +8,8 @@ import (

 	"runtime"

-	"github.com/gdamore/tcell/v2"
-	"github.com/gdamore/tcell/v2/encoding"
+	"github.com/gdamore/tcell"
+	"github.com/gdamore/tcell/encoding"

 	"github.com/mattn/go-runewidth"
 	"github.com/rivo/uniseg"
@@ -19,24 +19,12 @@ func HasFullscreenRenderer() bool {
 	return true
 }

-func asTcellColor(color Color) tcell.Color {
-	if color == colDefault {
-		return tcell.ColorDefault
-	}
-
-	value := uint64(tcell.ColorValid) + uint64(color)
-	if color.is24() {
-		value = value | uint64(tcell.ColorIsRGB)
-	}
-	return tcell.Color(value)
-}
-
 func (p ColorPair) style() tcell.Style {
 	style := tcell.StyleDefault
-	return style.Foreground(asTcellColor(p.Fg())).Background(asTcellColor(p.Bg()))
+	return style.Foreground(tcell.Color(p.Fg())).Background(tcell.Color(p.Bg()))
 }

-type Attr int32
+type Attr tcell.Style

 type TcellWindow struct {
 	color       bool
@@ -75,6 +63,8 @@ func (w *TcellWindow) Refresh() {
 	}
 	w.lastX = 0
 	w.lastY = 0
+
+	w.drawBorder()
 }

 func (w *TcellWindow) FinishFill() {
@@ -82,13 +72,12 @@ func (w *TcellWindow) FinishFill() {
 }

 const (
-	Bold          Attr = Attr(tcell.AttrBold)
-	Dim                = Attr(tcell.AttrDim)
-	Blink              = Attr(tcell.AttrBlink)
-	Reverse            = Attr(tcell.AttrReverse)
-	Underline          = Attr(tcell.AttrUnderline)
-	StrikeThrough      = Attr(tcell.AttrStrikeThrough)
-	Italic             = Attr(tcell.AttrItalic)
+	Bold      Attr = Attr(tcell.AttrBold)
+	Dim            = Attr(tcell.AttrDim)
+	Blink          = Attr(tcell.AttrBlink)
+	Reverse        = Attr(tcell.AttrReverse)
+	Underline      = Attr(tcell.AttrUnderline)
+	Italic         = Attr(tcell.AttrItalic)
 )

 const (
@@ -97,8 +86,6 @@ const (
 	AttrClear     = Attr(1 << 8)
 )

-func (r *FullscreenRenderer) Resize(maxHeightFunc func(int) int) {}
-
 func (r *FullscreenRenderer) defaultTheme() *ColorTheme {
 	if _screen.Colors() >= 256 {
 		return Dark256
@@ -515,7 +502,7 @@ func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int,
 	if preview {
 		normal = ColPreview
 	}
-	w := &TcellWindow{
+	return &TcellWindow{
 		color:       r.theme.Colored,
 		preview:     preview,
 		top:         top,
@@ -524,8 +511,6 @@ func (r *FullscreenRenderer) NewWindow(top int, left int, width int, height int,
 		height:      height,
 		normal:      normal,
 		borderStyle: borderStyle}
-	w.drawBorder()
-	return w
 }

 func (w *TcellWindow) Close() {
@@ -576,7 +561,6 @@ func (w *TcellWindow) printString(text string, pair ColorPair) {
 		style = style.
 			Reverse(a&Attr(tcell.AttrReverse) != 0).
 			Underline(a&Attr(tcell.AttrUnderline) != 0).
-			StrikeThrough(a&Attr(tcell.AttrStrikeThrough) != 0).
 			Italic(a&Attr(tcell.AttrItalic) != 0).
 			Blink(a&Attr(tcell.AttrBlink) != 0).
 			Dim(a&Attr(tcell.AttrDim) != 0)
@@ -628,7 +612,6 @@ func (w *TcellWindow) fillString(text string, pair ColorPair) FillReturn {
 		Dim(a&Attr(tcell.AttrDim) != 0).
 		Reverse(a&Attr(tcell.AttrReverse) != 0).
 		Underline(a&Attr(tcell.AttrUnderline) != 0).
-		StrikeThrough(a&Attr(tcell.AttrStrikeThrough) != 0).
 		Italic(a&Attr(tcell.AttrItalic) != 0)

 	gr := uniseg.NewGraphemes(text)
@@ -705,31 +688,31 @@ func (w *TcellWindow) drawBorder() {
 	}

 	switch shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble, BorderHorizontal, BorderTop:
+	case BorderRounded, BorderSharp, BorderHorizontal, BorderTop:
 		for x := left; x < right; x++ {
 			_screen.SetContent(x, top, w.borderStyle.horizontal, nil, style)
 		}
 	}
 	switch shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble, BorderHorizontal, BorderBottom:
+	case BorderRounded, BorderSharp, BorderHorizontal, BorderBottom:
 		for x := left; x < right; x++ {
 			_screen.SetContent(x, bot-1, w.borderStyle.horizontal, nil, style)
 		}
 	}
 	switch shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble, BorderVertical, BorderLeft:
+	case BorderRounded, BorderSharp, BorderVertical, BorderLeft:
 		for y := top; y < bot; y++ {
 			_screen.SetContent(left, y, w.borderStyle.vertical, nil, style)
 		}
 	}
 	switch shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble, BorderVertical, BorderRight:
+	case BorderRounded, BorderSharp, BorderVertical, BorderRight:
 		for y := top; y < bot; y++ {
 			_screen.SetContent(right-1, y, w.borderStyle.vertical, nil, style)
 		}
 	}
 	switch shape {
-	case BorderRounded, BorderSharp, BorderBold, BorderDouble:
+	case BorderRounded, BorderSharp:
 		_screen.SetContent(left, top, w.borderStyle.topLeft, nil, style)
 		_screen.SetContent(right-1, top, w.borderStyle.topRight, nil, style)
 		_screen.SetContent(left, bot-1, w.borderStyle.bottomLeft, nil, style)
--- a/src/tui/tcell_test.go
+++ b/src/tui/tcell_test.go
@@ -5,7 +5,7 @@ package tui
 import (
 	"testing"

-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell"
 	"github.com/junegunn/fzf/src/util"
 )

--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -90,7 +90,6 @@ const (

 	Change
 	BackwardEOF
-	Start

 	AltBS

@@ -267,9 +266,7 @@ type ColorTheme struct {
 	Cursor       ColorAttr
 	Selected     ColorAttr
 	Header       ColorAttr
-	Separator    ColorAttr
 	Border       ColorAttr
-	BorderLabel  ColorAttr
 }

 type Event struct {
@@ -294,8 +291,6 @@ const (
 	BorderNone BorderShape = iota
 	BorderRounded
 	BorderSharp
-	BorderBold
-	BorderDouble
 	BorderHorizontal
 	BorderVertical
 	BorderTop
@@ -317,19 +312,18 @@ type BorderStyle struct {
 type BorderCharacter int

 func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
-	if !unicode {
-		return BorderStyle{
-			shape:       shape,
-			horizontal:  '-',
-			vertical:    '|',
-			topLeft:     '+',
-			topRight:    '+',
-			bottomLeft:  '+',
-			bottomRight: '+',
+	if unicode {
+		if shape == BorderRounded {
+			return BorderStyle{
+				shape:       shape,
+				horizontal:  '─',
+				vertical:    '│',
+				topLeft:     '╭',
+				topRight:    '╮',
+				bottomLeft:  '╰',
+				bottomRight: '╯',
+			}
 		}
-	}
-	switch shape {
-	case BorderSharp:
 		return BorderStyle{
 			shape:       shape,
 			horizontal:  '─',
@@ -339,35 +333,15 @@ func MakeBorderStyle(shape BorderShape, unicode bool) BorderStyle {
 			bottomLeft:  '└',
 			bottomRight: '┘',
 		}
-	case BorderBold:
-		return BorderStyle{
-			shape:       shape,
-			horizontal:  '━',
-			vertical:    '┃',
-			topLeft:     '┏',
-			topRight:    '┓',
-			bottomLeft:  '┗',
-			bottomRight: '┛',
-		}
-	case BorderDouble:
-		return BorderStyle{
-			shape:       shape,
-			horizontal:  '═',
-			vertical:    '║',
-			topLeft:     '╔',
-			topRight:    '╗',
-			bottomLeft:  '╚',
-			bottomRight: '╝',
-		}
 	}
 	return BorderStyle{
 		shape:       shape,
-		horizontal:  '─',
-		vertical:    '│',
-		topLeft:     '╭',
-		topRight:    '╮',
-		bottomLeft:  '╰',
-		bottomRight: '╯',
+		horizontal:  '-',
+		vertical:    '|',
+		topLeft:     '+',
+		topRight:    '+',
+		bottomLeft:  '+',
+		bottomRight: '+',
 	}
 }

@@ -384,7 +358,6 @@ func MakeTransparentBorder() BorderStyle {

 type Renderer interface {
 	Init()
-	Resize(maxHeightFunc func(int) int)
 	Pause(clear bool)
 	Resume(clear bool, sigcont bool)
 	Clear()
@@ -463,11 +436,9 @@ var (
 	ColSpinner              ColorPair
 	ColInfo                 ColorPair
 	ColHeader               ColorPair
-	ColSeparator            ColorPair
 	ColBorder               ColorPair
 	ColPreview              ColorPair
 	ColPreviewBorder        ColorPair
-	ColBorderLabel          ColorPair
 )

 func EmptyTheme() *ColorTheme {
@@ -490,10 +461,7 @@ func EmptyTheme() *ColorTheme {
 		Cursor:       ColorAttr{colUndefined, AttrUndefined},
 		Selected:     ColorAttr{colUndefined, AttrUndefined},
 		Header:       ColorAttr{colUndefined, AttrUndefined},
-		Separator:    ColorAttr{colUndefined, AttrUndefined},
-		Border:       ColorAttr{colUndefined, AttrUndefined},
-		BorderLabel:  ColorAttr{colUndefined, AttrUndefined},
-	}
+		Border:       ColorAttr{colUndefined, AttrUndefined}}
 }

 func NoColorTheme() *ColorTheme {
@@ -516,10 +484,7 @@ func NoColorTheme() *ColorTheme {
 		Cursor:       ColorAttr{colDefault, AttrRegular},
 		Selected:     ColorAttr{colDefault, AttrRegular},
 		Header:       ColorAttr{colDefault, AttrRegular},
-		Separator:    ColorAttr{colDefault, AttrRegular},
-		Border:       ColorAttr{colDefault, AttrRegular},
-		BorderLabel:  ColorAttr{colDefault, AttrRegular},
-	}
+		Border:       ColorAttr{colDefault, AttrRegular}}
 }

 func errorExit(message string) {
@@ -547,10 +512,7 @@ func init() {
 		Cursor:       ColorAttr{colRed, AttrUndefined},
 		Selected:     ColorAttr{colMagenta, AttrUndefined},
 		Header:       ColorAttr{colCyan, AttrUndefined},
-		Separator:    ColorAttr{colBlack, AttrUndefined},
-		Border:       ColorAttr{colBlack, AttrUndefined},
-		BorderLabel:  ColorAttr{colWhite, AttrUndefined},
-	}
+		Border:       ColorAttr{colBlack, AttrUndefined}}
 	Dark256 = &ColorTheme{
 		Colored:      true,
 		Input:        ColorAttr{colDefault, AttrUndefined},
@@ -570,10 +532,7 @@ func init() {
 		Cursor:       ColorAttr{161, AttrUndefined},
 		Selected:     ColorAttr{168, AttrUndefined},
 		Header:       ColorAttr{109, AttrUndefined},
-		Separator:    ColorAttr{59, AttrUndefined},
-		Border:       ColorAttr{59, AttrUndefined},
-		BorderLabel:  ColorAttr{145, AttrUndefined},
-	}
+		Border:       ColorAttr{59, AttrUndefined}}
 	Light256 = &ColorTheme{
 		Colored:      true,
 		Input:        ColorAttr{colDefault, AttrUndefined},
@@ -593,10 +552,7 @@ func init() {
 		Cursor:       ColorAttr{161, AttrUndefined},
 		Selected:     ColorAttr{168, AttrUndefined},
 		Header:       ColorAttr{31, AttrUndefined},
-		Separator:    ColorAttr{145, AttrUndefined},
-		Border:       ColorAttr{145, AttrUndefined},
-		BorderLabel:  ColorAttr{59, AttrUndefined},
-	}
+		Border:       ColorAttr{145, AttrUndefined}}
 }

 func initTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool) {
@@ -631,9 +587,7 @@ func initTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool) {
 	theme.Cursor = o(baseTheme.Cursor, theme.Cursor)
 	theme.Selected = o(baseTheme.Selected, theme.Selected)
 	theme.Header = o(baseTheme.Header, theme.Header)
-	theme.Separator = o(baseTheme.Separator, theme.Separator)
 	theme.Border = o(baseTheme.Border, theme.Border)
-	theme.BorderLabel = o(baseTheme.BorderLabel, theme.BorderLabel)

 	initPalette(theme)
 }
@@ -665,9 +619,7 @@ func initPalette(theme *ColorTheme) {
 	ColSpinner = pair(theme.Spinner, theme.Bg)
 	ColInfo = pair(theme.Info, theme.Bg)
 	ColHeader = pair(theme.Header, theme.Bg)
-	ColSeparator = pair(theme.Separator, theme.Bg)
 	ColBorder = pair(theme.Border, theme.Bg)
-	ColBorderLabel = pair(theme.BorderLabel, theme.Bg)
 	ColPreview = pair(theme.PreviewFg, theme.PreviewBg)
 	ColPreviewBorder = pair(theme.Border, theme.PreviewBg)
 }
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -153,23 +153,3 @@ func Once(nextResponse bool) func() bool {
 		return prevState
 	}
 }
-
-// RepeatToFill repeats the given string to fill the given width
-func RepeatToFill(str string, length int, limit int) string {
-	times := limit / length
-	rest := limit % length
-	output := strings.Repeat(str, times)
-	if rest > 0 {
-		for _, r := range str {
-			rest -= runewidth.RuneWidth(r)
-			if rest < 0 {
-				break
-			}
-			output += string(r)
-			if rest == 0 {
-				break
-			}
-		}
-	}
-	return output
-}
--- a/test/test_go.rb
+++ b/test/test_go.rb
@@ -192,13 +192,6 @@ class TestBase < Minitest::Test
    tmux.prepare
  end

-  alias assert_equal_org assert_equal
-  def assert_equal(expected, actual)
-    # Ignore info separator
-    actual = actual&.sub(/\s*─+$/, '') if actual.is_a?(String) && actual&.match?(%r{\d+/\d+})
-    assert_equal_org(expected, actual)
-  end
-
  def fzf(*opts)
    fzf!(*opts) + " > #{tempname}.tmp; mv #{tempname}.tmp #{tempname}"
  end
@@ -262,7 +255,7 @@ class TestGoFZF < TestBase

  def test_fzf_default_command_failure
    tmux.send_keys fzf.sub('FZF_DEFAULT_COMMAND=', 'FZF_DEFAULT_COMMAND=false'), :Enter
-    tmux.until { |lines| assert_includes lines[-2], '  [Command failed: false] ─' }
+    tmux.until { |lines| assert_equal '  [Command failed: false]', lines[-2] }
    tmux.send_keys :Enter
  end

@@ -454,7 +447,7 @@ class TestGoFZF < TestBase
  def test_scroll
    [true, false].each do |rev|
      tmux.send_keys "seq 1 100 | #{fzf(rev && :reverse)}", :Enter
-      tmux.until { |lines| assert_equal '  100/100', lines[rev ? 1 : -2] }
+      tmux.until { |lines| assert_includes lines, '  100/100' }
      tmux.send_keys(*Array.new(110) { rev ? :Down : :Up })
      tmux.until { |lines| assert_includes lines, '> 100' }
      tmux.send_keys :Enter
@@ -761,30 +754,6 @@ class TestGoFZF < TestBase
    assert_equal output, `#{FZF} -fh -n2 -d: < #{tempname}`.lines(chomp: true)
  end

-  def test_tiebreak_chunk
-    writelines(tempname, [
-                 '1 foobarbaz ba',
-                 '2 foobar baz',
-                 '3 foo barbaz'
-               ])
-
-    assert_equal [
-      '3 foo barbaz',
-      '2 foobar baz',
-      '1 foobarbaz ba'
-    ], `#{FZF} -fo --tiebreak=chunk < #{tempname}`.lines(chomp: true)
-
-    assert_equal [
-      '1 foobarbaz ba',
-      '2 foobar baz',
-      '3 foo barbaz'
-    ], `#{FZF} -fba --tiebreak=chunk < #{tempname}`.lines(chomp: true)
-
-    assert_equal [
-      '3 foo barbaz'
-    ], `#{FZF} -f'!foobar' --tiebreak=chunk < #{tempname}`.lines(chomp: true)
-  end
-
  def test_invalid_cache
    tmux.send_keys "(echo d; echo D; echo x) | #{fzf('-q d')}", :Enter
    tmux.until { |lines| assert_equal '  2/3', lines[-2] }
@@ -2256,158 +2225,6 @@ class TestGoFZF < TestBase
    tmux.until { |lines| assert_equal 1, lines.match_count }
    tmux.until { |lines| assert_match(/^> SNIPSNIP.*SNIPSNIP$/, lines[-3]) }
  end
-
-  def assert_block(expected, lines)
-    cols = expected.lines.map(&:chomp).map(&:length).max
-    actual = lines.reverse.take(expected.lines.length).reverse.map { _1[0, cols].rstrip + "\n" }.join
-    assert_equal_org expected, actual
-  end
-
-  def test_height_range_fit
-    tmux.send_keys 'seq 3 | fzf --height ~100% --info=inline --border', :Enter
-    expected = <<~OUTPUT
-      ╭──────────
-      │   3
-      │   2
-      │ > 1
-      │ >   < 3/3
-      ╰──────────
-    OUTPUT
-    tmux.until { assert_block(expected, _1) }
-  end
-
-  def test_height_range_fit_preview_above
-    tmux.send_keys 'seq 3 | fzf --height ~100% --info=inline --border --preview "seq {}" --preview-window up,60%', :Enter
-    expected = <<~OUTPUT
-      ╭──────────
-      │ ╭────────
-      │ │ 1
-      │ │
-      │ │
-      │ │
-      │ ╰────────
-      │   3
-      │   2
-      │ > 1
-      │ >   < 3/3
-      ╰──────────
-    OUTPUT
-    tmux.until { assert_block(expected, _1) }
-  end
-
-  def test_height_range_fit_preview_above_alternative
-    tmux.send_keys 'seq 3 | fzf --height ~100% --border=sharp --preview "seq {}" --preview-window up,40%,border-bottom --padding 1 --exit-0 --header hello --header-lines=2', :Enter
-    expected = <<~OUTPUT
-      ┌─────────
-      │
-      │  1
-      │  2
-      │  3
-      │  ───────
-      │  > 3
-      │    2
-      │    1
-      │    hello
-      │    1/1 ─
-      │  >
-      │
-      └─────────
-    OUTPUT
-    tmux.until { assert_block(expected, _1) }
-  end
-
-  def test_height_range_fit_preview_left
-    tmux.send_keys "seq 3 | fzf --height ~100% --border=vertical --preview 'seq {}' --preview-window left,5,border-right --padding 1 --exit-0 --header $'hello\\nworld' --header-lines=2", :Enter
-    expected = <<~OUTPUT
-      │
-      │  1       │> 3
-      │  2       │  2
-      │  3       │  1
-      │          │  hello
-      │          │  world
-      │          │  1/1 ─
-      │          │>
-      │
-    OUTPUT
-    tmux.until { assert_block(expected, _1) }
-  end
-
-  def test_height_range_overflow
-    tmux.send_keys 'seq 100 | fzf --height ~5 --info=inline --border', :Enter
-    expected = <<~OUTPUT
-      ╭──────────────
-      │   2
-      │ > 1
-      │ >   < 100/100
-      ╰──────────────
-    OUTPUT
-    tmux.until { assert_block(expected, _1) }
-  end
-
-  def test_start_event
-    tmux.send_keys 'seq 100 | fzf --multi --sync --preview-window border-none --bind "start:select-all+last+preview(echo welcome)"', :Enter
-    tmux.until do |lines|
-      assert_match(/>100.*welcome/, lines[0])
-      assert_includes(lines[-2], '100/100 (100)')
-    end
-  end
-
-  def test_labels_center
-    tmux.send_keys ': | fzf --border --border-label foobar --preview : --preview-label barfoo', :Enter
-    tmux.until do
-      assert_includes(_1[0], '─foobar─')
-      assert_includes(_1[1], '─barfoo─')
-    end
-  end
-
-  def test_labels_left
-    tmux.send_keys ': | fzf --border --border-label foobar --border-label-pos 2 --preview : --preview-label barfoo --preview-label-pos 2', :Enter
-    tmux.until do
-      assert_includes(_1[0], '╭foobar─')
-      assert_includes(_1[1], '╭barfoo─')
-    end
-  end
-
-  def test_labels_right
-    tmux.send_keys ': | fzf --border --border-label foobar --border-label-pos -2 --preview : --preview-label barfoo --preview-label-pos -2', :Enter
-    tmux.until do
-      assert_includes(_1[0], '─foobar╮')
-      assert_includes(_1[1], '─barfoo╮')
-    end
-  end
-
-  def test_labels_bottom
-    tmux.send_keys ': | fzf --border --border-label foobar --border-label-pos 2:bottom --preview : --preview-label barfoo --preview-label-pos -2:bottom', :Enter
-    tmux.until do
-      assert_includes(_1[-1], '╰foobar─')
-      assert_includes(_1[-2], '─barfoo╯')
-    end
-  end
-
-  def test_info_separator_unicode
-    tmux.send_keys 'seq 100 | fzf -q55', :Enter
-    tmux.until { assert_includes(_1[-2], '  1/100 ─') }
-  end
-
-  def test_info_separator_no_unicode
-    tmux.send_keys 'seq 100 | fzf -q55 --no-unicode', :Enter
-    tmux.until { assert_includes(_1[-2], '  1/100 -') }
-  end
-
-  def test_info_separator_repeat
-    tmux.send_keys 'seq 100 | fzf -q55 --separator _-', :Enter
-    tmux.until { assert_includes(_1[-2], '  1/100 _-_-') }
-  end
-
-  def test_info_separator_ansi_colors_and_tabs
-    tmux.send_keys "seq 100 | fzf -q55 --tabstop 4 --separator $'\\x1b[33ma\\tb'", :Enter
-    tmux.until { assert_includes(_1[-2], '  1/100 a   ba   ba') }
-  end
-
-  def test_info_no_separator
-    tmux.send_keys 'seq 100 | fzf -q55 --no-separator', :Enter
-    tmux.until { assert(_1[-2] == '  1/100') }
-  end
 end

 module TestShell
@@ -2834,7 +2651,6 @@ class TestFish < TestBase
 end

 __END__
-set -u
 PS1= PROMPT_COMMAND= HISTFILE= HISTSIZE=100
 unset <%= UNSETS.join(' ') %>
 unset $(env | sed -n /^_fzf_orig/s/=.*//p)
@@ -2878,8 +2694,8 @@ _fzf_complete_g_post() {
  awk '{print "g" $0 $0}'
 }

-[ -n "${BASH-}" ] && complete -F _fzf_complete_f -o default -o bashdefault f
-[ -n "${BASH-}" ] && complete -F _fzf_complete_g -o default -o bashdefault g
+[ -n "$BASH" ] && complete -F _fzf_complete_f -o default -o bashdefault f
+[ -n "$BASH" ] && complete -F _fzf_complete_g -o default -o bashdefault g

 _comprun() {
  local command=$1