Cross compile binaries in release scripts

Use hub for creating releases
2026-04-01 07:37:24 +09:00 · 2020-02-16 00:40:51 +00:00 · 2020-02-15 19:33:49 -05:00
293 changed files with 12633 additions and 17470 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,7 @@
-# See https://editorconfig.org
+# See http://editorconfig.org

 # In Go files we indent with tabs but still 
 # set indent_size to control the GitHub web viewer.  
 [*.go]
 indent_size=4
+
--- a/.github/ISSUE_TEMPLATE
+++ b/.github/ISSUE_TEMPLATE
@@ -0,0 +1,9 @@
+## Description of the problem or steps to reproduce
+
+## Specifications
+
+You can use `micro -version` to get the commit hash.
+
+Commit hash:
+OS:
+Terminal:
--- a/.github/ISSUE_TEMPLATE/01-bug.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug.yml
@@ -1,25 +0,0 @@
-name: Bug Report
-description: File a bug report.
-title: "<title>"
-labels: ["bug", "triage"]
-body:
- type: textarea
-  attributes:
-    label: Description
-    description: Description of the problem and steps to reproduce.
-  validations:
-    required: true
- type: textarea
-  attributes:
-    label: Environment
-    description: |
-      examples:
-        - **Version**: 2.0.15 and/or commit hash ($ micro -version)
-        - **OS**: Debian
-        - **Terminal**: ptyxis
-    value: |
-        - Version:
-        - OS:
-        - Terminal:
-  validations:
-    required: true
--- a/.github/ISSUE_TEMPLATE/02-feature.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature.yml
@@ -1,11 +0,0 @@
-name: Feature Request
-description: File a feature request.
-title: "<title>"
-labels: ["feature"]
-body:
- type: textarea
-  attributes:
-    label: Description
-    description: Description of the feature.
-  validations:
-    required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -1,46 +0,0 @@
-name: Nightly builds
-on:
-  workflow_dispatch: # Allows manual trigger
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  nightly:
-    strategy:
-      matrix:
-        go-version: [1.23.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Setup
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go-version }}
-        cache: false
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        fetch-depth: 0
-        fetch-tags: true
-
-    - name: Build
-      run: tools/cross-compile.sh nightly
-
-    - name: Tag
-      uses: rickstaa/action-create-tag@v1
-      with:
-        tag: nightly
-        force_push_tag: true
-        message: "Pre-release nightly"
-
-    - name: Publish
-      uses: softprops/action-gh-release@v2
-      with:
-        name: nightly
-        tag_name: nightly
-        files: binaries/*
-        prerelease: true
-
-    - name: Cleanup
-      run: rm -rf binaries
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,36 +0,0 @@
-name: Release builds
-on:
-  workflow_dispatch: # Allows manual trigger
-  # push:
-  #   tags:
-  #     - 'v*.*.*' # automatically react on semantic versioned tags
-jobs:
-  release:
-    strategy:
-      matrix:
-        go-version: [1.23.x]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Setup
-      uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go-version }}
-        cache: false
-
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-
-    - name: Build
-      run: tools/cross-compile.sh
-
-    - name: Publish
-      uses: softprops/action-gh-release@v2
-      with:
-        files: binaries/*
-
-    - name: Cleanup
-      run: rm -rf binaries
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,27 +0,0 @@
-on: [push, pull_request]
-name: Build and Test
-jobs:
-  test:
-    strategy:
-      matrix:
-        go-version: [1.19.x, 1.23.x]
-        os: [ubuntu-latest, macos-latest, windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/setup-go@v5
-      with:
-        go-version: ${{ matrix.go-version }}
-        cache: false
-
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-
-    - name: Build
-      run: |
-        make build
-
-    - name: Test
-      run: |
-        make test
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store

 micro
-micro.exe
 !cmd/micro
 binaries/
 tmp.sh
@@ -12,9 +11,8 @@ todo.txt
 test.txt
 log.txt
 *.old
-benchmark_results*
 tools/build-version
 tools/build-date
 tools/info-plist
-tools/vscode-tests/
+tools/bindata
 *.hdr
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools/go-bindata"]
+	path = tools/go-bindata
+	url = https://github.com/zyedidia/go-bindata
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: go
+go:
+    - "1.11.x"
+os:
+    - linux
+    - osx
+script:
+    - env GO111MODULE=on make build
+    - env GO111MODULE=on make test
--- a/6
+++ b/6
@@ -430,7 +430,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 github.com/gdamore/tcell/LICENSE
 ================
-github.com/micro-editor/tcell/LICENSE (fork)
+github.com/zyedidia/tcell/LICENSE (fork)
 ================


@@ -1048,7 +1048,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice

 github.com/flynn/json5/LICENSE
 ================
-github.com/micro-editor/json5/LICENSE (fork)
+github.com/zyedidia/json5/LICENSE (fork)
 ================

 Decoder code based on package encoding/json from the Go language.
@@ -1108,7 +1108,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 github.com/james4k/terminal/LICENSE
 ================
-github.com/micro-editor/terminal/LICENSE (fork)
+github.com/zyedidia/terminal/LICENSE (fork)
 ================

 Copyright (C) 2013 James Gray
--- a/87
+++ b/87
@@ -1,78 +1,57 @@
-.PHONY: runtime build generate build-quick
+.PHONY: runtime

 VERSION = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-version.go)
 HASH = $(shell git rev-parse --short HEAD)
 DATE = $(shell GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) \
 	go run tools/build-date.go)
+ADDITIONAL_GO_LINKER_FLAGS = $(shell GOOS=$(shell go env GOHOSTOS) \
+	GOARCH=$(shell go env GOHOSTARCH))
 GOBIN ?= $(shell go env GOPATH)/bin
-GOVARS = -X github.com/micro-editor/micro/v2/internal/util.Version=$(VERSION) -X github.com/micro-editor/micro/v2/internal/util.CommitHash=$(HASH) -X 'github.com/micro-editor/micro/v2/internal/util.CompileDate=$(DATE)'
-DEBUGVAR = -X github.com/micro-editor/micro/v2/internal/util.Debug=ON
-VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a45f4242ebddb7aa9a229f85555e8a3bd987e2/src/vs/editor/test/common/model/'
-CGO_ENABLED := $(if $(CGO_ENABLED),$(CGO_ENABLED),0)
+GOVARS = -X github.com/zyedidia/micro/internal/util.Version=$(VERSION) -X github.com/zyedidia/micro/internal/util.CommitHash=$(HASH) -X 'github.com/zyedidia/micro/internal/util.CompileDate=$(DATE)' -X github.com/zyedidia/micro/internal/util.Debug=OFF

-ADDITIONAL_GO_LINKER_FLAGS := ""
-GOHOSTOS = $(shell go env GOHOSTOS)
-ifeq ($(GOHOSTOS), darwin)
-	# Native darwin resp. macOS builds need external and dynamic linking
-	ADDITIONAL_GO_LINKER_FLAGS += $(shell GOOS=$(GOHOSTOS) \
-		GOARCH=$(shell go env GOHOSTARCH) \
-		go run tools/info-plist.go "$(shell go env GOOS)" "$(VERSION)")
-	CGO_ENABLED = 1
-endif
-
-build: generate build-quick
-
-build-quick:
-	CGO_ENABLED=$(CGO_ENABLED) go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+# Builds micro after checking dependencies but without updating the runtime
+build:
+	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro

 build-dbg:
-	CGO_ENABLED=$(CGO_ENABLED) go build -trimpath -ldflags "$(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro
+	go build -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro

-build-tags: fetch-tags build
+build-tags: fetch-tags
+	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro

-build-all: build
+# Builds micro after building the runtime and checking dependencies
+build-all: runtime build

-install: generate
+# Builds micro without checking for dependencies
+build-quick:
+	go build -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro
+
+# Same as 'build' but installs to $GOBIN afterward
+install:
 	go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro

-install-all: install
+# Same as 'build-all' but installs to $GOBIN afterward
+install-all: runtime install
+
+# Same as 'build-quick' but installs to $GOBIN afterward
+install-quick:
+	go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)"  ./cmd/micro

 fetch-tags:
-	git fetch --tags --force
+	git fetch --tags

-generate:
-	GOOS=$(shell go env GOHOSTOS) GOARCH=$(shell go env GOHOSTARCH) go generate ./runtime
-
-testgen:
-	mkdir -p tools/vscode-tests
-	cd tools/vscode-tests && \
-	curl --remote-name-all $(VSCODE_TESTS_BASE_URL){editableTextModelAuto,editableTextModel,model.line}.test.ts
-	tsc tools/vscode-tests/*.ts > /dev/null; true
-	go run tools/testgen.go tools/vscode-tests/*.js > buffer_generated_test.go
-	mv buffer_generated_test.go internal/buffer
-	gofmt -w internal/buffer/buffer_generated_test.go
+# Builds the runtime
+runtime:
+	git submodule update --init
+	go run runtime/syntax/make_headers.go runtime/syntax
+	go build -o tools/bindata ./tools/go-bindata
+	tools/bindata -pkg config -nomemcopy -nometadata -o runtime.go runtime/...
+	mv runtime.go internal/config
+	gofmt -w internal/config/runtime.go

 test:
 	go test ./internal/...
-	go test ./cmd/...
-
-bench:
-	for i in 1 2 3; do \
-		go test -bench=. ./internal/...; \
-	done > benchmark_results
-	benchstat benchmark_results
-
-bench-baseline:
-	for i in 1 2 3; do \
-		go test -bench=. ./internal/...; \
-	done > benchmark_results_baseline
-
-bench-compare:
-	for i in 1 2 3; do \
-		go test -bench=. ./internal/...; \
-	done > benchmark_results
-	benchstat -alpha 0.15 benchmark_results_baseline benchmark_results

 clean:
 	rm -f micro
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-<img alt="micro logo" src="./assets/micro-logo-drop.svg" width="500px"/>
+<img alt="micro logo" src="./assets/micro-logo.svg" width="500px"/>

-![Test Workflow](https://github.com/micro-editor/micro/actions/workflows/test.yaml/badge.svg)
-[![Go Report Card](https://goreportcard.com/badge/github.com/micro-editor/micro/v2)](https://goreportcard.com/report/github.com/micro-editor/micro/v2)
-[![Release](https://img.shields.io/github/release/micro-editor/micro.svg?label=Release)](https://github.com/micro-editor/micro/releases)
-[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/micro-editor/micro/blob/master/LICENSE)
+[![Build Status](https://travis-ci.org/zyedidia/micro.svg?branch=master)](https://travis-ci.org/zyedidia/micro)
+[![Go Report Card](https://goreportcard.com/badge/github.com/zyedidia/micro)](https://goreportcard.com/report/github.com/zyedidia/micro)
+[![Release](https://img.shields.io/github/release/zyedidia/micro.svg?label=Release)](https://github.com/zyedidia/micro/releases)
+[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/zyedidia/micro/blob/master/LICENSE)
 [![Join the chat at https://gitter.im/zyedidia/micro](https://badges.gitter.im/zyedidia/micro.svg)](https://gitter.im/zyedidia/micro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Snap Status](https://snapcraft.io/micro/badge.svg)](https://snapcraft.io/micro)
+[![Snap Status](https://build.snapcraft.io/badge/zyedidia/micro.svg)](https://build.snapcraft.io/user/zyedidia/micro)

 **micro** is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the capabilities
 of modern terminals. It comes as a single, batteries-included, static binary with no dependencies; you can download and use it right now!
@@ -17,10 +17,26 @@ Here is a picture of micro editing its source code.

 ![Screenshot](./assets/micro-solarized.png)

-To see more screenshots of micro, showcasing some of the default color schemes, see [here](https://micro-editor.github.io).
-
+To see more screenshots of micro, showcasing some of the default color schemes, see [here](http://zbyedidia.webfactional.com/micro/screenshots.html).
+ 
 You can also check out the website for Micro at https://micro-editor.github.io.

+## Table of Contents
+
+- [Features](#features)
+- [Installation](#installation)
+  - [Prebuilt binaries](#prebuilt-binaries)
+  - [Package Managers](#package-managers)
+  - [Building from source](#building-from-source)
+  - [Fully static binary](#fully-static-binary)
+  - [macOS terminal](#macos-terminal)
+  - [Linux clipboard support](#linux-clipboard-support)
+  - [Colors and syntax highlighting](#colors-and-syntax-highlighting)
+  - [Plan9, Cygwin, Mingw](#plan9-cygwin-mingw)
+- [Usage](#usage)
+- [Documentation and Help](#documentation-and-help)
+- [Contributing](#contributing)
+
 - - -

 ## Features
@@ -28,7 +44,7 @@ You can also check out the website for Micro at https://micro-editor.github.io.
 - Easy to use and install.
 - No dependencies or external files are needed — just the binary you can download further down the page.
 - Multiple cursors.
- Common keybindings (<kbd>Ctrl-s</kbd>, <kbd>Ctrl-c</kbd>, <kbd>Ctrl-v</kbd>, <kbd>Ctrl-z</kbd>, …).
+- Common keybindings (<kbd>Ctrl+S</kbd>, <kbd>Ctrl+C</kbd>, <kbd>Ctrl+V</kbd>, <kbd>Ctrl+Z</kbd>, …).
  - Keybindings can be rebound to your liking.
 - Sane defaults.
  - You shouldn't have to configure much out of the box (and it is extremely easy to configure).
@@ -37,67 +53,51 @@ You can also check out the website for Micro at https://micro-editor.github.io.
 - Extremely good mouse support.
  - This means mouse dragging to create a selection, double click to select by word, and triple click to select by line.
 - Cross-platform (it should work on all the platforms Go runs on).
-  - Note that while Windows is supported, Mingw/Cygwin is not (see below).
+  - Note that while Windows is supported Mingw/Cygwin is not (see below)
 - Plugin system (plugins are written in Lua).
  - micro has a built-in plugin manager to automatically install, remove, and update plugins.
- Built-in diff gutter.
- Simple autocompletion.
+- Built-in diff gutter
+- Simple autocompletion
 - Persistent undo.
- Automatic linting and error notifications.
+- Automatic linting and error notifications
 - Syntax highlighting for over [130 languages](runtime/syntax).
 - Color scheme support.
  - By default, micro comes with 16, 256, and true color themes.
- True color support.
+- True color support (set the `MICRO_TRUECOLOR` environment variable to 1 to enable it).
 - Copy and paste with the system clipboard.
 - Small and simple.
 - Easily configurable.
 - Macros.
- Smart highlighting of trailing whitespace and tab vs space errors.
 - Common editor features such as undo/redo, line numbers, Unicode support, soft wrapping, …

 ## Installation

-To install micro, you can download a [prebuilt binary](https://github.com/micro-editor/micro/releases), or you can build it from source.
+To install micro, you can download a [prebuilt binary](https://github.com/zyedidia/micro/releases), or you can build it from source.

-If you want more information about ways to install micro, see this [wiki page](https://github.com/micro-editor/micro/wiki/Installing-Micro).
+If you want more information about ways to install micro, see this [wiki page](https://github.com/zyedidia/micro/wiki/Installing-Micro).

-Use `micro -version` to get the version information after installing. It is only guaranteed that you are installing the most recent
-stable version if you install from the prebuilt binaries, Homebrew, or Snap.
+### Prebuilt binaries

-A desktop entry file and man page can be found in the [assets/packaging](https://github.com/micro-editor/micro/tree/master/assets/packaging) directory.
+All you need to install micro is one file, the binary itself. It's as simple as that!

-### Pre-built binaries
+Download the binary from the [releases](https://github.com/zyedidia/micro/releases) page.

-Pre-built binaries are distributed in [releases](https://github.com/micro-editor/micro/releases).
+On that page you'll see the nightly release, which contains binaries for micro which are built every night,
+and you'll see all the stable releases with the corresponding binaries.

-To uninstall micro, simply remove the binary, and the configuration directory at `~/.config/micro`.
+Running `micro -version` will give you the version information.

-#### Third-party quick-install script
+### Installation script
+
+There is a script which can install micro for you by downloading the latest prebuilt binary. You can find it at <https://getmic.ro>.
+
+Then you can easily install micro:

 ```bash
 curl https://getmic.ro | bash
 ```

-The script will place the micro binary in the current directory. From there, you can move it to a directory on your path of your choosing (e.g. `sudo mv micro /usr/bin`). See its [GitHub repository](https://github.com/benweissmann/getmic.ro) for more information.
-
-#### Eget
-
-With [Eget](https://github.com/zyedidia/eget) installed, you can easily get a pre-built binary:
-
-```
-eget micro-editor/micro
-```
-
-Use `--tag VERSION` to download a specific tagged version.
-
-```
-eget --tag nightly micro-editor/micro # download the nightly version (compiled every day at midnight UTC)
-eget --tag v2.0.8 micro-editor/micro  # download version 2.0.8 rather than the latest release
-```
-
-You can install `micro` by adding `--to /usr/local/bin` to the `eget` command, or move the binary manually to a directory on your `$PATH` after the download completes.
-
-See [Eget](https://github.com/zyedidia/eget) for more information.
+The script will install the micro binary to the current directory. See its [GitHub repository](https://github.com/benweissmann/getmic.ro) for more information.

 ### Package managers

@@ -107,65 +107,36 @@ You can install micro using Homebrew on Mac:
 brew install micro
 ```

-**Note for Mac:** All micro keybindings use the control or alt (option) key, not the command
-key. By default, macOS terminals do not forward alt key events. To fix this, please see
-the section on [macOS terminals](https://github.com/micro-editor/micro#macos-terminal) further below.
-
 On Linux, you can install micro through [snap](https://snapcraft.io/docs/core/install)

 ```
 snap install micro --classic
 ```

-Micro is also available through other package managers on Linux such as dnf, AUR, Nix, and package managers
-for other operating systems. These packages are not guaranteed to be up-to-date.
+On Debian `unstable | testing | buster-backports` and Ubuntu `focal` (20.04), micro is available
+via `apt`:

-<!-- * `apt install micro` (Ubuntu 20.04 `focal`, and Debian `unstable | testing | buster-backports`). At the moment, this package (2.0.1-1) is outdated and has a known bug where debug mode is enabled. -->
+```
+sudo apt install micro
+```

-* Linux:
-    * distro-specific package managers:
-        * `dnf install micro` (Fedora).
-        * `apt install micro` (Ubuntu and Debian).
-        * `pacman -S micro` (Arch Linux).
-        * `emerge app-editors/micro` (Gentoo).
-        * `zypper install micro-editor` (SUSE)
-        * `eopkg install micro` (Solus).
-        * `pacstall -I micro` (Pacstall).
-        * `apt-get install micro` (ALT Linux)
-        * See [wiki](https://github.com/micro-editor/micro/wiki/Installing-Micro) for details about CRUX, Termux.
-    * distro-agnostic package managers:
-        * `nix profile install nixpkgs#micro` (with [Nix](https://nixos.org/) and flakes enabled)
-        * `flox install micro` (with [Flox](https://flox.dev))
-* Windows: [Chocolatey](https://chocolatey.org), [Scoop](https://scoop.sh/) and [WinGet](https://learn.microsoft.com/en-us/windows/package-manager/winget/).
-    * `choco install micro`.
-    * `scoop install micro`.
-    * `winget install zyedidia.micro`
-* OpenBSD: Available in the ports tree and also available as a binary package.
-    * `pkg_add -v micro`.
-* NetBSD, macOS, Linux, Illumos, etc. with [pkgsrc](https://www.pkgsrc.org/)-current:
-    * `pkg_add micro`
-* macOS: Available in package managers.
-    * `sudo port install micro` (with [MacPorts](https://www.macports.org))
-    * `brew install micro` (with [Homebrew](https://brew.sh/))
-    * `nix profile install nixpkgs#micro` (with [Nix](https://nixos.org/) and flakes enabled)
-    * `flox install micro` (with [Flox](https://flox.dev))
+Micro is also available through other package managers on Linux such as AUR, Nix, and package managers
+for other operating systems:

-**Note for Linux desktop environments:**
-
-For interfacing with the local system clipboard, the following tools need to be installed:
-* For X11, `xclip` or `xsel`
-* For [Wayland](https://wayland.freedesktop.org/), `wl-clipboard`
-
-Without these tools installed, micro will use an internal clipboard for copy and paste, but it won't be accessible to external applications.
+* Windows: [Chocolatey](https://chocolatey.org) and [Scoop](https://github.com/lukesampson/scoop)
+    * `choco install micro`
+    * `scoop install micro`
+* OpenBSD: Available in the ports tree and also available as a binary package
+    * `pkd_add -v micro`

 ### Building from source

 If your operating system does not have a binary release, but does run Go, you can build from source.

-Make sure that you have Go version 1.19 or greater and Go modules are enabled.
+Make sure that you have Go version 1.11 or greater and Go modules are enabled.

 ```
-git clone https://github.com/micro-editor/micro
+git clone https://github.com/zyedidia/micro
 cd micro
 make build
 sudo mv micro /usr/local/bin # optional
@@ -176,50 +147,43 @@ anywhere you like (for example `/usr/local/bin`).

 The command `make install` will install the binary to `$GOPATH/bin` or `$GOBIN`.

-You can install directly with `go get` (`go get github.com/micro-editor/micro/cmd/micro`) but this isn't
+You can install directly with `go get` (`go get github.com/zyedidia/micro/cmd/micro`) but this isn't
 recommended because it doesn't build micro with version information (necessary for the plugin manager),
 and doesn't disable debug mode.

-### Fully static or dynamically linked binary
+### Fully static binary

-By default, the micro binary is linked statically to increase the portability of the prebuilt binaries.
-This behavior can simply be overriden by providing `CGO_ENABLED=1` to the build target.
+By default, the micro binary will dynamically link with core system libraries (this is generally
+recommended for security and portability). However, there is a fully static prebuilt binary that
+is provided for amd64 as `linux-static.tar.gz`, and to build a fully static binary from source, run

 ```
-CGO_ENABLED=1 make build
+CGO_ENABLED=0 make build
 ```

-Afterwards the micro binary will dynamically link with the present core system libraries.
-
-**Note for Mac:**
-Native macOS builds are done with `CGO_ENABLED=1` forced set to support adding the "Information Property List" in the linker step.
-
 ### macOS terminal

-If you are using macOS, you should consider using [iTerm2](https://iterm2.com/) instead of the default terminal (Terminal.app). The iTerm2 terminal has much better mouse support as well as better handling of key events. For best keybinding behavior, choose `xterm defaults` under `Preferences->Profiles->Keys->Presets...`, and select `Esc+` for `Left Option Key` in the same menu. The newest versions also support true color.
+If you are using macOS, you should consider using [iTerm2](http://iterm2.com/) instead of the default terminal (Terminal.app). The iTerm2 terminal has much better mouse support as well as better handling of key events. For best keybinding behavior, choose `xterm defaults` under `Preferences->Profiles->Keys->Load Preset`. The newest versions also support true color.

 If you still insist on using the default Mac terminal, be sure to set `Use Option key as Meta key` under
 `Preferences->Profiles->Keyboard` to use <kbd>option</kbd> as <kbd>alt</kbd>.

-### WSL and Windows Console
+### Linux clipboard support

-If you use micro within WSL, it is highly recommended that you use the [Windows
-Terminal](https://apps.microsoft.com/store/detail/windows-terminal/9N0DX20HK701?hl=en-us&gl=us)
-instead of the default Windows Console.
+On Linux, clipboard support requires:

-If you must use Windows Console for some reason, note that there is a bug in
-Windows Console WSL that causes a font change whenever micro tries to access
-the external clipboard via powershell. To fix this, use an internal clipboard
-with `set clipboard internal` (though your system clipboard will no longer be
-available in micro).
+- On X11, the `xclip` or `xsel` commands (for Ubuntu: `sudo apt install xclip`)
+- On Wayland, the `wl-clipboard` command
+
+If you don't have these commands, micro will use an internal clipboard for copy and paste, but it won't work with external applications.

 ### Colors and syntax highlighting

 If you open micro and it doesn't seem like syntax highlighting is working, this is probably because
 you are using a terminal which does not support 256 color mode. Try changing the color scheme to `simple`
-by pressing <kbd>Ctrl-e</kbd> in micro and typing `set colorscheme simple`.
+by pressing <kbd>Ctrl+E</kbd> in micro and typing `set colorscheme simple`.

-If you are using the default Ubuntu terminal, to enable 256 color mode make sure your `TERM` variable is set
+If you are using the default Ubuntu terminal, to enable 256 make sure your `TERM` variable is set
 to `xterm-256color`.

 Many of the Windows terminals don't support more than 16 colors, which means
@@ -238,7 +202,7 @@ winpty micro.exe ...

 Micro uses the amazing [tcell library](https://github.com/gdamore/tcell), but this
 means that micro is restricted to the platforms tcell supports. As a result, micro does not support
-Plan9 or Cygwin (although this may change in the future). Micro also doesn't support NaCl (which is deprecated anyway).
+Plan9, and Cygwin (although this may change in the future). Micro also doesn't support NaCl (which is deprecated anyway).

 ## Usage

@@ -247,7 +211,7 @@ Once you have built the editor, start it by running `micro path/to/file.txt` or
 micro also supports creating buffers from `stdin`:

 ```sh
-ip a | micro
+ifconfig | micro
 ```

 You can move the cursor around with the arrow keys and mouse.
@@ -258,28 +222,24 @@ click to enable line selection.

 ## Documentation and Help

-micro has a built-in help system which you can access by pressing <kbd>Ctrl-e</kbd> and typing `help`. Additionally, you can
+micro has a built-in help system which you can access by pressing <kbd>Ctrl+E</kbd> and typing `help`. Additionally, you can
 view the help files here:

- [main help](https://github.com/micro-editor/micro/tree/master/runtime/help/help.md)
- [keybindings](https://github.com/micro-editor/micro/tree/master/runtime/help/keybindings.md)
- [commands](https://github.com/micro-editor/micro/tree/master/runtime/help/commands.md)
- [colors](https://github.com/micro-editor/micro/tree/master/runtime/help/colors.md)
- [options](https://github.com/micro-editor/micro/tree/master/runtime/help/options.md)
- [plugins](https://github.com/micro-editor/micro/tree/master/runtime/help/plugins.md)
+- [main help](https://github.com/zyedidia/micro/tree/master/runtime/help/help.md)
+- [keybindings](https://github.com/zyedidia/micro/tree/master/runtime/help/keybindings.md)
+- [commands](https://github.com/zyedidia/micro/tree/master/runtime/help/commands.md)
+- [colors](https://github.com/zyedidia/micro/tree/master/runtime/help/colors.md)
+- [options](https://github.com/zyedidia/micro/tree/master/runtime/help/options.md)
+- [plugins](https://github.com/zyedidia/micro/tree/master/runtime/help/plugins.md)

-I also recommend reading the [tutorial](https://github.com/micro-editor/micro/tree/master/runtime/help/tutorial.md) for
+I also recommend reading the [tutorial](https://github.com/zyedidia/micro/tree/master/runtime/help/tutorial.md) for
 a brief introduction to the more powerful configuration features micro offers.

-There is also an unofficial Discord, which you can join at https://discord.gg/nhWR6armnR.
-
 ## Contributing

 If you find any bugs, please report them! I am also happy to accept pull requests from anyone.

-You can use the [GitHub issue tracker](https://github.com/micro-editor/micro/issues)
+You can use the [GitHub issue tracker](https://github.com/zyedidia/micro/issues)
 to report bugs, ask questions, or suggest new features.

-For a more informal setting to discuss the editor, you can join the [Gitter chat](https://gitter.im/zyedidia/micro) or the [Discord](https://discord.gg/nhWR6armnR). You can also use the [Discussions](https://github.com/micro-editor/micro/discussions) section on Github for a forum-like setting or for Q&A.
-
-Sometimes I am unresponsive, and I apologize! If that happens, please ping me.
+For a more informal setting to discuss the editor, you can join the [Gitter chat](https://gitter.im/zyedidia/micro).
--- a/assets/micro-logo-drop.svg
+++ b/assets/micro-logo-drop.svg
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 304.70001 103.2"
-   enable-background="new 0 0 960 560"
-   xml:space="preserve"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="micro-logo-drop.svg"
-   width="304.70001"
-   height="103.2"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
-     id="metadata21"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs19"><filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Blur"
-       id="filter1040"
-       x="-0.028037383"
-       y="-0.10549451"
-       width="1.0560748"
-       height="1.210989"><feGaussianBlur
-         stdDeviation="2 2"
-         result="blur"
-         id="feGaussianBlur1038" /></filter></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1080"
-     id="namedview17"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="13.204388"
-     inkscape:cx="71.832181"
-     inkscape:cy="63.956011"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1"
-     inkscape:pagecheckerboard="0"
-     inkscape:showpageshadow="2"
-     inkscape:deskcolor="#d1d1d1" /><g
-     id="g838"
-     transform="translate(-178,-172.8)"
-     style="fill:#ffffff;fill-opacity:1;filter:url(#filter1040)"><path
-       d="m 306.8,213.8 v -2.6 c 1.6,-0.1 2.9,-0.4 4.1,-0.8 1.2,-0.4 2.5,-1 4,-1.8 h 2.3 v 5.2 c 2.4,-1.9 4.2,-3.1 5.5,-3.8 2,-1 4,-1.5 5.8,-1.5 1.3,0 2.5,0.2 3.7,0.7 1.2,0.5 2.2,1 2.9,1.7 0.7,0.7 1.4,1.6 1.9,2.8 2.2,-1.9 4.2,-3.3 6,-4 1.9,-0.8 3.7,-1.2 5.6,-1.2 1.8,0 3.4,0.4 4.8,1.1 1.4,0.8 2.4,1.7 3,2.8 0.6,1.1 0.9,2.8 0.9,5 v 14.4 c 0,1.5 0,2.4 0.1,2.6 0.1,0.4 0.3,0.8 0.7,1.1 0.3,0.4 0.7,0.6 1.2,0.7 0.4,0.1 1.2,0.2 2.4,0.2 h 1 v 2.6 h -15.5 v -2.6 c 1.8,0 2.9,-0.1 3.5,-0.4 0.5,-0.2 0.9,-0.6 1.2,-1.2 0.3,-0.6 0.4,-1.6 0.4,-3.2 v -13.7 c 0,-1.7 -0.2,-2.9 -0.5,-3.6 -0.3,-0.7 -0.9,-1.2 -1.7,-1.7 -0.8,-0.4 -1.8,-0.7 -3,-0.7 -1.5,0 -3,0.4 -4.6,1.2 -2.2,1.1 -3.9,2.3 -5.1,3.6 v 14.8 c 0,1.4 0.1,2.4 0.2,2.8 0.1,0.4 0.4,0.8 0.7,1.1 0.3,0.3 0.7,0.5 1.1,0.6 0.4,0.1 1.5,0.2 3.1,0.2 v 2.6 h -15.3 v -2.6 h 0.9 c 1.2,0 2.1,-0.1 2.6,-0.4 0.5,-0.3 0.9,-0.7 1.2,-1.3 0.2,-0.5 0.3,-1.5 0.3,-2.9 v -13.2 c 0,-1.9 -0.2,-3.3 -0.5,-3.9 -0.3,-0.7 -0.9,-1.3 -1.7,-1.7 -0.8,-0.5 -1.8,-0.7 -3,-0.7 -1.3,0 -2.7,0.3 -4.1,1 -2,1 -3.9,2.2 -5.6,3.8 v 15.9 c 0,1 0.1,1.6 0.4,2.1 0.3,0.4 0.7,0.8 1.2,1.1 0.6,0.3 1.3,0.4 2.3,0.4 h 1.1 v 2.6 h -15.6 v -2.6 h 0.8 c 1.4,0 2.4,-0.1 2.8,-0.3 0.7,-0.3 1.1,-0.8 1.4,-1.5 0.2,-0.4 0.2,-1.3 0.2,-2.9 v -18.1 h -5.1 z"
-       id="path828"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1" /><path
-       d="m 366.4,213.7 v -2.6 c 1.7,-0.2 3.2,-0.5 4.3,-0.9 1.2,-0.4 2.5,-1 4,-1.7 h 2.3 v 24.9 c 0,0.9 0.1,1.5 0.4,2 0.2,0.4 0.6,0.8 1,0.9 0.4,0.2 1.3,0.3 2.4,0.3 h 1.5 v 2.6 h -15.9 v -2.6 h 1.3 c 1.4,0 2.3,-0.1 2.8,-0.4 0.5,-0.2 0.8,-0.6 1,-1.1 0.2,-0.5 0.3,-1.5 0.3,-3.2 v -18.3 h -5.4 z m 7.9,-19.2 c 1,0 1.8,0.3 2.5,1 0.7,0.7 1.1,1.5 1.1,2.5 0,1 -0.4,1.8 -1.1,2.5 -0.7,0.7 -1.6,1.1 -2.5,1.1 -1,0 -1.8,-0.4 -2.5,-1.1 -0.7,-0.7 -1.1,-1.6 -1.1,-2.5 0,-1 0.4,-1.8 1.1,-2.5 0.6,-0.6 1.5,-1 2.5,-1 z"
-       id="path830"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1" /><path
-       d="m 413.1,230.6 2,1.6 c -3.9,5.2 -8.6,7.8 -14,7.8 -4.2,0 -7.8,-1.5 -10.7,-4.5 -2.9,-3 -4.4,-6.8 -4.4,-11.3 0,-3 0.7,-5.7 2,-8.1 1.3,-2.4 3.2,-4.2 5.6,-5.6 2.4,-1.3 5.2,-2 8.3,-2 3.6,0 6.5,0.9 8.9,2.6 2.4,1.7 3.6,3.5 3.6,5.3 0,1 -0.3,1.7 -0.8,2.2 -0.5,0.5 -1.2,0.8 -1.9,0.8 -0.4,0 -0.7,-0.1 -1.1,-0.3 -0.4,-0.2 -0.7,-0.5 -1.1,-0.9 -0.2,-0.2 -0.5,-0.8 -0.9,-1.7 -0.6,-1.2 -1,-2 -1.3,-2.4 -0.6,-0.8 -1.4,-1.5 -2.4,-2 -0.9,-0.5 -2,-0.7 -3.1,-0.7 -1.8,0 -3.4,0.5 -4.9,1.5 -1.5,1 -2.7,2.4 -3.6,4.3 -0.9,1.9 -1.3,4.2 -1.3,6.8 0,4.1 1.1,7.3 3.3,9.7 1.9,2.1 4.1,3.1 6.7,3.1 1.2,0 2.4,-0.2 3.6,-0.6 1.2,-0.4 2.4,-1 3.5,-1.8 0.9,-0.6 2.2,-1.8 4,-3.8 z"
-       id="path832"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1" /><path
-       d="m 418.7,213.7 v -2.6 c 1.5,-0.1 2.8,-0.4 4,-0.8 1.2,-0.4 2.5,-1 4,-1.9 h 2.3 v 5.9 c 1.5,-1.8 3.2,-3.2 5.1,-4.3 1.9,-1.1 3.7,-1.6 5.2,-1.6 1.5,0 2.7,0.4 3.6,1.1 0.9,0.7 1.3,1.6 1.3,2.6 0,0.7 -0.3,1.4 -0.9,2 -0.6,0.6 -1.3,0.9 -2.1,0.9 -0.4,0 -0.7,-0.1 -1,-0.2 -0.3,-0.1 -0.7,-0.3 -1.2,-0.7 -1.1,-0.7 -2.1,-1.1 -2.9,-1.1 -1,0 -2.2,0.4 -3.4,1.3 -1.6,1.1 -2.8,2.2 -3.7,3.3 V 232 c 0,1.2 0.1,2.1 0.2,2.5 0.1,0.4 0.4,0.8 0.7,1.1 0.3,0.3 0.7,0.6 1.1,0.7 0.5,0.1 1.3,0.2 2.4,0.2 h 1 v 2.6 h -16 v -2.6 h 1.3 c 1.3,0 2.1,-0.1 2.5,-0.3 0.5,-0.3 0.9,-0.7 1.2,-1.3 0.3,-0.5 0.4,-1.5 0.4,-3 v -18.3 h -5.1 z"
-       id="path834"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1" /><path
-       d="m 462.8,208.5 c 3,0 5.7,0.6 7.9,1.9 2.2,1.3 4,3.1 5.3,5.5 1.3,2.4 1.9,5.2 1.9,8.3 0,3.1 -0.7,5.9 -2,8.3 -1.3,2.4 -3.1,4.3 -5.4,5.5 -2.3,1.3 -5,1.9 -8.1,1.9 -5,0 -8.8,-1.6 -11.3,-4.7 -2.5,-3.1 -3.8,-6.8 -3.8,-11 0,-3.1 0.7,-5.8 2,-8.2 1.3,-2.4 3.1,-4.2 5.5,-5.6 2.4,-1.2 5.1,-1.9 8,-1.9 z m -0.2,3 c -2.4,0 -4.4,0.9 -6,2.8 -2.1,2.3 -3.1,5.7 -3.1,10.1 0,4.3 0.9,7.5 2.6,9.7 1.6,2 3.8,3 6.5,3 1.8,0 3.3,-0.5 4.7,-1.4 1.4,-0.9 2.5,-2.4 3.3,-4.5 0.8,-2 1.3,-4.4 1.3,-7.2 0,-2.7 -0.5,-5.1 -1.4,-7.2 -0.7,-1.7 -1.8,-3 -3.2,-4 -1.3,-0.8 -2.9,-1.3 -4.7,-1.3 z"
-       id="path836"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1" /></g><g
-     id="g3"
-     transform="translate(-178,-172.8)"><path
-       d="m 306.8,213.8 v -2.6 c 1.6,-0.1 2.9,-0.4 4.1,-0.8 1.2,-0.4 2.5,-1 4,-1.8 h 2.3 v 5.2 c 2.4,-1.9 4.2,-3.1 5.5,-3.8 2,-1 4,-1.5 5.8,-1.5 1.3,0 2.5,0.2 3.7,0.7 1.2,0.5 2.2,1 2.9,1.7 0.7,0.7 1.4,1.6 1.9,2.8 2.2,-1.9 4.2,-3.3 6,-4 1.9,-0.8 3.7,-1.2 5.6,-1.2 1.8,0 3.4,0.4 4.8,1.1 1.4,0.8 2.4,1.7 3,2.8 0.6,1.1 0.9,2.8 0.9,5 v 14.4 c 0,1.5 0,2.4 0.1,2.6 0.1,0.4 0.3,0.8 0.7,1.1 0.3,0.4 0.7,0.6 1.2,0.7 0.4,0.1 1.2,0.2 2.4,0.2 h 1 v 2.6 h -15.5 v -2.6 c 1.8,0 2.9,-0.1 3.5,-0.4 0.5,-0.2 0.9,-0.6 1.2,-1.2 0.3,-0.6 0.4,-1.6 0.4,-3.2 v -13.7 c 0,-1.7 -0.2,-2.9 -0.5,-3.6 -0.3,-0.7 -0.9,-1.2 -1.7,-1.7 -0.8,-0.4 -1.8,-0.7 -3,-0.7 -1.5,0 -3,0.4 -4.6,1.2 -2.2,1.1 -3.9,2.3 -5.1,3.6 v 14.8 c 0,1.4 0.1,2.4 0.2,2.8 0.1,0.4 0.4,0.8 0.7,1.1 0.3,0.3 0.7,0.5 1.1,0.6 0.4,0.1 1.5,0.2 3.1,0.2 v 2.6 h -15.3 v -2.6 h 0.9 c 1.2,0 2.1,-0.1 2.6,-0.4 0.5,-0.3 0.9,-0.7 1.2,-1.3 0.2,-0.5 0.3,-1.5 0.3,-2.9 v -13.2 c 0,-1.9 -0.2,-3.3 -0.5,-3.9 -0.3,-0.7 -0.9,-1.3 -1.7,-1.7 -0.8,-0.5 -1.8,-0.7 -3,-0.7 -1.3,0 -2.7,0.3 -4.1,1 -2,1 -3.9,2.2 -5.6,3.8 v 15.9 c 0,1 0.1,1.6 0.4,2.1 0.3,0.4 0.7,0.8 1.2,1.1 0.6,0.3 1.3,0.4 2.3,0.4 h 1.1 v 2.6 h -15.6 v -2.6 h 0.8 c 1.4,0 2.4,-0.1 2.8,-0.3 0.7,-0.3 1.1,-0.8 1.4,-1.5 0.2,-0.4 0.2,-1.3 0.2,-2.9 v -18.1 h -5.1 z"
-       id="path5"
-       inkscape:connector-curvature="0" /><path
-       d="m 366.4,213.7 v -2.6 c 1.7,-0.2 3.2,-0.5 4.3,-0.9 1.2,-0.4 2.5,-1 4,-1.7 h 2.3 v 24.9 c 0,0.9 0.1,1.5 0.4,2 0.2,0.4 0.6,0.8 1,0.9 0.4,0.2 1.3,0.3 2.4,0.3 h 1.5 v 2.6 h -15.9 v -2.6 h 1.3 c 1.4,0 2.3,-0.1 2.8,-0.4 0.5,-0.2 0.8,-0.6 1,-1.1 0.2,-0.5 0.3,-1.5 0.3,-3.2 v -18.3 h -5.4 z m 7.9,-19.2 c 1,0 1.8,0.3 2.5,1 0.7,0.7 1.1,1.5 1.1,2.5 0,1 -0.4,1.8 -1.1,2.5 -0.7,0.7 -1.6,1.1 -2.5,1.1 -1,0 -1.8,-0.4 -2.5,-1.1 -0.7,-0.7 -1.1,-1.6 -1.1,-2.5 0,-1 0.4,-1.8 1.1,-2.5 0.6,-0.6 1.5,-1 2.5,-1 z"
-       id="path7"
-       inkscape:connector-curvature="0" /><path
-       d="m 413.1,230.6 2,1.6 c -3.9,5.2 -8.6,7.8 -14,7.8 -4.2,0 -7.8,-1.5 -10.7,-4.5 -2.9,-3 -4.4,-6.8 -4.4,-11.3 0,-3 0.7,-5.7 2,-8.1 1.3,-2.4 3.2,-4.2 5.6,-5.6 2.4,-1.3 5.2,-2 8.3,-2 3.6,0 6.5,0.9 8.9,2.6 2.4,1.7 3.6,3.5 3.6,5.3 0,1 -0.3,1.7 -0.8,2.2 -0.5,0.5 -1.2,0.8 -1.9,0.8 -0.4,0 -0.7,-0.1 -1.1,-0.3 -0.4,-0.2 -0.7,-0.5 -1.1,-0.9 -0.2,-0.2 -0.5,-0.8 -0.9,-1.7 -0.6,-1.2 -1,-2 -1.3,-2.4 -0.6,-0.8 -1.4,-1.5 -2.4,-2 -0.9,-0.5 -2,-0.7 -3.1,-0.7 -1.8,0 -3.4,0.5 -4.9,1.5 -1.5,1 -2.7,2.4 -3.6,4.3 -0.9,1.9 -1.3,4.2 -1.3,6.8 0,4.1 1.1,7.3 3.3,9.7 1.9,2.1 4.1,3.1 6.7,3.1 1.2,0 2.4,-0.2 3.6,-0.6 1.2,-0.4 2.4,-1 3.5,-1.8 0.9,-0.6 2.2,-1.8 4,-3.8 z"
-       id="path9"
-       inkscape:connector-curvature="0" /><path
-       d="m 418.7,213.7 v -2.6 c 1.5,-0.1 2.8,-0.4 4,-0.8 1.2,-0.4 2.5,-1 4,-1.9 h 2.3 v 5.9 c 1.5,-1.8 3.2,-3.2 5.1,-4.3 1.9,-1.1 3.7,-1.6 5.2,-1.6 1.5,0 2.7,0.4 3.6,1.1 0.9,0.7 1.3,1.6 1.3,2.6 0,0.7 -0.3,1.4 -0.9,2 -0.6,0.6 -1.3,0.9 -2.1,0.9 -0.4,0 -0.7,-0.1 -1,-0.2 -0.3,-0.1 -0.7,-0.3 -1.2,-0.7 -1.1,-0.7 -2.1,-1.1 -2.9,-1.1 -1,0 -2.2,0.4 -3.4,1.3 -1.6,1.1 -2.8,2.2 -3.7,3.3 V 232 c 0,1.2 0.1,2.1 0.2,2.5 0.1,0.4 0.4,0.8 0.7,1.1 0.3,0.3 0.7,0.6 1.1,0.7 0.5,0.1 1.3,0.2 2.4,0.2 h 1 v 2.6 h -16 v -2.6 h 1.3 c 1.3,0 2.1,-0.1 2.5,-0.3 0.5,-0.3 0.9,-0.7 1.2,-1.3 0.3,-0.5 0.4,-1.5 0.4,-3 v -18.3 h -5.1 z"
-       id="path11"
-       inkscape:connector-curvature="0" /><path
-       d="m 462.8,208.5 c 3,0 5.7,0.6 7.9,1.9 2.2,1.3 4,3.1 5.3,5.5 1.3,2.4 1.9,5.2 1.9,8.3 0,3.1 -0.7,5.9 -2,8.3 -1.3,2.4 -3.1,4.3 -5.4,5.5 -2.3,1.3 -5,1.9 -8.1,1.9 -5,0 -8.8,-1.6 -11.3,-4.7 -2.5,-3.1 -3.8,-6.8 -3.8,-11 0,-3.1 0.7,-5.8 2,-8.2 1.3,-2.4 3.1,-4.2 5.5,-5.6 2.4,-1.2 5.1,-1.9 8,-1.9 z m -0.2,3 c -2.4,0 -4.4,0.9 -6,2.8 -2.1,2.3 -3.1,5.7 -3.1,10.1 0,4.3 0.9,7.5 2.6,9.7 1.6,2 3.8,3 6.5,3 1.8,0 3.3,-0.5 4.7,-1.4 1.4,-0.9 2.5,-2.4 3.3,-4.5 0.8,-2 1.3,-4.4 1.3,-7.2 0,-2.7 -0.5,-5.1 -1.4,-7.2 -0.7,-1.7 -1.8,-3 -3.2,-4 -1.3,-0.8 -2.9,-1.3 -4.7,-1.3 z"
-       id="path13"
-       inkscape:connector-curvature="0" /></g><path
-     d="M 51.6,0 C 23.1,0 0,23.1 0,51.6 c 0,28.5 23.1,51.6 51.6,51.6 28.5,0 51.6,-23.1 51.6,-51.6 C 103.2,23.1 80.1,0 51.6,0 Z m 24.5,58.6 c -0.5,2 -1.3,3.6 -2.4,4.9 -1,1.3 -2,2.1 -3.1,2.5 -1.1,0.4 -2.2,0.6 -3.4,0.6 -1.2,0 -2.2,-0.2 -3,-0.7 C 63.4,65.5 62.8,64.8 62.3,64 61.8,63.2 61.5,62.2 61.3,61.1 61.1,60 61,58.8 61,57.5 c 0,-0.5 0,-1 0.1,-1.7 0.1,-0.7 0.2,-1.6 0.3,-1.6 h -0.2 c -1.6,4 -3.8,6.9 -6.6,9.2 -2.8,2.3 -5.9,3.4 -9.3,3.4 -2.3,0 -4.2,-0.9 -5.5,-2.6 -1.4,-1.7 -2.1,-4.3 -2.1,-7.7 0,-0.5 0,-1 0.1,-1.6 0.1,-0.5 0.1,-0.7 0.2,-1.7 h -0.7 c -0.9,2 -1.7,4.8 -2.3,7.3 -0.6,2.5 -1.1,4.8 -1.4,6.9 -0.4,2.1 -0.6,4 -0.8,5.6 -0.2,1.6 -0.3,2.7 -0.4,3.3 0.1,0.5 0.2,1 0.3,1.6 0.2,0.6 0.3,1.2 0.5,1.7 0.2,0.5 0.3,1.1 0.4,1.6 0.1,0.5 0.2,0.9 0.2,1.2 0,1.4 -0.3,2.5 -0.9,3.2 -0.6,0.7 -1.3,1.1 -2,1.1 -0.9,0 -1.7,-0.3 -2.3,-0.8 -0.7,-0.6 -1,-1.5 -1,-2.7 0,-1.7 0.3,-3.9 0.9,-6.5 0.6,-2.6 1.5,-5.9 2.6,-9.8 0.6,-1.8 1.1,-3.6 1.7,-5.4 0.6,-1.8 1.1,-3.5 1.6,-5 0.5,-1.5 0.9,-2.9 1.3,-4.1 0.4,-1.2 0.6,-2.1 0.7,-2.8 0.1,-0.3 0.2,-1 0.3,-2 0.1,-1 0.2,-2.1 0.4,-3.4 0.2,-1.3 0.3,-2.7 0.5,-4.1 0.2,-1.5 0.4,-2.8 0.5,-4 0.2,-0.9 0.3,-1.9 0.5,-3 0.2,-1.1 0.5,-2.2 0.9,-3.1 0.4,-1 1,-1.8 1.7,-2.5 0.7,-0.7 1.6,-1 2.7,-1 1.2,0 2,0.4 2.4,1.1 0.4,0.7 0.6,1.6 0.5,2.6 -0.1,1 -0.2,2.1 -0.5,3.2 -0.3,1.1 -0.6,2.1 -0.9,2.9 -0.8,2.5 -1.6,4.8 -2.5,6.7 -0.9,1.9 -1.7,4 -2.4,6.2 -0.6,1.5 -0.8,2.9 -0.8,4.1 0,2.2 0.7,3.8 2,5 1.4,1.2 3,1.7 4.9,1.7 1.5,0 3,-0.5 4.4,-1.6 1.4,-1.1 2.7,-2.4 3.9,-3.9 1.2,-1.5 2.2,-3.1 3,-4.9 0.8,-1.7 1.4,-3.3 1.8,-4.6 0.1,-0.2 0.2,-0.6 0.3,-1.4 0.2,-0.8 0.3,-1.7 0.5,-2.7 0.2,-1 0.4,-2 0.6,-3.1 0.2,-1.1 0.4,-2 0.5,-2.7 0.2,-0.8 0.3,-1.6 0.5,-2.6 0.2,-1 0.5,-1.9 0.9,-2.8 0.4,-0.9 1,-1.6 1.6,-2.2 0.7,-0.6 1.5,-0.9 2.6,-0.9 1.3,0 2.1,0.4 2.6,1.1 0.4,0.7 0.6,1.6 0.6,2.6 -0.1,1 -0.2,2 -0.5,3 -0.3,1 -0.5,1.8 -0.7,2.4 -0.8,2.5 -1.6,4.7 -2.4,6.7 -0.8,2 -1.5,3.8 -2.2,5.2 -0.6,1.5 -1.1,2.6 -1.5,3.5 -0.4,0.9 -0.6,1.5 -0.6,1.8 0,2.6 0.6,4.5 1.7,5.6 1.1,1.1 2.3,1.7 3.6,1.7 2.2,0 3.9,-0.7 5.2,-2 1.3,-1.4 2.3,-3.9 2.9,-6.9 h 0.8 c 0.2,2.9 -0.1,5.3 -0.6,7.3 z"
-     id="path15"
-     inkscape:connector-curvature="0"
-     style="fill:#2e3192" /><path
-     style="fill:#ffffff;stroke-width:0.0757324"
-     d="m 30.026506,86.559353 c -1.017302,-0.241662 -1.787869,-0.887419 -2.143612,-1.796406 -0.545654,-1.394246 -0.158934,-4.812615 1.126179,-9.954732 1.255925,-5.025324 2.459082,-9.096362 5.109736,-17.289458 0.344312,-1.064257 1.654133,-5.2136 1.888607,-5.982859 0.296596,-0.97307 0.598551,-2.708021 0.79743,-4.581811 0.108312,-1.020494 0.246431,-2.186451 0.306932,-2.591018 0.0605,-0.404565 0.178758,-1.341754 0.262796,-2.082641 0.224837,-1.982189 0.649291,-5.218012 0.916787,-6.98913 0.444542,-2.943359 0.753682,-4.198397 1.354756,-5.499991 0.686842,-1.487323 1.771061,-2.655188 2.805126,-3.021538 0.542395,-0.19216 1.381388,-0.270583 1.982594,-0.185316 1.252526,0.17764 1.883508,0.754167 2.211742,2.020866 0.313761,1.21084 -0.05565,3.930951 -0.877141,6.458782 -1.290698,3.971623 -2.036395,5.990995 -2.986916,8.088674 -1.185138,2.61545 -2.712212,6.873258 -2.939609,8.196258 -0.49042,2.853282 0.04972,5.146283 1.578225,6.6999 0.913915,0.928929 2.023939,1.521458 3.413442,1.82209 0.903748,0.195534 2.608483,0.179674 3.407958,-0.03171 1.383427,-0.365777 2.763884,-1.250325 4.377299,-2.804821 3.163126,-3.047616 5.113532,-6.222841 6.797438,-11.066108 0.353971,-1.018094 0.493359,-1.574562 0.749316,-2.991429 0.271014,-1.500218 1.040858,-5.574621 1.51657,-8.026458 0.08082,-0.416528 0.218253,-1.149239 0.305416,-1.628246 0.472088,-2.594388 1.148516,-4.178722 2.330295,-5.458032 0.763841,-0.826879 1.674493,-1.206419 2.894632,-1.206419 1.24359,0 2.138991,0.401576 2.574266,1.154526 0.974305,1.685378 0.683954,4.053139 -1.163626,9.489195 -0.954432,2.808181 -2.572717,6.998752 -3.493593,9.046702 -0.971745,2.161077 -2.201912,5.041664 -2.441809,5.717796 l -0.268706,0.757324 0.09021,1.120423 c 0.212423,2.638199 0.889316,4.086035 2.469149,5.281365 0.932959,0.705895 1.786459,0.982601 3.026274,0.981126 2.426542,-0.0029 4.480731,-1.028876 5.685658,-2.839769 0.811784,-1.220036 1.58443,-3.158397 2.044887,-5.130071 l 0.207813,-0.889855 h 0.356374 0.356373 l 0.04799,0.892492 c 0.0554,1.030319 -0.04881,3.015268 -0.219241,4.175846 -0.345822,2.354993 -1.040859,4.427262 -1.983165,5.91286 -0.701565,1.106055 -1.958204,2.491062 -2.717404,2.994989 -1.555814,1.032691 -4.187858,1.499135 -6.161832,1.091984 -0.603718,-0.124523 -1.72865,-0.689523 -2.178956,-1.094387 -1.477985,-1.328835 -2.187139,-3.341642 -2.360358,-6.699454 -0.08196,-1.588814 0.0522,-3.504923 0.298559,-4.263967 0.05681,-0.175039 0.04587,-0.208265 -0.06857,-0.208265 -0.09667,0 -0.197671,0.148268 -0.348229,0.511194 -0.711765,1.715746 -1.965261,3.867832 -3.142896,5.395934 -0.680786,0.883388 -2.612844,2.822501 -3.483678,3.496397 -2.517073,1.947843 -5.073167,2.951502 -8.060525,3.164993 -1.592379,0.1138 -2.868371,-0.07567 -4.016971,-0.596469 -1.69649,-0.769225 -3.109446,-2.469115 -3.819014,-4.594555 -0.614034,-1.839276 -0.863382,-4.754214 -0.580679,-6.788275 0.05951,-0.428202 0.126068,-0.957467 0.147897,-1.176145 l 0.03969,-0.397595 H 37.651633 37.254872 L 36.96284,53.90253 c -0.705326,1.783387 -1.458627,4.293583 -2.085205,6.948448 -1.027173,4.352223 -1.56307,7.486558 -2.197428,12.852248 -0.310323,2.624858 -0.310577,2.629265 -0.189513,3.294359 0.13956,0.766706 0.417018,1.85334 0.68249,2.672894 0.306093,0.944956 0.565598,2.296449 0.565598,2.945615 0,1.819491 -0.751236,3.258298 -2.006909,3.84374 -0.402074,0.187462 -1.15114,0.231172 -1.705369,0.09951 z"
-     id="path218" /></svg>
--- a/assets/micro-logo-mark.svg
+++ b/assets/micro-logo-mark.svg
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 103.2 103.2"
-   enable-background="new 0 0 960 560"
-   xml:space="preserve"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="micro-logo-mark.svg"
-   width="103.2"
-   height="103.2"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
-     id="metadata9"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs7" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1080"
-     id="namedview5"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="5.405335"
-     inkscape:cx="75.573484"
-     inkscape:cy="51.153166"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" /><path
-     d="M 51.6,0 C 23.1,0 0,23.1 0,51.6 c 0,28.5 23.1,51.6 51.6,51.6 28.5,0 51.6,-23.1 51.6,-51.6 C 103.2,23.1 80.1,0 51.6,0 Z m 24.5,58.6 c -0.5,2 -1.3,3.6 -2.4,4.9 -1,1.3 -2,2.1 -3.1,2.5 -1.1,0.4 -2.2,0.6 -3.4,0.6 -1.2,0 -2.2,-0.2 -3,-0.7 C 63.4,65.5 62.8,64.8 62.3,64 61.8,63.2 61.5,62.2 61.3,61.1 61.1,60 61,58.8 61,57.5 c 0,-0.5 0,-1 0.1,-1.7 0.1,-0.7 0.2,-1.6 0.3,-1.6 l -0.2,0 c -1.6,4 -3.8,6.9 -6.6,9.2 -2.8,2.3 -5.9,3.4 -9.3,3.4 -2.3,0 -4.2,-0.9 -5.5,-2.6 -1.4,-1.7 -2.1,-4.3 -2.1,-7.7 0,-0.5 0,-1 0.1,-1.6 0.1,-0.5 0.1,-0.7 0.2,-1.7 l -0.7,0 c -0.9,2 -1.7,4.8 -2.3,7.3 -0.6,2.5 -1.1,4.8 -1.4,6.9 -0.4,2.1 -0.6,4 -0.8,5.6 -0.2,1.6 -0.3,2.7 -0.4,3.3 0.1,0.5 0.2,1 0.3,1.6 0.2,0.6 0.3,1.2 0.5,1.7 0.2,0.5 0.3,1.1 0.4,1.6 0.1,0.5 0.2,0.9 0.2,1.2 0,1.4 -0.3,2.5 -0.9,3.2 -0.6,0.7 -1.3,1.1 -2,1.1 -0.9,0 -1.7,-0.3 -2.3,-0.8 -0.7,-0.6 -1,-1.5 -1,-2.7 0,-1.7 0.3,-3.9 0.9,-6.5 0.6,-2.6 1.5,-5.9 2.6,-9.8 0.6,-1.8 1.1,-3.6 1.7,-5.4 0.6,-1.8 1.1,-3.5 1.6,-5 0.5,-1.5 0.9,-2.9 1.3,-4.1 0.4,-1.2 0.6,-2.1 0.7,-2.8 0.1,-0.3 0.2,-1 0.3,-2 0.1,-1 0.2,-2.1 0.4,-3.4 0.2,-1.3 0.3,-2.7 0.5,-4.1 0.2,-1.5 0.4,-2.8 0.5,-4 0.2,-0.9 0.3,-1.9 0.5,-3 0.2,-1.1 0.5,-2.2 0.9,-3.1 0.4,-1 1,-1.8 1.7,-2.5 0.7,-0.7 1.6,-1 2.7,-1 1.2,0 2,0.4 2.4,1.1 0.4,0.7 0.6,1.6 0.5,2.6 -0.1,1 -0.2,2.1 -0.5,3.2 -0.3,1.1 -0.6,2.1 -0.9,2.9 -0.8,2.5 -1.6,4.8 -2.5,6.7 -0.9,1.9 -1.7,4 -2.4,6.2 -0.6,1.5 -0.8,2.9 -0.8,4.1 0,2.2 0.7,3.8 2,5 1.4,1.2 3,1.7 4.9,1.7 1.5,0 3,-0.5 4.4,-1.6 1.4,-1.1 2.7,-2.4 3.9,-3.9 1.2,-1.5 2.2,-3.1 3,-4.9 0.8,-1.7 1.4,-3.3 1.8,-4.6 0.1,-0.2 0.2,-0.6 0.3,-1.4 0.2,-0.8 0.3,-1.7 0.5,-2.7 0.2,-1 0.4,-2 0.6,-3.1 0.2,-1.1 0.4,-2 0.5,-2.7 0.2,-0.8 0.3,-1.6 0.5,-2.6 0.2,-1 0.5,-1.9 0.9,-2.8 0.4,-0.9 1,-1.6 1.6,-2.2 0.7,-0.6 1.5,-0.9 2.6,-0.9 1.3,0 2.1,0.4 2.6,1.1 0.4,0.7 0.6,1.6 0.6,2.6 -0.1,1 -0.2,2 -0.5,3 -0.3,1 -0.5,1.8 -0.7,2.4 -0.8,2.5 -1.6,4.7 -2.4,6.7 -0.8,2 -1.5,3.8 -2.2,5.2 -0.6,1.5 -1.1,2.6 -1.5,3.5 -0.4,0.9 -0.6,1.5 -0.6,1.8 0,2.6 0.6,4.5 1.7,5.6 1.1,1.1 2.3,1.7 3.6,1.7 2.2,0 3.9,-0.7 5.2,-2 1.3,-1.4 2.3,-3.9 2.9,-6.9 l 0.8,0 c 0.2,2.9 -0.1,5.3 -0.6,7.3 z"
-     id="path3"
-     inkscape:connector-curvature="0"
-     style="fill:#2e3192" /><path
-     style="fill:#ffffff;stroke-width:0.185002"
-     d="m 29.320064,86.164872 c -1.277771,-0.647664 -1.573829,-1.327981 -1.549788,-3.561297 0.04016,-3.730697 1.622887,-10.030031 5.903272,-23.495306 2.770635,-8.715885 2.799071,-8.822813 3.148729,-11.840154 0.585284,-5.050637 1.565844,-12.45598 1.8369,-13.872547 0.43516,-2.274196 0.976755,-3.690519 1.880879,-4.918684 0.974445,-1.323691 1.896478,-1.826405 3.360953,-1.832474 3.009215,-0.01247 3.55713,2.574946 1.786201,8.434969 -0.742771,2.45784 -2.2493,6.487571 -3.407575,9.114735 -0.420971,0.954834 -1.151241,2.827983 -1.622823,4.162554 -0.839682,2.376289 -0.857669,2.47434 -0.869358,4.739023 -0.01095,2.122185 0.02796,2.3976 0.472736,3.346042 0.91751,1.956495 2.602228,3.131322 5.078862,3.541714 2.587757,0.428804 4.551892,-0.347899 7.187533,-2.842264 2.232774,-2.113092 3.746907,-4.117682 4.998184,-6.617188 1.816108,-3.627792 2.213624,-4.978174 3.527565,-11.983266 0.66466,-3.543546 1.376157,-6.951356 1.581104,-7.57291 0.970636,-2.943689 2.922262,-4.567831 5.096985,-4.241711 1.740397,0.260989 2.500104,1.361773 2.494406,3.614287 -0.0068,2.696563 -2.48184,9.966491 -6.424307,18.870246 l -1.269708,2.867537 0.02005,1.757523 c 0.01504,1.318294 0.119434,2.015481 0.417735,2.789716 1.028756,2.67011 3.517063,4.054736 6.342356,3.529224 3.19144,-0.593617 4.98902,-2.612828 6.217715,-6.984325 0.403553,-1.435775 0.552101,-1.739647 0.850428,-1.739647 0.34646,0 0.356492,0.101757 0.241656,2.451282 -0.238951,4.888854 -1.330826,7.853563 -3.80789,10.339358 -1.255532,1.259957 -1.547319,1.456015 -2.694109,1.81022 -1.395674,0.431082 -3.784736,0.537505 -4.865716,0.216749 -1.759682,-0.522141 -3.031085,-2.027386 -3.686869,-4.364972 -0.336042,-1.197843 -0.516218,-5.455318 -0.283812,-6.706338 0.266094,-1.432359 -0.105859,-1.235144 -0.879069,0.466093 -1.724383,3.794037 -4.750586,7.236231 -8.063683,9.172148 -2.368072,1.383716 -5.903865,2.143782 -8.230062,1.769159 -2.672688,-0.430424 -4.588062,-2.213422 -5.66376,-5.272324 -0.491128,-1.396592 -0.514658,-1.618704 -0.512739,-4.840059 0.0018,-3.093063 -0.02515,-3.376294 -0.321772,-3.376294 -0.414677,0 -0.706335,0.582138 -1.434591,2.863386 -1.443227,4.52088 -2.73082,10.895957 -3.516703,17.411762 l -0.381426,3.162426 0.469219,1.740138 c 0.927877,3.441104 1.066474,4.326417 0.841521,5.375336 -0.537458,2.506081 -2.272098,3.528416 -4.269226,2.516133 z"
-     id="path210" /></svg>
--- a/assets/micro-logo.svg
+++ b/assets/micro-logo.svg
@@ -2,6 +2,13 @@
 <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
@@ -9,20 +16,13 @@
   viewBox="0 0 299.89999 103.2"
   enable-background="new 0 0 960 560"
   xml:space="preserve"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:version="0.91 r13725"
   sodipodi:docname="micro-logo.svg"
   width="299.89999"
-   height="103.2"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+   height="103.2"><metadata
     id="metadata21"><rdf:RDF><cc:Work
         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
     id="defs19" /><sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
@@ -32,24 +32,21 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1080"
+     inkscape:window-width="1237"
+     inkscape:window-height="867"
     id="namedview17"
     showgrid="false"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
-     inkscape:zoom="16.645603"
-     inkscape:cx="65.092264"
-     inkscape:cy="49.051992"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:zoom="1.1416667"
+     inkscape:cx="75.655934"
+     inkscape:cy="-4"
+     inkscape:window-x="1097"
+     inkscape:window-y="185"
     inkscape:window-maximized="0"
-     inkscape:current-layer="Layer_1"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1" /><g
+     inkscape:current-layer="Layer_1" /><g
     id="g3"
     transform="translate(-178,-172.8)"><path
       d="m 306.8,213.8 0,-2.6 c 1.6,-0.1 2.9,-0.4 4.1,-0.8 1.2,-0.4 2.5,-1 4,-1.8 l 2.3,0 0,5.2 c 2.4,-1.9 4.2,-3.1 5.5,-3.8 2,-1 4,-1.5 5.8,-1.5 1.3,0 2.5,0.2 3.7,0.7 1.2,0.5 2.2,1 2.9,1.7 0.7,0.7 1.4,1.6 1.9,2.8 2.2,-1.9 4.2,-3.3 6,-4 1.9,-0.8 3.7,-1.2 5.6,-1.2 1.8,0 3.4,0.4 4.8,1.1 1.4,0.8 2.4,1.7 3,2.8 0.6,1.1 0.9,2.8 0.9,5 l 0,14.4 c 0,1.5 0,2.4 0.1,2.6 0.1,0.4 0.3,0.8 0.7,1.1 0.3,0.4 0.7,0.6 1.2,0.7 0.4,0.1 1.2,0.2 2.4,0.2 l 1,0 0,2.6 -15.5,0 0,-2.6 c 1.8,0 2.9,-0.1 3.5,-0.4 0.5,-0.2 0.9,-0.6 1.2,-1.2 0.3,-0.6 0.4,-1.6 0.4,-3.2 l 0,-13.7 c 0,-1.7 -0.2,-2.9 -0.5,-3.6 -0.3,-0.7 -0.9,-1.2 -1.7,-1.7 -0.8,-0.4 -1.8,-0.7 -3,-0.7 -1.5,0 -3,0.4 -4.6,1.2 -2.2,1.1 -3.9,2.3 -5.1,3.6 l 0,14.8 c 0,1.4 0.1,2.4 0.2,2.8 0.1,0.4 0.4,0.8 0.7,1.1 0.3,0.3 0.7,0.5 1.1,0.6 0.4,0.1 1.5,0.2 3.1,0.2 l 0,2.6 -15.3,0 0,-2.6 0.9,0 c 1.2,0 2.1,-0.1 2.6,-0.4 0.5,-0.3 0.9,-0.7 1.2,-1.3 0.2,-0.5 0.3,-1.5 0.3,-2.9 l 0,-13.2 c 0,-1.9 -0.2,-3.3 -0.5,-3.9 -0.3,-0.7 -0.9,-1.3 -1.7,-1.7 -0.8,-0.5 -1.8,-0.7 -3,-0.7 -1.3,0 -2.7,0.3 -4.1,1 -2,1 -3.9,2.2 -5.6,3.8 l 0,15.9 c 0,1 0.1,1.6 0.4,2.1 0.3,0.4 0.7,0.8 1.2,1.1 0.6,0.3 1.3,0.4 2.3,0.4 l 1.1,0 0,2.6 -15.6,0 0,-2.6 0.8,0 c 1.4,0 2.4,-0.1 2.8,-0.3 0.7,-0.3 1.1,-0.8 1.4,-1.5 0.2,-0.4 0.2,-1.3 0.2,-2.9 l 0,-18.1 -5.1,0 z"
@@ -70,7 +67,4 @@
     d="M 51.6,0 C 23.1,0 0,23.1 0,51.6 c 0,28.5 23.1,51.6 51.6,51.6 28.5,0 51.6,-23.1 51.6,-51.6 C 103.2,23.1 80.1,0 51.6,0 Z m 24.5,58.6 c -0.5,2 -1.3,3.6 -2.4,4.9 -1,1.3 -2,2.1 -3.1,2.5 -1.1,0.4 -2.2,0.6 -3.4,0.6 -1.2,0 -2.2,-0.2 -3,-0.7 C 63.4,65.5 62.8,64.8 62.3,64 61.8,63.2 61.5,62.2 61.3,61.1 61.1,60 61,58.8 61,57.5 c 0,-0.5 0,-1 0.1,-1.7 0.1,-0.7 0.2,-1.6 0.3,-1.6 l -0.2,0 c -1.6,4 -3.8,6.9 -6.6,9.2 -2.8,2.3 -5.9,3.4 -9.3,3.4 -2.3,0 -4.2,-0.9 -5.5,-2.6 -1.4,-1.7 -2.1,-4.3 -2.1,-7.7 0,-0.5 0,-1 0.1,-1.6 0.1,-0.5 0.1,-0.7 0.2,-1.7 l -0.7,0 c -0.9,2 -1.7,4.8 -2.3,7.3 -0.6,2.5 -1.1,4.8 -1.4,6.9 -0.4,2.1 -0.6,4 -0.8,5.6 -0.2,1.6 -0.3,2.7 -0.4,3.3 0.1,0.5 0.2,1 0.3,1.6 0.2,0.6 0.3,1.2 0.5,1.7 0.2,0.5 0.3,1.1 0.4,1.6 0.1,0.5 0.2,0.9 0.2,1.2 0,1.4 -0.3,2.5 -0.9,3.2 -0.6,0.7 -1.3,1.1 -2,1.1 -0.9,0 -1.7,-0.3 -2.3,-0.8 -0.7,-0.6 -1,-1.5 -1,-2.7 0,-1.7 0.3,-3.9 0.9,-6.5 0.6,-2.6 1.5,-5.9 2.6,-9.8 0.6,-1.8 1.1,-3.6 1.7,-5.4 0.6,-1.8 1.1,-3.5 1.6,-5 0.5,-1.5 0.9,-2.9 1.3,-4.1 0.4,-1.2 0.6,-2.1 0.7,-2.8 0.1,-0.3 0.2,-1 0.3,-2 0.1,-1 0.2,-2.1 0.4,-3.4 0.2,-1.3 0.3,-2.7 0.5,-4.1 0.2,-1.5 0.4,-2.8 0.5,-4 0.2,-0.9 0.3,-1.9 0.5,-3 0.2,-1.1 0.5,-2.2 0.9,-3.1 0.4,-1 1,-1.8 1.7,-2.5 0.7,-0.7 1.6,-1 2.7,-1 1.2,0 2,0.4 2.4,1.1 0.4,0.7 0.6,1.6 0.5,2.6 -0.1,1 -0.2,2.1 -0.5,3.2 -0.3,1.1 -0.6,2.1 -0.9,2.9 -0.8,2.5 -1.6,4.8 -2.5,6.7 -0.9,1.9 -1.7,4 -2.4,6.2 -0.6,1.5 -0.8,2.9 -0.8,4.1 0,2.2 0.7,3.8 2,5 1.4,1.2 3,1.7 4.9,1.7 1.5,0 3,-0.5 4.4,-1.6 1.4,-1.1 2.7,-2.4 3.9,-3.9 1.2,-1.5 2.2,-3.1 3,-4.9 0.8,-1.7 1.4,-3.3 1.8,-4.6 0.1,-0.2 0.2,-0.6 0.3,-1.4 0.2,-0.8 0.3,-1.7 0.5,-2.7 0.2,-1 0.4,-2 0.6,-3.1 0.2,-1.1 0.4,-2 0.5,-2.7 0.2,-0.8 0.3,-1.6 0.5,-2.6 0.2,-1 0.5,-1.9 0.9,-2.8 0.4,-0.9 1,-1.6 1.6,-2.2 0.7,-0.6 1.5,-0.9 2.6,-0.9 1.3,0 2.1,0.4 2.6,1.1 0.4,0.7 0.6,1.6 0.6,2.6 -0.1,1 -0.2,2 -0.5,3 -0.3,1 -0.5,1.8 -0.7,2.4 -0.8,2.5 -1.6,4.7 -2.4,6.7 -0.8,2 -1.5,3.8 -2.2,5.2 -0.6,1.5 -1.1,2.6 -1.5,3.5 -0.4,0.9 -0.6,1.5 -0.6,1.8 0,2.6 0.6,4.5 1.7,5.6 1.1,1.1 2.3,1.7 3.6,1.7 2.2,0 3.9,-0.7 5.2,-2 1.3,-1.4 2.3,-3.9 2.9,-6.9 l 0.8,0 c 0.2,2.9 -0.1,5.3 -0.6,7.3 z"
     id="path15"
     inkscape:connector-curvature="0"
-     style="fill:#2e3192" /><path
-     style="fill:#ffffff;stroke-width:0.0600759"
-     d="m 30.192709,86.597991 c -0.530828,-0.09608 -1.19875,-0.411872 -1.578921,-0.746511 -0.792953,-0.697985 -1.054327,-1.680313 -0.947823,-3.562219 0.16271,-2.875042 0.852662,-6.034057 2.963728,-13.569713 0.66017,-2.356543 0.955814,-3.307037 3.762987,-12.097989 1.219825,-3.820007 1.435496,-4.505244 1.616654,-5.136492 0.306236,-1.067081 0.590331,-2.663175 0.753866,-4.235353 0.08592,-0.826044 0.236455,-2.096649 0.334514,-2.823568 0.09806,-0.726919 0.246246,-1.916422 0.329306,-2.643341 0.08306,-0.726918 0.231698,-1.902905 0.330307,-2.613302 0.09861,-0.710398 0.231242,-1.724179 0.294741,-2.252848 0.19473,-1.621264 0.604712,-4.037809 0.845956,-4.986301 0.495326,-1.947452 1.158621,-3.216325 2.26111,-4.325467 0.731983,-0.736399 1.547763,-1.051329 2.723316,-1.051329 1.344787,0 2.103359,0.409522 2.539237,1.370828 0.373167,0.823003 0.432731,1.702332 0.227502,3.358553 -0.206897,1.669687 -0.429401,2.498899 -1.62432,6.053417 -0.891865,2.653022 -1.418886,4.025585 -2.237847,5.828196 -0.890733,1.960586 -1.401439,3.281416 -2.291175,5.925621 -0.696894,2.071095 -0.858755,3.003396 -0.79649,4.587665 0.05016,1.276299 0.270881,2.168068 0.761945,3.078469 1.114561,2.066325 3.341124,3.259541 6.082361,3.259541 0.831865,0 1.52957,-0.113832 2.245267,-0.366322 1.037155,-0.365895 1.69838,-0.767468 2.829986,-1.718697 2.058613,-1.730473 4.031033,-4.098263 5.356083,-6.429706 1.132231,-1.992175 2.742129,-5.986041 2.978686,-7.389579 0.126006,-0.747618 0.37151,-2.073261 0.753923,-4.070941 0.459374,-2.399719 0.965049,-5.073707 1.26106,-6.668427 0.439666,-2.368642 0.948255,-3.731056 1.831386,-4.905927 1.000947,-1.33161 1.919678,-1.818989 3.424905,-1.816884 1.371199,0.0019 2.259901,0.453797 2.692584,1.369104 0.199937,0.42295 0.37898,1.160518 0.431897,1.779189 0.0423,0.494585 -0.08313,1.707742 -0.270194,2.613303 -0.520247,2.51845 -2.995194,9.527499 -4.836622,13.697311 -0.189691,0.429543 -0.709117,1.619046 -1.154281,2.64334 -0.445164,1.024295 -0.903857,2.078627 -1.019317,2.342962 -0.593057,1.357747 -0.644155,1.607255 -0.563046,2.7493 0.142046,2.000035 0.604952,3.420811 1.436759,4.409774 0.719848,0.85585 1.902762,1.62255 2.859809,1.853569 0.533147,0.128695 1.669602,0.128252 2.472607,-9.67e-4 1.437635,-0.231339 2.769133,-0.900566 3.72751,-1.873493 1.098243,-1.114915 2.227996,-3.662559 2.785802,-6.282105 l 0.13752,-0.645816 h 0.37414 0.37414 l 0.04419,0.94284 c 0.124949,2.666054 -0.382363,6.016009 -1.237138,8.16926 -0.848692,2.137927 -2.617365,4.354096 -4.156972,5.208738 -1.58257,0.878493 -4.420415,1.19721 -6.111929,0.68643 -0.649563,-0.196146 -1.47209,-0.685817 -1.961392,-1.167665 -1.354216,-1.333585 -1.999054,-3.254244 -2.18916,-6.52045 -0.03525,-0.60571 -0.04689,-1.38515 -0.02584,-1.732089 0.04435,-0.731258 0.257009,-2.357205 0.335205,-2.562875 0.04613,-0.121335 0.03516,-0.140427 -0.08025,-0.139702 -0.11259,7.09e-4 -0.171074,0.09313 -0.370649,0.58574 -0.571777,1.411317 -1.625409,3.288777 -2.58713,4.609988 -2.555402,3.510606 -5.935984,6.014779 -9.311242,6.897323 -1.386313,0.362485 -1.927076,0.42829 -3.514441,0.427668 -1.398071,-5.41e-4 -1.500695,-0.0084 -2.047014,-0.157216 -1.248806,-0.340101 -2.244463,-0.904197 -3.05944,-1.733346 -1.343156,-1.366511 -2.129105,-3.116872 -2.494126,-5.554581 -0.150028,-1.001927 -0.191427,-3.616227 -0.06949,-4.388291 0.05195,-0.328906 0.113311,-0.84947 0.136367,-1.156809 l 0.04192,-0.558799 -0.380315,0.01812 -0.380315,0.01812 -0.231805,0.570721 c -1.478913,3.641182 -3.072314,10.383891 -3.918324,16.580955 -0.190557,1.395837 -0.701916,5.676121 -0.706953,5.917479 -0.0093,0.446744 0.454257,2.427922 0.818884,3.499628 0.121802,0.358001 0.382754,1.549663 0.538684,2.459961 0.04595,0.268246 -0.06655,1.468043 -0.178759,1.906478 -0.165253,0.645686 -0.477741,1.20884 -0.915337,1.649588 -0.463951,0.467293 -0.819805,0.689321 -1.309045,0.816755 -0.410787,0.106995 -0.564727,0.106887 -1.159735,-7.81e-4 z"
-     id="path240" /></svg>
+     style="fill:#2e3192" /></svg>
--- a/assets/packaging/deb/micro.postinst
+++ b/assets/packaging/deb/micro.postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
-    update-alternatives --install /usr/bin/editor editor /usr/bin/micro 40 \
-      --slave /usr/share/man/man1/editor.1 editor.1 \
-      /usr/share/man/man1/micro.1
-fi
--- a/assets/packaging/deb/micro.prerm
+++ b/assets/packaging/deb/micro.prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]; then
-    update-alternatives --remove editor /usr/bin/micro
-fi
--- a/assets/packaging/micro.1
+++ b/assets/packaging/micro.1
@@ -1,104 +1,85 @@
-.TH micro 1 "2025-09-03"
+.TH micro 1 "2020-02-10"
 .SH NAME
 micro \- A modern and intuitive terminal-based text editor
 .SH SYNOPSIS
 .B micro
-.RI [ OPTION ]...\&
-.RI [ FILE ]...\&
-.RI [+ LINE [: COL ]]\&
-.RI [+/ REGEX ]
-.br
-.B micro
-.RI [ OPTION ]...\&
-.RI [ FILE [: LINE [: COL ]]]...\&
-\& (only if the `parsecursor` option is enabled)
+.RB [OPTIONS]
+[FILE]\&...
+
 .SH DESCRIPTION
+
 Micro is a terminal-based text editor that aims to be easy to use and intuitive, while also taking advantage of the full capabilities
 of modern terminals. It comes as one single, batteries-included, static binary with no dependencies.

 As the name indicates, micro aims to be somewhat of a successor to the nano editor by being easy to install and use in a pinch, but micro also aims to be
 enjoyable to use full time, whether you work in the terminal because you prefer it (like me), or because you need to (over ssh).

-Use Ctrl-q to quit, Ctrl-s to save, and Ctrl-g to open the in-editor help menu.
 .SH OPTIONS
 .PP
-.B \-clean
+\-clean
 .RS 4
-Clean the configuration directory and exit
+Cleans the configuration directory
 .RE
+
 .PP
-.B \-config-dir
-.I dir
+\-config-dir dir
 .RS 4
 Specify a custom location for the configuration directory
 .RE
+
 .PP
-.IR FILE : LINE [: COL ]
-(only if the `parsecursor` option is enabled)
-.br
-.IR FILE \ + LINE [: COL ]
+[FILE]:LINE:COL
 .RS 4
 Specify a line and column to start the cursor at when opening a buffer
 .RE
+
 .PP
-.RI +/ REGEX
+\-options
 .RS 4
-Specify a regex to search for when opening a buffer
+Show all option help
 .RE
+
 .PP
-.B \-options
-.RS 4
-Show all options help and exit
-.RE
-.PP
-.B \-debug
+\-debug
 .RS 4
 Enable debug mode (enables logging to ./log.txt)
 .RE
+
 .PP
-.B \-profile
+\-version
 .RS 4
-Enable CPU profiling (writes profile info to ./micro.prof so it can be analyzed later with "go tool pprof micro.prof")
-.RE
-.PP
-.B \-version
-.RS 4
-Show the version number and information and exit
+Show the version number and information
 .RE

-Micro's plugins can be managed at the command line with the following commands.
+Micro's plugin's can be managed at the command line with the following commands.
 .RS 4
+
 .PP
-.B \-plugin install
-.RI [ PLUGIN ]...
-.RS 4
-Install plugin(s)
-.RE
-.PP
-.B \-plugin remove
-.RI [ PLUGIN ]...
+\-plugin remove [PLUGIN]...
 .RS 4
 Remove plugin(s)
 .RE
+
 .PP
-.B \-plugin update
-.RI [ PLUGIN ]...
+\-plugin update [PLUGIN]...
 .RS 4
 Update plugin(s) (if no argument is given, updates all plugins)
 .RE
+
 .PP
-.B \-plugin search
-.RI [ PLUGIN ]...
+\-plugin search [PLUGIN]...
 .RS 4
 Search for a plugin
 .RE
+
 .PP
-.B \-plugin list
+\-plugin list
 .RS 4
 List installed plugins
 .RE
+
 .PP
-.B \-plugin available
+\-plugin available
 .RS 4
 List available plugins
 .RE
@@ -108,33 +89,35 @@ Micro's options can also be set via command line arguments for quick
 adjustments. For real configuration, please use the settings.json
 file (see 'help options').
 .RS 4
+
 .PP
-.BI \-< option >
-.I value
+\-option value
 .RS 4
-Set `option` to `value` for this session.
-.br
+Set `option` to `value` for this session
 For example: `micro -syntax off file.c`
 .RE
-.RE
-.PP
-Use `micro -options` to see the full list of configuration options.
+
+
 .SH CONFIGURATION
+
 Micro uses $MICRO_CONFIG_HOME as the configuration directory.
 If this environment variable is not set, it uses $XDG_CONFIG_HOME/micro instead.
 If that environment variable is not set, it uses ~/.config/micro as the configuration directory.
 In the documentation, we use ~/.config/micro to refer to the configuration directory
 (even if it may in fact be somewhere else if you have set either of the above environment variables).
+
 .SH NOTICE
 This manpage is intended only to serve as a quick guide to the invocation of 
 micro and is not intended to replace the full documentation included with micro
 which can be accessed from within micro. Micro tells you what key combination to
 press to get help in the lower right.
+
 .SH BUGS
 A comprehensive list of bugs will not be listed in this manpage. See the Github
-page at \fBhttps://github.com/micro-editor/micro/issues\fP for a list of known bugs
+page at \fBhttps://github.com/zyedidia/micro/issues\fP for a list of known bugs
 and to report any newly encountered bugs you may find. We strive to correct
 bugs as swiftly as possible.
+
 .SH COPYRIGHT
-Copyright \(co 2020 Zachary Yedidia, et al. MIT license.
-See \fBhttps://github.com/micro-editor/micro\fP for details.
+Copyright \(co 2020 Zachary Yedidia, et al.
+See /usr/share/doc/micro/LICENSE and /usr/share/doc/micro/AUTHORS for more information.
--- a/assets/packaging/micro.desktop
+++ b/assets/packaging/micro.desktop
@@ -6,10 +6,10 @@ Comment=Edit text files in a terminal

 Icon=micro
 Type=Application
-Categories=Utility;TextEditor;Development;
+Categories=terminal;TextEditor;
 Keywords=text;editor;syntax;terminal;

-Exec=micro %F
+Exec=micro %U
 StartupNotify=false
 Terminal=true
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php3;application/x-httpd-php4;application/x-httpd-php5;application/xml;text/html;text/css;text/x-sql;text/x-diff;
--- a/cmd/micro/clean.go
+++ b/cmd/micro/clean.go
@@ -3,16 +3,15 @@ package main
 import (
 	"bufio"
 	"encoding/gob"
-	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"

-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
 )

 func shouldContinue() bool {
@@ -24,9 +23,12 @@ func shouldContinue() bool {
 		return false
 	}

-	text = strings.TrimRight(text, "\r\n")
+	if len(text) <= 1 {
+		// default continue
+		return true
+	}

-	return len(text) == 0 || strings.ToLower(text)[0] == 'y'
+	return strings.ToLower(text)[0] == 'y'
 }

 // CleanConfig performs cleanup in the user's configuration directory
@@ -39,18 +41,6 @@ func CleanConfig() {
 		return
 	}

-	fmt.Println("Cleaning default settings")
-
-	settingsFile := filepath.Join(config.ConfigDir, "settings.json")
-	err := config.WriteSettings(settingsFile)
-	if err != nil {
-		if errors.Is(err, util.ErrOverwrite) {
-			fmt.Println(err.Error())
-		} else {
-			fmt.Println("Error writing settings.json file: " + err.Error())
-		}
-	}
-
 	// detect unused options
 	var unusedOptions []string
 	defaultSettings := config.DefaultAllSettings()
@@ -77,20 +67,16 @@ func CleanConfig() {
 			fmt.Printf("%s (value: %v)\n", s, config.GlobalSettings[s])
 		}

-		fmt.Printf("These options will be removed from %s\n", settingsFile)
+		fmt.Printf("These options will be removed from %s\n", filepath.Join(config.ConfigDir, "settings.json"))

 		if shouldContinue() {
 			for _, s := range unusedOptions {
 				delete(config.GlobalSettings, s)
 			}

-			err := config.OverwriteSettings(settingsFile)
+			err := config.OverwriteSettings(filepath.Join(config.ConfigDir, "settings.json"))
 			if err != nil {
-				if errors.Is(err, util.ErrOverwrite) {
-					fmt.Println(err.Error())
-				} else {
-					fmt.Println("Error overwriting settings.json file: " + err.Error())
-				}
+				fmt.Println("Error writing settings.json file: " + err.Error())
 			}

 			fmt.Println("Removed unused options")
@@ -99,47 +85,41 @@ func CleanConfig() {
 	}

 	// detect incorrectly formatted buffer/ files
-	buffersPath := filepath.Join(config.ConfigDir, "buffers")
-	files, err := os.ReadDir(buffersPath)
+	files, err := ioutil.ReadDir(filepath.Join(config.ConfigDir, "buffers"))
 	if err == nil {
 		var badFiles []string
 		var buffer buffer.SerializedBuffer
 		for _, f := range files {
-			fname := filepath.Join(buffersPath, f.Name())
+			fname := filepath.Join(config.ConfigDir, "buffers", f.Name())
 			file, e := os.Open(fname)

 			if e == nil {
+				defer file.Close()
+
 				decoder := gob.NewDecoder(file)
 				err = decoder.Decode(&buffer)

 				if err != nil && f.Name() != "history" {
 					badFiles = append(badFiles, fname)
 				}
-				file.Close()
 			}
 		}

 		if len(badFiles) > 0 {
-			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), buffersPath)
+			fmt.Printf("Detected %d files with an invalid format in %s\n", len(badFiles), filepath.Join(config.ConfigDir, "buffers"))
 			fmt.Println("These files store cursor and undo history.")
-			fmt.Printf("Removing badly formatted files in %s\n", buffersPath)
+			fmt.Printf("Removing badly formatted files in %s\n", filepath.Join(config.ConfigDir, "buffers"))

 			if shouldContinue() {
-				removed := 0
 				for _, f := range badFiles {
 					err := os.Remove(f)
 					if err != nil {
 						fmt.Println(err)
 						continue
 					}
-					removed++
 				}

-				if removed == 0 {
-					fmt.Println("Failed to remove files")
-				} else {
-					fmt.Printf("Removed %d badly formatted files\n", removed)
-				}
+				fmt.Println("Removed badly formatted files")
 				fmt.Print("\n\n")
 			}
 		}
--- a/cmd/micro/debug.go
+++ b/cmd/micro/debug.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"

-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 )

 // NullWriter simply sends writes into the void
@@ -18,7 +18,7 @@ func (NullWriter) Write(data []byte) (n int, err error) {
 // InitLog sets up the debug log system for micro if it has been enabled by compile-time variables
 func InitLog() {
 	if util.Debug == "ON" {
-		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, util.FileMode)
+		f, err := os.OpenFile("log.txt", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
 		if err != nil {
 			log.Fatalf("error opening file: %v", err)
 		}
--- a/cmd/micro/initlua.go
+++ b/cmd/micro/initlua.go
@@ -2,19 +2,18 @@ package main

 import (
 	"log"
-	"time"

 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"

-	"github.com/micro-editor/micro/v2/internal/action"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/display"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/shell"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/action"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/display"
+	ulua "github.com/zyedidia/micro/internal/lua"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/micro/internal/util"
 )

 func init() {
@@ -48,17 +47,11 @@ func luaImportMicro() *lua.LTable {
 	ulua.L.SetField(pkg, "InfoBar", luar.New(ulua.L, action.GetInfoBar))
 	ulua.L.SetField(pkg, "Log", luar.New(ulua.L, log.Println))
 	ulua.L.SetField(pkg, "SetStatusInfoFn", luar.New(ulua.L, display.SetStatusInfoFnLua))
-	ulua.L.SetField(pkg, "CurPane", luar.New(ulua.L, func() *action.BufPane {
+	ulua.L.SetField(pkg, "CurPane", luar.New(ulua.L, func() action.Pane {
 		return action.MainTab().CurPane()
 	}))
-	ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, action.MainTab))
-	ulua.L.SetField(pkg, "Tabs", luar.New(ulua.L, func() *action.TabList {
-		return action.Tabs
-	}))
-	ulua.L.SetField(pkg, "After", luar.New(ulua.L, func(t time.Duration, f func()) {
-		time.AfterFunc(t, func() {
-			timerChan <- f
-		})
+	ulua.L.SetField(pkg, "CurTab", luar.New(ulua.L, func() *action.Tab {
+		return action.MainTab()
 	}))

 	return pkg
@@ -73,7 +66,7 @@ func luaImportMicroConfig() *lua.LTable {
 	ulua.L.SetField(pkg, "OptionComplete", luar.New(ulua.L, action.OptionComplete))
 	ulua.L.SetField(pkg, "OptionValueComplete", luar.New(ulua.L, action.OptionValueComplete))
 	ulua.L.SetField(pkg, "NoComplete", luar.New(ulua.L, nil))
-	ulua.L.SetField(pkg, "TryBindKey", luar.New(ulua.L, action.TryBindKeyPlug))
+	ulua.L.SetField(pkg, "TryBindKey", luar.New(ulua.L, action.TryBindKey))
 	ulua.L.SetField(pkg, "Reload", luar.New(ulua.L, action.ReloadConfig))
 	ulua.L.SetField(pkg, "AddRuntimeFileFromMemory", luar.New(ulua.L, config.PluginAddRuntimeFileFromMemory))
 	ulua.L.SetField(pkg, "AddRuntimeFilesFromDirectory", luar.New(ulua.L, config.PluginAddRuntimeFilesFromDirectory))
@@ -88,9 +81,8 @@ func luaImportMicroConfig() *lua.LTable {
 	ulua.L.SetField(pkg, "RegisterCommonOption", luar.New(ulua.L, config.RegisterCommonOptionPlug))
 	ulua.L.SetField(pkg, "RegisterGlobalOption", luar.New(ulua.L, config.RegisterGlobalOptionPlug))
 	ulua.L.SetField(pkg, "GetGlobalOption", luar.New(ulua.L, config.GetGlobalOption))
-	ulua.L.SetField(pkg, "SetGlobalOption", luar.New(ulua.L, action.SetGlobalOptionPlug))
-	ulua.L.SetField(pkg, "SetGlobalOptionNative", luar.New(ulua.L, action.SetGlobalOptionNativePlug))
-	ulua.L.SetField(pkg, "ConfigDir", luar.New(ulua.L, config.ConfigDir))
+	ulua.L.SetField(pkg, "SetGlobalOption", luar.New(ulua.L, action.SetGlobalOption))
+	ulua.L.SetField(pkg, "SetGlobalOptionNative", luar.New(ulua.L, action.SetGlobalOptionNative))

 	return pkg
 }
@@ -123,9 +115,6 @@ func luaImportMicroBuffer() *lua.LTable {
 	ulua.L.SetField(pkg, "Loc", luar.New(ulua.L, func(x, y int) buffer.Loc {
 		return buffer.Loc{x, y}
 	}))
-	ulua.L.SetField(pkg, "SLoc", luar.New(ulua.L, func(line, row int) display.SLoc {
-		return display.SLoc{line, row}
-	}))
 	ulua.L.SetField(pkg, "BTDefault", luar.New(ulua.L, buffer.BTDefault.Kind))
 	ulua.L.SetField(pkg, "BTHelp", luar.New(ulua.L, buffer.BTHelp.Kind))
 	ulua.L.SetField(pkg, "BTLog", luar.New(ulua.L, buffer.BTLog.Kind))
@@ -152,11 +141,6 @@ func luaImportMicroUtil() *lua.LTable {
 	ulua.L.SetField(pkg, "GetLeadingWhitespace", luar.New(ulua.L, util.LuaGetLeadingWhitespace))
 	ulua.L.SetField(pkg, "IsWordChar", luar.New(ulua.L, util.LuaIsWordChar))
 	ulua.L.SetField(pkg, "String", luar.New(ulua.L, util.String))
-	ulua.L.SetField(pkg, "Unzip", luar.New(ulua.L, util.Unzip))
-	ulua.L.SetField(pkg, "Version", luar.New(ulua.L, util.Version))
-	ulua.L.SetField(pkg, "SemVersion", luar.New(ulua.L, util.SemVersion))
-	ulua.L.SetField(pkg, "HttpRequest", luar.New(ulua.L, util.HttpRequest))
-	ulua.L.SetField(pkg, "CharacterCountInString", luar.New(ulua.L, util.CharacterCountInString))
 	ulua.L.SetField(pkg, "RuneStr", luar.New(ulua.L, func(r rune) string {
 		return string(r)
 	}))
--- a/cmd/micro/micro.go
+++ b/cmd/micro/micro.go
@@ -3,73 +3,56 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io"
-	"log"
+	"io/ioutil"
 	"os"
-	"os/signal"
-	"path/filepath"
-	"regexp"
 	"runtime"
-	"runtime/pprof"
 	"sort"
-	"strconv"
-	"syscall"
 	"time"

 	"github.com/go-errors/errors"
 	isatty "github.com/mattn/go-isatty"
-	"github.com/micro-editor/micro/v2/internal/action"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/clipboard"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/shell"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 	lua "github.com/yuin/gopher-lua"
+	"github.com/zyedidia/micro/internal/action"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/tcell"
 )

 var (
+	// Event channel
+	events   chan tcell.Event
+	autosave chan bool
+
 	// Command line flags
 	flagVersion   = flag.Bool("version", false, "Show the version number and information")
 	flagConfigDir = flag.String("config-dir", "", "Specify a custom location for the configuration directory")
 	flagOptions   = flag.Bool("options", false, "Show all option help")
 	flagDebug     = flag.Bool("debug", false, "Enable debug mode (prints debug info to ./log.txt)")
-	flagProfile   = flag.Bool("profile", false, "Enable CPU profiling (writes profile info to ./micro.prof)")
 	flagPlugin    = flag.String("plugin", "", "Plugin command")
 	flagClean     = flag.Bool("clean", false, "Clean configuration directory")
 	optionFlags   map[string]*string
-
-	sighup chan os.Signal
-
-	timerChan chan func()
 )

 func InitFlags() {
-	// Note: keep this in sync with the man page in assets/packaging/micro.1
 	flag.Usage = func() {
-		fmt.Println("Usage: micro [OPTION]... [FILE]... [+LINE[:COL]] [+/REGEX]")
-		fmt.Println("       micro [OPTION]... [FILE[:LINE[:COL]]]...  (only if the `parsecursor` option is enabled)")
+		fmt.Println("Usage: micro [OPTIONS] [FILE]...")
 		fmt.Println("-clean")
-		fmt.Println("    \tClean the configuration directory and exit")
+		fmt.Println("    \tCleans the configuration directory")
 		fmt.Println("-config-dir dir")
 		fmt.Println("    \tSpecify a custom location for the configuration directory")
-		fmt.Println("FILE:LINE[:COL] (only if the `parsecursor` option is enabled)")
-		fmt.Println("FILE +LINE[:COL]")
+		fmt.Println("[FILE]:LINE:COL")
 		fmt.Println("    \tSpecify a line and column to start the cursor at when opening a buffer")
-		fmt.Println("+/REGEX")
-		fmt.Println("    \tSpecify a regex to search for when opening a buffer")
 		fmt.Println("-options")
-		fmt.Println("    \tShow all options help and exit")
+		fmt.Println("    \tShow all option help")
 		fmt.Println("-debug")
 		fmt.Println("    \tEnable debug mode (enables logging to ./log.txt)")
-		fmt.Println("-profile")
-		fmt.Println("    \tEnable CPU profiling (writes profile info to ./micro.prof")
-		fmt.Println("    \tso it can be analyzed later with \"go tool pprof micro.prof\")")
 		fmt.Println("-version")
-		fmt.Println("    \tShow the version number and information and exit")
+		fmt.Println("    \tShow the version number and information")

-		fmt.Print("\nMicro's plugins can be managed at the command line with the following commands.\n")
+		fmt.Print("\nMicro's plugin's can be managed at the command line with the following commands.\n")
 		fmt.Println("-plugin install [PLUGIN]...")
 		fmt.Println("    \tInstall plugin(s)")
 		fmt.Println("-plugin remove [PLUGIN]...")
@@ -84,7 +67,7 @@ func InitFlags() {
 		fmt.Println("    \tList available plugins")

 		fmt.Print("\nMicro's options can also be set via command line arguments for quick\nadjustments. For real configuration, please use the settings.json\nfile (see 'help options').\n\n")
-		fmt.Println("-<option> value")
+		fmt.Println("-option value")
 		fmt.Println("    \tSet `option` to `value` for this session")
 		fmt.Println("    \tFor example: `micro -syntax off file.c`")
 		fmt.Println("\nUse `micro -options` to see the full list of configuration options")
@@ -103,7 +86,7 @@ func InitFlags() {
 		fmt.Println("Version:", util.Version)
 		fmt.Println("Commit hash:", util.CommitHash)
 		fmt.Println("Compiled on", util.CompileDate)
-		exit(0)
+		os.Exit(0)
 	}

 	if *flagOptions {
@@ -119,7 +102,7 @@ func InitFlags() {
 			fmt.Printf("-%s value\n", k)
 			fmt.Printf("    \tDefault value: '%v'\n", v)
 		}
-		exit(0)
+		os.Exit(0)
 	}

 	if util.Debug == "OFF" && *flagDebug {
@@ -140,13 +123,13 @@ func DoPluginFlags() {
 			CleanConfig()
 		}

-		exit(0)
+		os.Exit(0)
 	}
 }

 // LoadInput determines which files should be loaded into buffers
 // based on the input stored in flag.Args()
-func LoadInput(args []string) []*buffer.Buffer {
+func LoadInput() []*buffer.Buffer {
 	// There are a number of ways micro should start given its input

 	// 1. If it is given a files in flag.Args(), it should open those
@@ -158,63 +141,17 @@ func LoadInput(args []string) []*buffer.Buffer {
 	// 3. If there is no input file and the input is a terminal, an empty buffer
 	// should be opened

+	var filename string
+	var input []byte
+	var err error
+	args := flag.Args()
 	buffers := make([]*buffer.Buffer, 0, len(args))

-	files := make([]string, 0, len(args))
-
-	flagStartPos := buffer.Loc{-1, -1}
-	posFlagr := regexp.MustCompile(`^\+(\d+)(?::(\d+))?$`)
-	posIndex := -1
-
-	searchText := ""
-	searchFlagr := regexp.MustCompile(`^\+\/(.+)$`)
-	searchIndex := -1
-
-	for i, a := range args {
-		posMatch := posFlagr.FindStringSubmatch(a)
-		if len(posMatch) == 3 && posMatch[2] != "" {
-			line, err := strconv.Atoi(posMatch[1])
-			if err != nil {
-				screen.TermMessage(err)
-				continue
-			}
-			col, err := strconv.Atoi(posMatch[2])
-			if err != nil {
-				screen.TermMessage(err)
-				continue
-			}
-			flagStartPos = buffer.Loc{col - 1, line - 1}
-			posIndex = i
-		} else if len(posMatch) == 3 && posMatch[2] == "" {
-			line, err := strconv.Atoi(posMatch[1])
-			if err != nil {
-				screen.TermMessage(err)
-				continue
-			}
-			flagStartPos = buffer.Loc{0, line - 1}
-			posIndex = i
-		} else {
-			searchMatch := searchFlagr.FindStringSubmatch(a)
-			if len(searchMatch) == 2 {
-				searchText = searchMatch[1]
-				searchIndex = i
-			} else {
-				files = append(files, a)
-			}
-		}
-	}
-
-	command := buffer.Command{
-		StartCursor:      flagStartPos,
-		SearchRegex:      searchText,
-		SearchAfterStart: searchIndex > posIndex,
-	}
-
-	if len(files) > 0 {
+	if len(args) > 0 {
 		// Option 1
 		// We go through each file and load it
-		for i := 0; i < len(files); i++ {
-			buf, err := buffer.NewBufferFromFileWithCommand(files[i], buffer.BTDefault, command)
+		for i := 0; i < len(args); i++ {
+			buf, err := buffer.NewBufferFromFile(args[i], buffer.BTDefault)
 			if err != nil {
 				screen.TermMessage(err)
 				continue
@@ -222,97 +159,36 @@ func LoadInput(args []string) []*buffer.Buffer {
 			// If the file didn't exist, input will be empty, and we'll open an empty buffer
 			buffers = append(buffers, buf)
 		}
+	} else if !isatty.IsTerminal(os.Stdin.Fd()) {
+		// Option 2
+		// The input is not a terminal, so something is being piped in
+		// and we should read from stdin
+		input, err = ioutil.ReadAll(os.Stdin)
+		if err != nil {
+			screen.TermMessage("Error reading from stdin: ", err)
+			input = []byte{}
+		}
+		buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, buffer.BTDefault))
 	} else {
-		btype := buffer.BTDefault
-		if !isatty.IsTerminal(os.Stdout.Fd()) {
-			btype = buffer.BTStdout
-		}
-
-		if !isatty.IsTerminal(os.Stdin.Fd()) {
-			// Option 2
-			// The input is not a terminal, so something is being piped in
-			// and we should read from stdin
-			input, err := io.ReadAll(os.Stdin)
-			if err != nil {
-				screen.TermMessage("Error reading from stdin: ", err)
-				input = []byte{}
-			}
-			buffers = append(buffers, buffer.NewBufferFromStringWithCommand(string(input), "", btype, command))
-		} else {
-			// Option 3, just open an empty buffer
-			buffers = append(buffers, buffer.NewBufferFromStringWithCommand("", "", btype, command))
-		}
+		// Option 3, just open an empty buffer
+		buffers = append(buffers, buffer.NewBufferFromString(string(input), filename, buffer.BTDefault))
 	}

 	return buffers
 }

-func checkBackup(name string) error {
-	target := filepath.Join(config.ConfigDir, name)
-	backup := target + util.BackupSuffix
-	if info, err := os.Stat(backup); err == nil {
-		input, err := os.ReadFile(backup)
-		if err == nil {
-			t := info.ModTime()
-			msg := fmt.Sprintf(buffer.BackupMsg, target, t.Format("Mon Jan _2 at 15:04, 2006"), backup)
-			choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
-
-			if choice%3 == 0 {
-				// recover
-				err := os.WriteFile(target, input, util.FileMode)
-				if err != nil {
-					return err
-				}
-				return os.Remove(backup)
-			} else if choice%3 == 1 {
-				// delete
-				return os.Remove(backup)
-			} else if choice%3 == 2 {
-				// abort
-				return errors.New("Aborted")
-			}
-		}
-	}
-	return nil
-}
-
-func exit(rc int) {
-	for _, b := range buffer.OpenBuffers {
-		if !b.Modified() {
-			b.Fini()
-		}
-	}
-
-	if screen.Screen != nil {
-		screen.Screen.Fini()
-	}
-
-	os.Exit(rc)
-}
-
 func main() {
-	defer func() {
-		if util.Stdout.Len() > 0 {
-			fmt.Fprint(os.Stdout, util.Stdout.String())
-		}
-		exit(0)
-	}()
+	defer os.Exit(0)
+
+	// runtime.SetCPUProfileRate(400)
+	// f, _ := os.Create("micro.prof")
+	// pprof.StartCPUProfile(f)
+	// defer pprof.StopCPUProfile()

 	var err error

 	InitFlags()

-	if *flagProfile {
-		f, err := os.Create("micro.prof")
-		if err != nil {
-			log.Fatal("error creating CPU profile: ", err)
-		}
-		if err := pprof.StartCPUProfile(f); err != nil {
-			log.Fatal("error starting CPU profile: ", err)
-		}
-		defer pprof.StopCPUProfile()
-	}
-
 	InitLog()

 	err = config.InitConfigDir(*flagConfigDir)
@@ -320,75 +196,40 @@ func main() {
 		screen.TermMessage(err)
 	}

-	config.InitRuntimeFiles(true)
-	config.InitPlugins()
-
-	err = checkBackup("settings.json")
-	if err != nil {
-		screen.TermMessage(err)
-		exit(1)
-	}
-
+	config.InitRuntimeFiles()
 	err = config.ReadSettings()
 	if err != nil {
 		screen.TermMessage(err)
 	}
-	err = config.InitGlobalSettings()
-	if err != nil {
-		screen.TermMessage(err)
-	}
+	config.InitGlobalSettings()

 	// flag options
 	for k, v := range optionFlags {
 		if *v != "" {
-			nativeValue, err := config.GetNativeValue(k, *v)
+			nativeValue, err := config.GetNativeValue(k, config.DefaultAllSettings()[k], *v)
 			if err != nil {
 				screen.TermMessage(err)
 				continue
 			}
-			if err = config.OptionIsValid(k, nativeValue); err != nil {
-				screen.TermMessage(err)
-				continue
-			}
 			config.GlobalSettings[k] = nativeValue
-			config.VolatileSettings[k] = true
 		}
 	}

 	DoPluginFlags()

-	err = screen.Init()
-	if err != nil {
-		fmt.Println(err)
-		fmt.Println("Fatal: Micro could not initialize a Screen.")
-		exit(1)
-	}
-
-	util.Sigterm = make(chan os.Signal, 1)
-	sighup = make(chan os.Signal, 1)
-	signal.Notify(util.Sigterm, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGABRT)
-	signal.Notify(sighup, syscall.SIGHUP)
-
-	m := clipboard.SetMethod(config.GetGlobalOption("clipboard").(string))
-	clipErr := clipboard.Initialize(m)
+	screen.Init()

 	defer func() {
 		if err := recover(); err != nil {
-			if screen.Screen != nil {
-				screen.Screen.Fini()
-			}
-			if e, ok := err.(*lua.ApiError); ok {
-				fmt.Println("Lua API error:", e)
-			} else {
-				fmt.Println("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/micro-editor/micro/issues")
-			}
-			// immediately backup all buffers with unsaved changes
+			screen.Screen.Fini()
+			fmt.Println("Micro encountered an error:", err)
+			// backup all open buffers
 			for _, b := range buffer.OpenBuffers {
-				if b.Modified() {
-					b.Backup()
-				}
+				b.Backup(false)
 			}
-			exit(1)
+			// Print the stack trace too
+			fmt.Print(errors.Wrap(err, 2).ErrorStack())
+			os.Exit(1)
 		}
 	}()

@@ -397,26 +238,15 @@ func main() {
 		screen.TermMessage(err)
 	}

-	err = checkBackup("bindings.json")
-	if err != nil {
-		screen.TermMessage(err)
-		exit(1)
-	}
-
 	action.InitBindings()
 	action.InitCommands()

-	timerChan = make(chan func())
-
-	err = config.RunPluginFn("preinit")
+	err = config.InitColorscheme()
 	if err != nil {
 		screen.TermMessage(err)
 	}

-	action.InitGlobals()
-	buffer.SetMessager(action.InfoBar)
-	args := flag.Args()
-	b := LoadInput(args)
+	b := LoadInput()

 	if len(b) == 0 {
 		// No buffers to open
@@ -425,32 +255,14 @@ func main() {
 	}

 	action.InitTabs(b)
+	action.InitGlobals()

 	err = config.RunPluginFn("init")
 	if err != nil {
 		screen.TermMessage(err)
 	}

-	err = config.RunPluginFn("postinit")
-	if err != nil {
-		screen.TermMessage(err)
-	}
-
-	err = config.InitColorscheme()
-	if err != nil {
-		screen.TermMessage(err)
-	}
-
-	if clipErr != nil {
-		log.Println(clipErr, " or change 'clipboard' option")
-	}
-
-	config.StartAutoSave()
-	if a := config.GetGlobalOption("autosave").(float64); a > 0 {
-		config.SetAutoTime(a)
-	}
-
-	screen.Events = make(chan tcell.Event)
+	events = make(chan tcell.Event)

 	// Here is the event loop which runs in a separate thread
 	go func() {
@@ -459,7 +271,7 @@ func main() {
 			e := screen.Screen.PollEvent()
 			screen.Unlock()
 			if e != nil {
-				screen.Events <- e
+				events <- e
 			}
 		}
 	}()
@@ -472,12 +284,15 @@ func main() {

 	// wait for initial resize event
 	select {
-	case event := <-screen.Events:
+	case event := <-events:
 		action.Tabs.HandleEvent(event)
 	case <-time.After(10 * time.Millisecond):
 		// time out after 10ms
 	}

+	// Since this loop is very slow (waits for user input every time) it's
+	// okay to be inefficient and run it via a function every time
+	// We do this so we can recover from panics without crashing the editor
 	for {
 		DoEvent()
 	}
@@ -487,6 +302,16 @@ func main() {
 func DoEvent() {
 	var event tcell.Event

+	// recover from errors without crashing the editor
+	defer func() {
+		if err := recover(); err != nil {
+			if e, ok := err.(*lua.ApiError); ok {
+				screen.TermMessage("Lua API error:", e)
+			} else {
+				screen.TermMessage("Micro encountered an error:", errors.Wrap(err, 2).ErrorStack(), "\nIf you can reproduce this error, please report it at https://github.com/zyedidia/micro/issues")
+			}
+		}
+	}()
 	// Display everything
 	screen.Screen.Fill(' ', config.DefStyle)
 	screen.Screen.HideCursor()
@@ -505,47 +330,16 @@ func DoEvent() {
 		f.Function(f.Output, f.Args)
 	case <-config.Autosave:
 		for _, b := range buffer.OpenBuffers {
-			b.AutoSave()
+			b.Save()
 		}
 	case <-shell.CloseTerms:
-		action.Tabs.CloseTerms()
-	case event = <-screen.Events:
+	case event = <-events:
 	case <-screen.DrawChan():
-		for len(screen.DrawChan()) > 0 {
-			<-screen.DrawChan()
-		}
-	case f := <-timerChan:
-		f()
-	case <-sighup:
-		exit(0)
-	case <-util.Sigterm:
-		exit(0)
 	}

-	if e, ok := event.(*tcell.EventError); ok {
-		log.Println("tcell event error: ", e.Error())
-
-		if e.Err() == io.EOF {
-			// shutdown due to terminal closing/becoming inaccessible
-			exit(0)
-		}
-		return
-	}
-
-	if event != nil {
-		_, resize := event.(*tcell.EventResize)
-		if resize {
-			action.InfoBar.HandleEvent(event)
-			action.Tabs.HandleEvent(event)
-		} else if action.InfoBar.HasPrompt {
-			action.InfoBar.HandleEvent(event)
-		} else {
-			action.Tabs.HandleEvent(event)
-		}
-	}
-
-	err := config.RunPluginFn("onAnyEvent")
-	if err != nil {
-		screen.TermMessage(err)
+	if action.InfoBar.HasPrompt {
+		action.InfoBar.HandleEvent(event)
+	} else {
+		action.Tabs.HandleEvent(event)
 	}
 }
--- a/cmd/micro/micro_test.go
+++ b/cmd/micro/micro_test.go
@@ -1,338 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"testing"
-
-	"github.com/go-errors/errors"
-	"github.com/micro-editor/micro/v2/internal/action"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/stretchr/testify/assert"
-)
-
-var tempDir string
-var sim tcell.SimulationScreen
-
-func init() {
-	screen.Events = make(chan tcell.Event, 8)
-}
-
-func startup(args []string) (tcell.SimulationScreen, error) {
-	var err error
-
-	tempDir, err = os.MkdirTemp("", "micro_test")
-	if err != nil {
-		return nil, err
-	}
-	err = config.InitConfigDir(tempDir)
-	if err != nil {
-		return nil, err
-	}
-
-	config.InitRuntimeFiles(true)
-	config.InitPlugins()
-
-	err = config.ReadSettings()
-	if err != nil {
-		return nil, err
-	}
-	err = config.InitGlobalSettings()
-	if err != nil {
-		return nil, err
-	}
-
-	s, err := screen.InitSimScreen()
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err := recover(); err != nil {
-			screen.Screen.Fini()
-			fmt.Println("Micro encountered an error:", err)
-			// immediately backup all buffers with unsaved changes
-			for _, b := range buffer.OpenBuffers {
-				if b.Modified() {
-					b.Backup()
-				}
-			}
-			// Print the stack trace too
-			log.Fatalf(errors.Wrap(err, 2).ErrorStack())
-		}
-	}()
-
-	err = config.LoadAllPlugins()
-	if err != nil {
-		screen.TermMessage(err)
-	}
-
-	action.InitBindings()
-	action.InitCommands()
-
-	err = config.InitColorscheme()
-	if err != nil {
-		return nil, err
-	}
-
-	b := LoadInput(args)
-
-	if len(b) == 0 {
-		return nil, errors.New("No buffers opened")
-	}
-
-	action.InitTabs(b)
-	action.InitGlobals()
-
-	err = config.RunPluginFn("init")
-	if err != nil {
-		return nil, err
-	}
-
-	s.InjectResize()
-	handleEvent()
-
-	return s, nil
-}
-
-func cleanup() {
-	os.RemoveAll(tempDir)
-}
-
-func handleEvent() {
-	screen.Lock()
-	e := screen.Screen.PollEvent()
-	screen.Unlock()
-	if e != nil {
-		screen.Events <- e
-	}
-
-	for len(screen.DrawChan()) > 0 || len(screen.Events) > 0 {
-		DoEvent()
-	}
-}
-
-func injectKey(key tcell.Key, r rune, mod tcell.ModMask) {
-	sim.InjectKey(key, r, mod)
-	handleEvent()
-}
-
-func injectMouse(x, y int, buttons tcell.ButtonMask, mod tcell.ModMask) {
-	sim.InjectMouse(x, y, buttons, mod)
-	handleEvent()
-}
-
-func injectString(str string) {
-	// the tcell simulation screen event channel can only handle
-	// 10 events at once, so we need to divide up the key events
-	// into chunks of 10 and handle the 10 events before sending
-	// another chunk of events
-	iters := len(str) / 10
-	extra := len(str) % 10
-
-	for i := 0; i < iters; i++ {
-		s := i * 10
-		e := i*10 + 10
-		sim.InjectKeyBytes([]byte(str[s:e]))
-		for i := 0; i < 10; i++ {
-			handleEvent()
-		}
-	}
-
-	sim.InjectKeyBytes([]byte(str[len(str)-extra:]))
-	for i := 0; i < extra; i++ {
-		handleEvent()
-	}
-}
-
-func openFile(file string) {
-	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
-	injectString(fmt.Sprintf("open %s", file))
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-}
-
-func findBuffer(file string) *buffer.Buffer {
-	var buf *buffer.Buffer
-	for _, b := range buffer.OpenBuffers {
-		if b.Path == file {
-			buf = b
-		}
-	}
-	return buf
-}
-
-func createTestFile(t *testing.T, content string) string {
-	f, err := os.CreateTemp(t.TempDir(), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := f.Close(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	if _, err := f.WriteString(content); err != nil {
-		t.Fatal(err)
-	}
-
-	return f.Name()
-}
-
-func TestMain(m *testing.M) {
-	var err error
-	sim, err = startup([]string{})
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	retval := m.Run()
-	cleanup()
-
-	os.Exit(retval)
-}
-
-func TestSimpleEdit(t *testing.T) {
-	file := createTestFile(t, "base content")
-
-	openFile(file)
-
-	if findBuffer(file) == nil {
-		t.Fatalf("Could not find buffer %s", file)
-	}
-
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-	injectKey(tcell.KeyUp, 0, tcell.ModNone)
-	injectString("first line")
-
-	// test both kinds of backspace
-	for i := 0; i < len("ne"); i++ {
-		injectKey(tcell.KeyBackspace, rune(tcell.KeyBackspace), tcell.ModNone)
-	}
-	for i := 0; i < len(" li"); i++ {
-		injectKey(tcell.KeyBackspace2, rune(tcell.KeyBackspace2), tcell.ModNone)
-	}
-	injectString("foobar")
-
-	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
-
-	data, err := os.ReadFile(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Equal(t, "firstfoobar\nbase content\n", string(data))
-}
-
-func TestMouse(t *testing.T) {
-	file := createTestFile(t, "base content")
-
-	openFile(file)
-
-	if findBuffer(file) == nil {
-		t.Fatalf("Could not find buffer %s", file)
-	}
-
-	// buffer:
-	// base content
-	// the selections need to happen at different locations to avoid a double click
-	injectMouse(3, 0, tcell.Button1, tcell.ModNone)
-	injectKey(tcell.KeyLeft, 0, tcell.ModNone)
-	injectMouse(0, 0, tcell.ButtonNone, tcell.ModNone)
-	injectString("secondline")
-	// buffer:
-	// secondlinebase content
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-	// buffer:
-	// secondline
-	// base content
-	injectMouse(2, 0, tcell.Button1, tcell.ModNone)
-	injectMouse(0, 0, tcell.ButtonNone, tcell.ModNone)
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-	// buffer:
-	//
-	// secondline
-	// base content
-	injectKey(tcell.KeyUp, 0, tcell.ModNone)
-	injectString("firstline")
-	// buffer:
-	// firstline
-	// secondline
-	// base content
-	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
-
-	data, err := os.ReadFile(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Equal(t, "firstline\nsecondline\nbase content\n", string(data))
-}
-
-var srTestStart = `foo
-foo
-foofoofoo
-Ernleȝe foo æðelen
-`
-var srTest2 = `test_string
-test_string
-test_stringtest_stringtest_string
-Ernleȝe test_string æðelen
-`
-var srTest3 = `test_foo
-test_string
-test_footest_stringtest_foo
-Ernleȝe test_string æðelen
-`
-
-func TestSearchAndReplace(t *testing.T) {
-	file := createTestFile(t, srTestStart)
-
-	openFile(file)
-
-	if findBuffer(file) == nil {
-		t.Fatalf("Could not find buffer %s", file)
-	}
-
-	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
-	injectString(fmt.Sprintf("replaceall %s %s", "foo", "test_string"))
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-
-	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
-
-	data, err := os.ReadFile(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Equal(t, srTest2, string(data))
-
-	injectKey(tcell.KeyCtrlE, rune(tcell.KeyCtrlE), tcell.ModCtrl)
-	injectString(fmt.Sprintf("replace %s %s", "string", "foo"))
-	injectKey(tcell.KeyEnter, rune(tcell.KeyEnter), tcell.ModNone)
-	injectString("ynyny")
-	injectKey(tcell.KeyEscape, 0, tcell.ModNone)
-
-	injectKey(tcell.KeyCtrlS, rune(tcell.KeyCtrlS), tcell.ModCtrl)
-
-	data, err = os.ReadFile(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assert.Equal(t, srTest3, string(data))
-}
-
-func TestMultiCursor(t *testing.T) {
-	// TODO
-}
-
-func TestSettingsPersistence(t *testing.T) {
-	// TODO
-}
-
-// more tests (rendering, tabs, plugins)?
--- a/data/com.github.zyedidia.micro.metainfo.xml
+++ b/data/com.github.zyedidia.micro.metainfo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+	<id>com.github.zyedidia.micro</id>
+	<name>Micro Text Editor</name>
+	<summary>A modern and intuitive terminal-based text editor</summary>
+	<metadata_license>MIT</metadata_license>
+	<categories>
+		<category>Development</category>
+		<category>TextEditor</category>
+	</categories>
+	<provides>
+		<binary>micro</binary>
+	</provides>
+	<developer_name>Zachary Yedidia</developer_name>
+	<screenshots>
+		<screenshot type="default">
+			<caption>Micro Text Editor editing its source code.</caption>
+			<image type="source">https://raw.githubusercontent.com/zyedidia/micro/master/assets/micro-solarized.png</image>
+		</screenshot>
+	</screenshots>
+	<url type="homepage">https://micro-editor.github.io</url>
+	<url type="bugtracker">https://github.com/zyedidia/micro/issues</url>
+</component>
--- a/data/io.github.zyedidia.micro.metainfo.xml
+++ b/data/io.github.zyedidia.micro.metainfo.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-	<id>io.github.zyedidia.micro</id>
-	<launchable type="desktop-id">micro.desktop</launchable>
-	<name>Micro Text Editor</name>
-	<summary>A modern and intuitive terminal-based text editor</summary>
-	<description>
-		<p>
-			micro is a terminal-based text editor that aims to be easy to use and
-			intuitive, while also taking advantage of the capabilities of modern terminals.
-			It comes as a single, batteries-included, static binary with no dependencies;
-			you can download and use it right now!
-		</p>
-		<p>
-			As its name indicates, micro aims to be somewhat of a successor to the nano
-			editor by being easy to install and use. It strives to be enjoyable as a full-time
-			editor for people who prefer to work in a terminal, or those who regularly
-			edit files over SSH.
-		</p>
-	</description>
-	<metadata_license>MIT</metadata_license>
-	<project_license>MIT</project_license>
-	<categories>
-		<category>Development</category>
-		<category>TextEditor</category>
-	</categories>
-	<releases>
-			<release version="2.0.15" date="2025-12-31"/>
-			<release version="2.0.14" date="2024-08-27"/>
-			<release version="2.0.13" date="2023-10-22"/>
-			<release version="2.0.12" date="2023-09-06"/>
-			<release version="2.0.11" date="2022-08-01"/>
-	</releases>
-	<provides>
-		<binary>micro</binary>
-		<id>com.github.zyedidia.micro</id>
-	</provides>
-	<developer_name>Zachary Yedidia</developer_name>
-	<screenshots>
-		<screenshot type="default">
-			<caption>Micro Text Editor editing its source code</caption>
-			<image type="source">https://raw.githubusercontent.com/micro-editor/micro/master/assets/micro-solarized.png</image>
-		</screenshot>
-	</screenshots>
-	<content_rating type="oars-1.1" />
-	<url type="homepage">https://micro-editor.github.io</url>
-	<url type="bugtracker">https://github.com/micro-editor/micro/issues</url>
-	<url type="faq">https://micro-editor.github.io/about.html</url>
-	<url type="help">https://micro-editor.github.io/about.html</url>
-	<url type="contact">https://github.com/zyedidia</url>
-	<url type="vcs-browser">https://github.com/micro-editor/micro</url>
-	<url type="contribute">https://github.com/micro-editor/micro#contributing</url>
-</component>
--- a/data/micro.json
+++ b/data/micro.json
@@ -1,367 +0,0 @@
-{
-    "$comment": "https://github.com/micro-editor/micro",
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "options",
-    "description": "A micro editor config schema",
-    "type": "object",
-    "properties": {
-        "autoindent": {
-            "description": "Whether to use the same indentation as a previous line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "autosave": {
-            "description": "A delay between automatic saves\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "integer",
-            "minimum": 0,
-            "default": 0
-        },
-        "autosu": {
-            "description": "Whether attempt to use super user privileges\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "backup": {
-            "description": "Whether to backup all open buffers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "backupdir": {
-            "description": "A directory to store backups\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": ""
-        },
-        "basename": {
-            "description": "Whether to show a basename instead of a full path\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "clipboard": {
-            "description": "A way to access the system clipboard\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "enum": [
-                "external",
-                "terminal",
-                "internal"
-            ],
-            "default": "external"
-        },
-        "colorcolumn": {
-            "description": "A position to display a column\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "integer",
-            "minimum": 0,
-            "default": 0
-        },
-        "colorscheme": {
-            "description": "A color scheme\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "enum": [
-                "atom-dark",
-                "bubblegum",
-                "cmc-16",
-                "cmc-tc",
-                "darcula",
-                "default",
-                "dracula-tc",
-                "dukedark-tc",
-                "dukelight-tc",
-                "dukeubuntu-tc",
-                "geany",
-                "gotham",
-                "gruvbox",
-                "gruvbox-tc",
-                "material-tc",
-                "monokai-dark",
-                "monokai",
-                "one-dark",
-                "railscast",
-                "simple",
-                "solarized",
-                "solarized-tc",
-                "sunny-day",
-                "twilight",
-                "zenburn"
-            ],
-            "default": "default"
-        },
-        "cursorline": {
-            "description": "Whether to highlight a line with a cursor with a different color\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "diffgutter": {
-            "description": "Whether to display diff inticators before lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "divchars": {
-            "description": "Divider chars for vertical and horizontal splits\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "|-"
-        },
-        "divreverse": {
-            "description": "Whether to use inversed color scheme colors for splits\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "encoding": {
-            "description": "An encoding used to open and save files\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "utf-8"
-        },
-        "eofnewline": {
-            "description": "Whether to add a missing trailing new line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "fastdirty": {
-            "description": "Whether to use a fast algorithm to determine whether a file is changed\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "fileformat": {
-            "description": "A line ending format\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "enum": [
-                "unix",
-                "dos"
-            ],
-            "default": "unix"
-        },
-        "filetype": {
-            "description": "A filetype for the current buffer\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "unknown"
-        },
-        "hlsearch": {
-            "description": "Whether to highlight all instances of a searched text after a successful search\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "incsearch": {
-            "description": "Whether to enable an incremental search in `Find` prompt\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "ignorecase": {
-            "description": "Whether to perform case-insensitive searches\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "indentchar": {
-            "description": "An indentation character\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "maxLength": 1,
-            "default": " "
-        },
-        "infobar": {
-            "description": "Whether to enable a line at the bottom where messages are printed\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "keepautoindent": {
-            "description": "Whether add a whitespace while using autoindent\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "keymenu": {
-            "description": "Whether to display nano-style key menu at the bottom\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "matchbrace": {
-            "description": "Whether to show matching braces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "matchbracestyle": {
-            "description": "Whether to underline or highlight matching braces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "enum": [
-                "underline",
-                "highlight"
-            ],
-            "default": "underline"
-        },
-        "mkparents": {
-            "description": "Whether to create missing directories\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "mouse": {
-            "description": "Whether to enable mouse support\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "paste": {
-            "description": "Whether to treat characters sent from the terminal in a single chunk as a paste event\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "parsecursor": {
-            "description": "Whether to extract a line number and a column to open files with from file names\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "permbackup": {
-            "description": "Whether to permanently save backups\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "pluginchannels": {
-            "description": "A file with list of plugin channels\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"
-        },
-        "pluginrepos": {
-            "description": "Plugin repositories\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "description": "A pluging repository\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-                "type": "string"
-            },
-            "default": []
-        },
-        "readonly": {
-            "description": "Whether to forbid buffer editing\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "rmtrailingws": {
-            "description": "Whether to remove trailing whitespaces\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "ruler": {
-            "description": "Whether to display line numbers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "relativeruler": {
-            "description": "Whether to display relative line numbers\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "savecursor": {
-            "description": "Whether to save cursor position in files\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "savehistory": {
-            "description": "Whether to save command history between closing and re-opening editor\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "saveundo": {
-            "description": "Whether to save undo after closing file\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "scrollbar": {
-            "description": "Whether to save undo after closing file\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "scrollmargin": {
-            "description": "A margin at which a view starts scrolling when a cursor approaches an edge of a view\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "integer",
-            "default": 3
-        },
-        "scrollspeed": {
-            "description": "Line count to scroll for one scroll event\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "integer",
-            "default": 2
-        },
-        "smartpaste": {
-            "description": "Whether to add a leading whitespace while pasting multiple lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "softwrap": {
-            "description": "Whether to wrap long lines\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "splitbottom": {
-            "description": "Whether to create a new horizontal split below the current one\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "splitright": {
-            "description": "Whether to create a new vertical split right of the current one\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "statusformatl": {
-            "description": "Format string of left-justified part of the statusline\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)"
-        },
-        "statusformatr": {
-            "description": "Format string of right-justified part of the statusline\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help"
-        },
-        "statusline": {
-            "description": "Whether to display a status line\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "sucmd": {
-            "description": "A super user command\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "string",
-            "default": "sudo",
-            "examples": [
-                "sudo",
-                "doas"
-            ]
-        },
-        "syntax": {
-            "description": "Whether to enable a syntax highlighting\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "tabmovement": {
-            "description": "Whether to navigate spaces at the beginning of lines as if they are tabs\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "tabhighlight": {
-            "description": "Whether to invert tab character colors\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "tabreverse": {
-            "description": "Whether to reverse tab bar colors\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "tabsize": {
-            "description": "A tab size\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "integer",
-            "default": 4
-        },
-        "tabstospaces": {
-            "description": "Whether to use spaces instead of tabs\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "useprimary": {
-            "description": "Whether to use primary clipboard to copy selections in the background\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": true
-        },
-        "wordwrap": {
-            "description": "Whether to wrap long lines by words\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        },
-        "xterm": {
-            "description": "Whether to assume that the current terminal is `xterm`\nhttps://github.com/micro-editor/micro/blob/master/runtime/help/options.md#options",
-            "type": "boolean",
-            "default": false
-        }
-    },
-    "additionalProperties": false
-}
--- a/go.mod
+++ b/go.mod
@@ -1,40 +1,26 @@
-module github.com/micro-editor/micro/v2
+module github.com/zyedidia/micro

 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/dustin/go-humanize v1.0.0
 	github.com/go-errors/errors v1.0.1
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/mattn/go-isatty v0.0.20
-	github.com/mattn/go-runewidth v0.0.16
-	github.com/micro-editor/json5 v1.0.1-micro
-	github.com/micro-editor/tcell/v2 v2.0.13
-	github.com/micro-editor/terminal v0.0.0-20250324214352-e587e959c6b5
+	github.com/mattn/go-isatty v0.0.11
+	github.com/mattn/go-runewidth v0.0.7
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/sergi/go-diff v1.1.0
 	github.com/stretchr/testify v1.4.0
-	github.com/yuin/gopher-lua v1.1.1
-	github.com/zyedidia/clipper v0.1.1
+	github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb
+	github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197
 	github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3
-	golang.org/x/text v0.4.0
-	gopkg.in/yaml.v2 v2.2.8
-	layeh.com/gopher-luar v1.0.11
+	github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5
+	github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d
+	github.com/zyedidia/pty v2.0.0+incompatible // indirect
+	github.com/zyedidia/tcell v1.4.4
+	github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415
+	golang.org/x/text v0.3.2
+	gopkg.in/yaml.v2 v2.2.7
+	layeh.com/gopher-luar v1.0.7
 )

-require (
-	github.com/creack/pty v1.1.18 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/zyedidia/poller v1.0.1 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-)
-
-replace github.com/kballard/go-shellquote => github.com/micro-editor/go-shellquote v0.0.0-20250101105543-feb6c39314f5
-
-replace layeh.com/gopher-luar v1.0.11 => github.com/layeh/gopher-luar v1.0.11
-
-go 1.19
+go 1.11
--- a/go.sum
+++ b/go.sum
@@ -3,8 +3,6 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -14,63 +12,64 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/layeh/gopher-luar v1.0.11 h1:ss6t9OtykOiETBScJylSMPhuYAtOmpH5rSX10/wCcis=
-github.com/layeh/gopher-luar v1.0.11/go.mod h1:TPnIVCZ2RJBndm7ohXyaqfhzjlZ+OA2SZR/YwL8tECk=
 github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
 github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/micro-editor/go-shellquote v0.0.0-20250101105543-feb6c39314f5 h1:D7BPnsedXiKo/e8RTFX419/52ICNhU8UKPQGZ/0yiLc=
-github.com/micro-editor/go-shellquote v0.0.0-20250101105543-feb6c39314f5/go.mod h1:zaPgW/fDiW4MUfEwxpC+GB/bhvX44NJaNHmRAC9auHQ=
-github.com/micro-editor/json5 v1.0.1-micro h1:5Y4MuzhkmW0sQQNPvrIVevIOKi557qsznwjRr4iq1AI=
-github.com/micro-editor/json5 v1.0.1-micro/go.mod h1:cmlPHZ1JKOXNse0/3zwwKj/GUpzAVkzx4lZDkpHl4q0=
-github.com/micro-editor/tcell/v2 v2.0.13 h1:xyuSpBhSBsUH+bs7FER9IV2/TsQpBmCFiNWJVAEdT68=
-github.com/micro-editor/tcell/v2 v2.0.13/go.mod h1:ixpjICpoGp83FZVoLYFJPBwCAslHeTnvgPdhJVPLyy0=
-github.com/micro-editor/terminal v0.0.0-20250324214352-e587e959c6b5 h1:czSkYUNmHuWS2lv8VreufENEXZNOCGZcXd744YKf8yM=
-github.com/micro-editor/terminal v0.0.0-20250324214352-e587e959c6b5/go.mod h1:OszIG7ockt4osicVHq6gI2QmV4PBDK6H5/Bj8GDGv4Q=
+github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
+github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/robertkrimen/otto v0.2.1 h1:FVP0PJ0AHIjC+N4pKCG9yCDz6LHNPCwi/GKID5pGGF0=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
-github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
-github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-github.com/zyedidia/clipper v0.1.1 h1:HBgguFNDq/QmSQKBnhy4sMKzILINr139VEgAhftOUTw=
-github.com/zyedidia/clipper v0.1.1/go.mod h1:7YApPNiiTZTXdKKZG92G50qj6mnWEX975Sdu65J7YpQ=
+github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
+github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
+github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197 h1:gYTNnAW6azuB3BbA6QYWO/H4F2ABSOjjw3Z03tlXd2c=
+github.com/zyedidia/clipboard v0.0.0-20190823154308-241f98e9b197/go.mod h1:WDk3p8GiZV9+xFWlSo8qreeoLhW6Ik692rqXk+cNeRY=
 github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3 h1:oMHjjTLfGXVuyOQBYj5/td9WC0mw4g1xDBPovIqmHew=
 github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod h1:YKbIYP//Eln8eDgAJGI3IDvR3s4Tv9Z9TGIOumiyQ5c=
+github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5 h1:Zs6mpwXvlqpF9zHl5XaN0p5V4J9XvP+WBuiuXyIgqvc=
+github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod h1:c1r+Ob9tUTPB0FKWO1+x+Hsc/zNa45WdGq7Y38Ybip0=
+github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d h1:zmDMkh22zXOB7gz8jFaI4GpI7llsPgzm38/jG0UgxjE=
+github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod h1:NDJSTTYWivnza6zkRapeX2/LwhKPEMQ7bJxqgDVT78I=
 github.com/zyedidia/poller v1.0.1 h1:Tt9S3AxAjXwWGNiC2TUdRJkQDZSzCBNVQ4xXiQ7440s=
 github.com/zyedidia/poller v1.0.1/go.mod h1:vZXJOHGDcuK08GXhF6IAY0ZFd2WcgOR5DOTp84Uk5eE=
+github.com/zyedidia/pty v2.0.0+incompatible h1:Ou5vXL6tvjst+RV8sUFISbuKDnUJPhnpygApMFGweqw=
+github.com/zyedidia/pty v2.0.0+incompatible/go.mod h1:4y9l9yJZNxRa7GB/fB+mmDmGkG3CqmzLf4vUxGGotEA=
+github.com/zyedidia/tcell v1.4.3 h1:s0nmxj22Jj+vyt4nVmnB6kbnwRxEay1zfS0j8IsbtfI=
+github.com/zyedidia/tcell v1.4.3/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
+github.com/zyedidia/tcell v1.4.4 h1:o34LXujNuSueuyTy+5eoQW+rQr8g0UbY8k1NczZyskQ=
+github.com/zyedidia/tcell v1.4.4/go.mod h1:HhlbMSCcGX15rFDB+Q1Lk3pKEOocsCUAQC3zhZ9sadA=
+github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415 h1:752dTQ5OatJ9M5ULK2+9lor+nzyZz+LYDo3WGngg3Rc=
+github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod h1:8leT8G0Cm8NoJHdrrKHyR9MirWoF4YW7pZh06B6H+1E=
 golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+layeh.com/gopher-luar v1.0.7 h1:53iv6CCkRs5wyofZ+qVXcyAYQOIG52s6pt4xkqZdq7k=
+layeh.com/gopher-luar v1.0.7/go.mod h1:TPnIVCZ2RJBndm7ohXyaqfhzjlZ+OA2SZR/YwL8tECk=
--- a/internal/action/actions.go
+++ b/internal/action/actions.go
--- a/internal/action/actions_other.go
+++ b/internal/action/actions_other.go
@@ -1,4 +1,4 @@
-//go:build plan9 || nacl || windows
+// +build plan9 nacl windows

 package action

--- a/internal/action/actions_posix.go
+++ b/internal/action/actions_posix.go
@@ -1,11 +1,11 @@
-//go:build linux || darwin || dragonfly || solaris || openbsd || netbsd || freebsd
+// +build linux darwin dragonfly solaris openbsd netbsd freebsd

 package action

 import (
 	"syscall"

-	"github.com/micro-editor/micro/v2/internal/screen"
+	"github.com/zyedidia/micro/internal/screen"
 )

 // Suspend sends micro to the background. This is the same as pressing CtrlZ in most unix programs.
--- a/internal/action/bindings.go
+++ b/internal/action/bindings.go
@@ -3,46 +3,36 @@ package action
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
-	"io/fs"
+	"io/ioutil"
 	"os"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"unicode"

-	"github.com/micro-editor/json5"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/json5"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/tcell"
 )

-var Binder = map[string]func(e Event, action string){
-	"command":  InfoMapEvent,
-	"buffer":   BufMapEvent,
-	"terminal": TermMapEvent,
-}
-
-func writeFile(name string, txt []byte) error {
-	return util.SafeWrite(name, txt, false)
-}
-
 func createBindingsIfNotExist(fname string) {
-	if _, e := os.Stat(fname); errors.Is(e, fs.ErrNotExist) {
-		writeFile(fname, []byte("{}"))
+	if _, e := os.Stat(fname); os.IsNotExist(e) {
+		ioutil.WriteFile(fname, []byte("{}"), 0644)
 	}
 }

 // InitBindings intializes the bindings map by reading from bindings.json
 func InitBindings() {
-	var parsed map[string]any
+	config.Bindings = DefaultBindings()
+
+	var parsed map[string]string
+	defaults := DefaultBindings()

 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)

 	if _, e := os.Stat(filename); e == nil {
-		input, err := os.ReadFile(filename)
+		input, err := ioutil.ReadFile(filename)
 		if err != nil {
 			screen.TermMessage("Error reading bindings.json file: " + err.Error())
 			return
@@ -54,93 +44,34 @@ func InitBindings() {
 		}
 	}

-	for p, bind := range Binder {
-		defaults := DefaultBindings(p)
-
-		for k, v := range defaults {
-			BindKey(k, v, bind)
-		}
+	for k, v := range defaults {
+		BindKey(k, v)
 	}
-
 	for k, v := range parsed {
-		switch val := v.(type) {
-		case string:
-			BindKey(k, val, Binder["buffer"])
-		case map[string]any:
-			bind, ok := Binder[k]
-			if !ok || bind == nil {
-				screen.TermMessage(fmt.Sprintf("%s is not a valid pane type", k))
-				continue
-			}
-			for e, a := range val {
-				s, ok := a.(string)
-				if !ok {
-					screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
-				} else {
-					BindKey(e, s, bind)
-				}
-			}
-		default:
-			screen.TermMessage("Error reading bindings.json: non-string and non-map entry", k)
-		}
+		BindKey(k, v)
 	}
 }

-func BindKey(k, v string, bind func(e Event, a string)) {
-	event, err := findEvent(k)
-	if err != nil {
-		screen.TermMessage(err)
-		return
+func BindKey(k, v string) {
+	event, ok := findEvent(k)
+	if !ok {
+		screen.TermMessage(k, "is not a bindable event")
 	}

-	if strings.HasPrefix(k, "\x1b") {
-		screen.RegisterRawSeq(k)
+	switch e := event.(type) {
+	case KeyEvent:
+		BufMapKey(e, v)
+	case MouseEvent:
+		BufMapMouse(e, v)
+	case RawEvent:
+		BufMapKey(e, v)
 	}

-	bind(event, v)
-
-	// switch e := event.(type) {
-	// case KeyEvent:
-	// 	InfoMapKey(e, v)
-	// case KeySequenceEvent:
-	// 	InfoMapKey(e, v)
-	// case MouseEvent:
-	// 	InfoMapMouse(e, v)
-	// case RawEvent:
-	// 	InfoMapKey(e, v)
-	// }
+	config.Bindings[k] = v
 }

-var r = regexp.MustCompile("<(.+?)>")
-
-func findEvents(k string) (b KeySequenceEvent, ok bool, err error) {
-	var events []Event = nil
-	for len(k) > 0 {
-		groups := r.FindStringSubmatchIndex(k)
-
-		if len(groups) > 3 {
-			if events == nil {
-				events = make([]Event, 0, 3)
-			}
-
-			e, ok := findSingleEvent(k[groups[2]:groups[3]])
-			if !ok {
-				return KeySequenceEvent{}, false, errors.New("Invalid event " + k[groups[2]:groups[3]])
-			}
-
-			events = append(events, e)
-
-			k = k[groups[3]+1:]
-		} else {
-			return KeySequenceEvent{}, false, nil
-		}
-	}
-
-	return KeySequenceEvent{events}, true, nil
-}
-
-// findSingleEvent will find binding Key 'b' using string 'k'
-func findSingleEvent(k string) (b Event, ok bool) {
+// findEvent will find binding Key 'b' using string 'k'
+func findEvent(k string) (b Event, ok bool) {
 	modifiers := tcell.ModNone

 	// First, we'll strip off all the modifiers in the name and add them to the
@@ -148,7 +79,7 @@ func findSingleEvent(k string) (b Event, ok bool) {
 modSearch:
 	for {
 		switch {
-		case strings.HasPrefix(k, "-") && k != "-":
+		case strings.HasPrefix(k, "-"):
 			// We optionally support dashes between modifiers
 			k = k[1:]
 		case strings.HasPrefix(k, "Ctrl") && k != "CtrlH":
@@ -162,6 +93,7 @@ modSearch:
 			k = k[5:]
 			modifiers |= tcell.ModShift
 		case strings.HasPrefix(k, "\x1b"):
+			screen.Screen.RegisterRawSeq(k)
 			return RawEvent{
 				esc: k,
 			}, true
@@ -170,7 +102,7 @@ modSearch:
 		}
 	}

-	if k == "" {
+	if len(k) == 0 {
 		return KeyEvent{}, false
 	}

@@ -181,35 +113,39 @@ modSearch:
 		// see if the key is in bindingKeys with the Ctrl prefix.
 		k = string(unicode.ToUpper(rune(k[0]))) + k[1:]
 		if code, ok := keyEvents["Ctrl"+k]; ok {
+			var r tcell.Key
+			// Special case for escape, for some reason tcell doesn't send it with the esc character
+			if code < 256 && code != 27 {
+				r = code
+			}
+			// It is, we're done.
 			return KeyEvent{
 				code: code,
 				mod:  modifiers,
+				r:    rune(r),
 			}, true
 		}
 	}

 	// See if we can find the key in bindingKeys
 	if code, ok := keyEvents[k]; ok {
+		var r tcell.Key
+		// Special case for escape, for some reason tcell doesn't send it with the esc character
+		if code < 256 && code != 27 {
+			r = code
+		}
 		return KeyEvent{
 			code: code,
 			mod:  modifiers,
+			r:    rune(r),
 		}, true
 	}

-	var mstate MouseState = MousePress
-	if strings.HasSuffix(k, "Drag") {
-		k = k[:len(k)-4]
-		mstate = MouseDrag
-	} else if strings.HasSuffix(k, "Release") {
-		k = k[:len(k)-7]
-		mstate = MouseRelease
-	}
 	// See if we can find the key in bindingMouse
 	if code, ok := mouseEvents[k]; ok {
 		return MouseEvent{
-			btn:   code,
-			mod:   modifiers,
-			state: mstate,
+			btn: code,
+			mod: modifiers,
 		}, true
 	}

@@ -226,60 +162,16 @@ modSearch:
 	return KeyEvent{}, false
 }

-func findEvent(k string) (Event, error) {
-	var event Event
-	event, ok, err := findEvents(k)
-	if err != nil {
-		return nil, err
-	}
-
-	if !ok {
-		event, ok = findSingleEvent(k)
-		if !ok {
-			return nil, errors.New(k + " is not a bindable event")
-		}
-	}
-
-	return event, nil
-}
-
-func eventsEqual(e1 Event, e2 Event) bool {
-	seq1, ok1 := e1.(KeySequenceEvent)
-	seq2, ok2 := e2.(KeySequenceEvent)
-	if ok1 && ok2 {
-		if len(seq1.keys) != len(seq2.keys) {
-			return false
-		}
-		for i := 0; i < len(seq1.keys); i++ {
-			if seq1.keys[i] != seq2.keys[i] {
-				return false
-			}
-		}
-		return true
-	}
-
-	return e1 == e2
-}
-
-// TryBindKeyPlug tries to bind a key for the plugin without writing to bindings.json.
-// This operation can be rejected by lockbindings to prevent unexpected actions by the user.
-func TryBindKeyPlug(k, v string, overwrite bool) (bool, error) {
-	if l, ok := config.GlobalSettings["lockbindings"]; ok && l.(bool) {
-		return false, errors.New("bindings is locked by the user")
-	}
-	return TryBindKey(k, v, overwrite, false)
-}
-
 // TryBindKey tries to bind a key by writing to config.ConfigDir/bindings.json
-// Returns true if the keybinding already existed or is binded successfully and a possible error
-func TryBindKey(k, v string, overwrite bool, writeToFile bool) (bool, error) {
+// Returns true if the keybinding already existed and a possible error
+func TryBindKey(k, v string, overwrite bool) (bool, error) {
 	var e error
-	var parsed map[string]any
+	var parsed map[string]string

 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
 	if _, e = os.Stat(filename); e == nil {
-		input, err := os.ReadFile(filename)
+		input, err := ioutil.ReadFile(filename)
 		if err != nil {
 			return false, errors.New("Error reading bindings.json file: " + err.Error())
 		}
@@ -289,42 +181,34 @@ func TryBindKey(k, v string, overwrite bool, writeToFile bool) (bool, error) {
 			return false, errors.New("Error reading bindings.json: " + err.Error())
 		}

-		key, err := findEvent(k)
-		if err != nil {
-			return false, err
+		key, ok := findEvent(k)
+		if !ok {
+			return false, errors.New("Invalid event " + k)
 		}

 		found := false
-		var ev string
-		for ev = range parsed {
-			if e, err := findEvent(ev); err == nil {
-				if eventsEqual(e, key) {
+		for ev := range parsed {
+			if e, ok := findEvent(ev); ok {
+				if e == key {
+					if overwrite {
+						parsed[ev] = v
+					}
 					found = true
 					break
 				}
 			}
 		}

-		if found {
-			if overwrite {
-				parsed[ev] = v
-			} else {
-				return true, nil
-			}
-		} else {
+		if found && !overwrite {
+			return true, nil
+		} else if !found {
 			parsed[k] = v
 		}

-		BindKey(k, v, Binder["buffer"])
+		BindKey(k, v)

 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		txt = append(txt, '\n')
-
-		if writeToFile {
-			return true, writeFile(filename, txt)
-		} else {
-			return true, nil
-		}
+		return true, ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return false, e
 }
@@ -332,12 +216,12 @@ func TryBindKey(k, v string, overwrite bool, writeToFile bool) (bool, error) {
 // UnbindKey removes the binding for a key from the bindings.json file
 func UnbindKey(k string) error {
 	var e error
-	var parsed map[string]any
+	var parsed map[string]string

 	filename := filepath.Join(config.ConfigDir, "bindings.json")
 	createBindingsIfNotExist(filename)
 	if _, e = os.Stat(filename); e == nil {
-		input, err := os.ReadFile(filename)
+		input, err := ioutil.ReadFile(filename)
 		if err != nil {
 			return errors.New("Error reading bindings.json file: " + err.Error())
 		}
@@ -347,43 +231,37 @@ func UnbindKey(k string) error {
 			return errors.New("Error reading bindings.json: " + err.Error())
 		}

-		key, err := findEvent(k)
-		if err != nil {
-			return err
+		key, ok := findEvent(k)
+		if !ok {
+			return errors.New("Invalid event " + k)
 		}

 		for ev := range parsed {
-			if e, err := findEvent(ev); err == nil {
-				if eventsEqual(e, key) {
+			if e, ok := findEvent(ev); ok {
+				if e == key {
 					delete(parsed, ev)
 					break
 				}
 			}
 		}

-		if strings.HasPrefix(k, "\x1b") {
-			screen.UnregisterRawSeq(k)
-		}
-
-		defaults := DefaultBindings("buffer")
+		defaults := DefaultBindings()
 		if a, ok := defaults[k]; ok {
-			BindKey(k, a, Binder["buffer"])
-		} else if _, ok := config.Bindings["buffer"][k]; ok {
-			BufUnmap(key)
-			delete(config.Bindings["buffer"], k)
+			BindKey(k, a)
+		} else if _, ok := config.Bindings[k]; ok {
+			delete(config.Bindings, k)
 		}

 		txt, _ := json.MarshalIndent(parsed, "", "    ")
-		txt = append(txt, '\n')
-		return writeFile(filename, txt)
+		return ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return e
 }

 var mouseEvents = map[string]tcell.ButtonMask{
-	"MouseLeft":       tcell.ButtonPrimary,
-	"MouseMiddle":     tcell.ButtonMiddle,
-	"MouseRight":      tcell.ButtonSecondary,
+	"MouseLeft":       tcell.Button1,
+	"MouseMiddle":     tcell.Button2,
+	"MouseRight":      tcell.Button3,
 	"MouseWheelUp":    tcell.WheelUp,
 	"MouseWheelDown":  tcell.WheelDown,
 	"MouseWheelLeft":  tcell.WheelLeft,
--- a/internal/action/bufpane.go
+++ b/internal/action/bufpane.go
--- a/internal/action/command.go
+++ b/internal/action/command.go
--- a/internal/action/defaults.go
+++ b/internal/action/defaults.go
@@ -1,21 +0,0 @@
-package action
-
-var termdefaults = map[string]string{
-	"<Ctrl-q><Ctrl-q>": "Exit",
-	"<Ctrl-e><Ctrl-e>": "CommandMode",
-	"<Ctrl-w><Ctrl-w>": "NextSplit|FirstSplit",
-}
-
-// DefaultBindings returns a map containing micro's default keybindings
-func DefaultBindings(pane string) map[string]string {
-	switch pane {
-	case "command":
-		return infodefaults
-	case "buffer":
-		return bufdefaults
-	case "terminal":
-		return termdefaults
-	default:
-		return map[string]string{}
-	}
-}
--- a/internal/action/defaults_darwin.go
+++ b/internal/action/defaults_darwin.go
@@ -1,188 +1,107 @@
 package action

-var bufdefaults = map[string]string{
-	"Up":             "CursorUp",
-	"Down":           "CursorDown",
-	"Right":          "CursorRight",
-	"Left":           "CursorLeft",
-	"ShiftUp":        "SelectUp",
-	"ShiftDown":      "SelectDown",
-	"ShiftLeft":      "SelectLeft",
-	"ShiftRight":     "SelectRight",
-	"AltLeft":        "WordLeft",
-	"AltRight":       "WordRight",
-	"AltUp":          "MoveLinesUp",
-	"AltDown":        "MoveLinesDown",
-	"AltShiftRight":  "SelectWordRight",
-	"AltShiftLeft":   "SelectWordLeft",
-	"CtrlLeft":       "StartOfTextToggle",
-	"CtrlRight":      "EndOfLine",
-	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
-	"ShiftHome":      "SelectToStartOfTextToggle",
-	"CtrlShiftRight": "SelectToEndOfLine",
-	"ShiftEnd":       "SelectToEndOfLine",
-	"CtrlUp":         "CursorStart",
-	"CtrlDown":       "CursorEnd",
-	"CtrlShiftUp":    "SelectToStart",
-	"CtrlShiftDown":  "SelectToEnd",
-	"Alt-{":          "ParagraphPrevious",
-	"Alt-}":          "ParagraphNext",
-	"Enter":          "InsertNewline",
-	"CtrlH":          "Backspace",
-	"Backspace":      "Backspace",
-	"OldBackspace":   "Backspace",
-	"Alt-CtrlH":      "DeleteWordLeft",
-	"Alt-Backspace":  "DeleteWordLeft",
-	"Tab":            "Autocomplete|IndentSelection|InsertTab",
-	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-	"Ctrl-o":         "OpenFile",
-	"Ctrl-s":         "Save",
-	"Ctrl-f":         "Find",
-	"Alt-F":          "FindLiteral",
-	"Ctrl-n":         "FindNext",
-	"Ctrl-p":         "FindPrevious",
-	"Alt-[":          "DiffPrevious|CursorStart",
-	"Alt-]":          "DiffNext|CursorEnd",
-	"Ctrl-z":         "Undo",
-	"Ctrl-y":         "Redo",
-	"Ctrl-c":         "Copy|CopyLine",
-	"Ctrl-x":         "Cut|CutLine",
-	"Ctrl-k":         "CutLine",
-	"Ctrl-d":         "Duplicate|DuplicateLine",
-	"Ctrl-v":         "Paste",
-	"Ctrl-a":         "SelectAll",
-	"Ctrl-t":         "AddTab",
-	"Alt-,":          "PreviousTab|LastTab",
-	"Alt-.":          "NextTab|FirstTab",
-	"Home":           "StartOfTextToggle",
-	"End":            "EndOfLine",
-	"CtrlHome":       "CursorStart",
-	"CtrlEnd":        "CursorEnd",
-	"PageUp":         "CursorPageUp",
-	"PageDown":       "CursorPageDown",
-	"CtrlPageUp":     "PreviousTab|LastTab",
-	"CtrlPageDown":   "NextTab|FirstTab",
-	"ShiftPageUp":    "SelectPageUp",
-	"ShiftPageDown":  "SelectPageDown",
-	"Ctrl-g":         "ToggleHelp",
-	"Alt-g":          "ToggleKeyMenu",
-	"Ctrl-r":         "ToggleRuler",
-	"Ctrl-l":         "command-edit:goto ",
-	"Delete":         "Delete",
-	"Ctrl-b":         "ShellMode",
-	"Ctrl-q":         "Quit",
-	"Ctrl-e":         "CommandMode",
-	"Ctrl-w":         "NextSplit|FirstSplit",
-	"Ctrl-u":         "ToggleMacro",
-	"Ctrl-j":         "PlayMacro",
-	"Insert":         "ToggleOverwriteMode",
+// DefaultBindings returns a map containing micro's default keybindings
+func DefaultBindings() map[string]string {
+	return map[string]string{
+		"Up":             "CursorUp",
+		"Down":           "CursorDown",
+		"Right":          "CursorRight",
+		"Left":           "CursorLeft",
+		"ShiftUp":        "SelectUp",
+		"ShiftDown":      "SelectDown",
+		"ShiftLeft":      "SelectLeft",
+		"ShiftRight":     "SelectRight",
+		"AltLeft":        "WordLeft",
+		"AltRight":       "WordRight",
+		"AltUp":          "MoveLinesUp",
+		"AltDown":        "MoveLinesDown",
+		"AltShiftRight":  "SelectWordRight",
+		"AltShiftLeft":   "SelectWordLeft",
+		"CtrlLeft":       "StartOfText",
+		"CtrlRight":      "EndOfLine",
+		"CtrlShiftLeft":  "SelectToStartOfText",
+		"ShiftHome":      "SelectToStartOfText",
+		"CtrlShiftRight": "SelectToEndOfLine",
+		"ShiftEnd":       "SelectToEndOfLine",
+		"CtrlUp":         "CursorStart",
+		"CtrlDown":       "CursorEnd",
+		"CtrlShiftUp":    "SelectToStart",
+		"CtrlShiftDown":  "SelectToEnd",
+		"Alt-{":          "ParagraphPrevious",
+		"Alt-}":          "ParagraphNext",
+		"Enter":          "InsertNewline",
+		"CtrlH":          "Backspace",
+		"Backspace":      "Backspace",
+		"Alt-CtrlH":      "DeleteWordLeft",
+		"Alt-Backspace":  "DeleteWordLeft",
+		"Tab":            "Autocomplete|IndentSelection|InsertTab",
+		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+		"CtrlO":          "OpenFile",
+		"CtrlS":          "Save",
+		"CtrlF":          "Find",
+		"CtrlN":          "FindNext",
+		"CtrlP":          "FindPrevious",
+		"CtrlZ":          "Undo",
+		"CtrlY":          "Redo",
+		"CtrlC":          "Copy",
+		"CtrlX":          "Cut",
+		"CtrlK":          "CutLine",
+		"CtrlD":          "DuplicateLine",
+		"CtrlV":          "Paste",
+		"CtrlA":          "SelectAll",
+		"CtrlT":          "AddTab",
+		"Alt,":           "PreviousTab",
+		"Alt.":           "NextTab",
+		"Home":           "StartOfText",
+		"End":            "EndOfLine",
+		"CtrlHome":       "CursorStart",
+		"CtrlEnd":        "CursorEnd",
+		"PageUp":         "CursorPageUp",
+		"PageDown":       "CursorPageDown",
+		"CtrlPageUp":     "PreviousTab",
+		"CtrlPageDown":   "NextTab",
+		"CtrlG":          "ToggleHelp",
+		"Alt-g":          "ToggleKeyMenu",
+		"CtrlR":          "ToggleRuler",
+		"CtrlL":          "command-edit:goto ",
+		"Delete":         "Delete",
+		"CtrlB":          "ShellMode",
+		"CtrlQ":          "Quit",
+		"CtrlE":          "CommandMode",
+		"CtrlW":          "NextSplit",
+		"CtrlU":          "ToggleMacro",
+		"CtrlJ":          "PlayMacro",
+		"Insert":         "ToggleOverwriteMode",

-	// Emacs-style keybindings
-	"Alt-f": "WordRight",
-	"Alt-b": "WordLeft",
-	"Alt-a": "StartOfText",
-	"Alt-e": "EndOfLine",
-	// "Alt-p": "CursorUp",
-	// "Alt-n": "CursorDown",
+		// Emacs-style keybindings
+		"Alt-f": "WordRight",
+		"Alt-b": "WordLeft",
+		"Alt-a": "StartOfText",
+		"Alt-e": "EndOfLine",
+		// "Alt-p": "CursorUp",
+		// "Alt-n": "CursorDown",

-	// Integration with file managers
-	"F2":  "Save",
-	"F3":  "Find",
-	"F4":  "Quit",
-	"F7":  "Find",
-	"F10": "Quit",
-	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors,UnhighlightSearch",
+		// Integration with file managers
+		"F2":  "Save",
+		"F3":  "Find",
+		"F4":  "Quit",
+		"F7":  "Find",
+		"F10": "Quit",
+		"Esc": "Escape",

-	// Mouse bindings
-	"MouseWheelUp":     "ScrollUp",
-	"MouseWheelDown":   "ScrollDown",
-	"MouseLeft":        "MousePress",
-	"MouseLeftDrag":    "MouseDrag",
-	"MouseLeftRelease": "MouseRelease",
-	"MouseMiddle":      "PastePrimary",
-	"Ctrl-MouseLeft":   "MouseMultiCursor",
+		// Mouse bindings
+		"MouseWheelUp":   "ScrollUp",
+		"MouseWheelDown": "ScrollDown",
+		"MouseLeft":      "MousePress",
+		"MouseMiddle":    "PastePrimary",
+		"Ctrl-MouseLeft": "MouseMultiCursor",

-	"Alt-n":        "SpawnMultiCursor",
-	"AltShiftUp":   "SpawnMultiCursorUp",
-	"AltShiftDown": "SpawnMultiCursorDown",
-	"Alt-m":        "SpawnMultiCursorSelect",
-	"Alt-p":        "RemoveMultiCursor",
-	"Alt-c":        "RemoveAllMultiCursors",
-	"Alt-x":        "SkipMultiCursor",
-}
-
-var infodefaults = map[string]string{
-	"Up":             "HistoryUp",
-	"Down":           "HistoryDown",
-	"Right":          "CursorRight",
-	"Left":           "CursorLeft",
-	"ShiftUp":        "SelectUp",
-	"ShiftDown":      "SelectDown",
-	"ShiftLeft":      "SelectLeft",
-	"ShiftRight":     "SelectRight",
-	"AltLeft":        "WordLeft",
-	"AltRight":       "WordRight",
-	"AltUp":          "CursorStart",
-	"AltDown":        "CursorEnd",
-	"AltShiftRight":  "SelectWordRight",
-	"AltShiftLeft":   "SelectWordLeft",
-	"CtrlLeft":       "StartOfTextToggle",
-	"CtrlRight":      "EndOfLine",
-	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
-	"ShiftHome":      "SelectToStartOfTextToggle",
-	"CtrlShiftRight": "SelectToEndOfLine",
-	"ShiftEnd":       "SelectToEndOfLine",
-	"CtrlUp":         "CursorStart",
-	"CtrlDown":       "CursorEnd",
-	"CtrlShiftUp":    "SelectToStart",
-	"CtrlShiftDown":  "SelectToEnd",
-	"Enter":          "ExecuteCommand",
-	"CtrlH":          "Backspace",
-	"Backspace":      "Backspace",
-	"OldBackspace":   "Backspace",
-	"Alt-CtrlH":      "DeleteWordLeft",
-	"Alt-Backspace":  "DeleteWordLeft",
-	"Tab":            "CommandComplete",
-	"Backtab":        "CycleAutocompleteBack",
-	"Ctrl-z":         "Undo",
-	"Ctrl-y":         "Redo",
-	"Ctrl-c":         "Copy",
-	"Ctrl-x":         "Cut",
-	"Ctrl-k":         "CutLine",
-	"Ctrl-v":         "Paste",
-	"Home":           "StartOfTextToggle",
-	"End":            "EndOfLine",
-	"CtrlHome":       "CursorStart",
-	"CtrlEnd":        "CursorEnd",
-	"Delete":         "Delete",
-	"Ctrl-q":         "AbortCommand",
-	"Ctrl-e":         "EndOfLine",
-	"Ctrl-a":         "StartOfLine",
-	"Ctrl-w":         "DeleteWordLeft",
-	"Insert":         "ToggleOverwriteMode",
-	"Ctrl-b":         "WordLeft",
-	"Ctrl-f":         "WordRight",
-	"Ctrl-d":         "DeleteWordLeft",
-	"Ctrl-m":         "ExecuteCommand",
-	"Ctrl-n":         "HistoryDown",
-	"Ctrl-p":         "HistoryUp",
-	"Ctrl-u":         "SelectToStart",
-
-	// Emacs-style keybindings
-	"Alt-f": "WordRight",
-	"Alt-b": "WordLeft",
-	"Alt-a": "StartOfText",
-	"Alt-e": "EndOfLine",
-
-	// Integration with file managers
-	"F10": "AbortCommand",
-	"Esc": "AbortCommand",
-
-	// Mouse bindings
-	"MouseWheelUp":     "HistoryUp",
-	"MouseWheelDown":   "HistoryDown",
-	"MouseLeft":        "MousePress",
-	"MouseLeftDrag":    "MouseDrag",
-	"MouseLeftRelease": "MouseRelease",
-	"MouseMiddle":      "PastePrimary",
+		"Alt-n":        "SpawnMultiCursor",
+		"AltShiftUp":   "SpawnMultiCursorUp",
+		"AltShiftDown": "SpawnMultiCursorDown",
+		"Alt-m":        "SpawnMultiCursorSelect",
+		"Alt-p":        "RemoveMultiCursor",
+		"Alt-c":        "RemoveAllMultiCursors",
+		"Alt-x":        "SkipMultiCursor",
+	}
 }
--- a/internal/action/defaults_other.go
+++ b/internal/action/defaults_other.go
@@ -1,191 +1,109 @@
-//go:build !darwin
 // +build !darwin

 package action

-var bufdefaults = map[string]string{
-	"Up":             "CursorUp",
-	"Down":           "CursorDown",
-	"Right":          "CursorRight",
-	"Left":           "CursorLeft",
-	"ShiftUp":        "SelectUp",
-	"ShiftDown":      "SelectDown",
-	"ShiftLeft":      "SelectLeft",
-	"ShiftRight":     "SelectRight",
-	"CtrlLeft":       "WordLeft",
-	"CtrlRight":      "WordRight",
-	"AltUp":          "MoveLinesUp",
-	"AltDown":        "MoveLinesDown",
-	"CtrlShiftRight": "SelectWordRight",
-	"CtrlShiftLeft":  "SelectWordLeft",
-	"AltLeft":        "StartOfTextToggle",
-	"AltRight":       "EndOfLine",
-	"AltShiftLeft":   "SelectToStartOfTextToggle",
-	"ShiftHome":      "SelectToStartOfTextToggle",
-	"AltShiftRight":  "SelectToEndOfLine",
-	"ShiftEnd":       "SelectToEndOfLine",
-	"CtrlUp":         "CursorStart",
-	"CtrlDown":       "CursorEnd",
-	"CtrlShiftUp":    "SelectToStart",
-	"CtrlShiftDown":  "SelectToEnd",
-	"Alt-{":          "ParagraphPrevious",
-	"Alt-}":          "ParagraphNext",
-	"Enter":          "InsertNewline",
-	"CtrlH":          "Backspace",
-	"Backspace":      "Backspace",
-	"OldBackspace":   "Backspace",
-	"Alt-CtrlH":      "DeleteWordLeft",
-	"Alt-Backspace":  "DeleteWordLeft",
-	"Tab":            "Autocomplete|IndentSelection|InsertTab",
-	"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
-	"Ctrl-o":         "OpenFile",
-	"Ctrl-s":         "Save",
-	"Ctrl-f":         "Find",
-	"Alt-F":          "FindLiteral",
-	"Ctrl-n":         "FindNext",
-	"Ctrl-p":         "FindPrevious",
-	"Alt-[":          "DiffPrevious|CursorStart",
-	"Alt-]":          "DiffNext|CursorEnd",
-	"Ctrl-z":         "Undo",
-	"Ctrl-y":         "Redo",
-	"Ctrl-c":         "Copy|CopyLine",
-	"Ctrl-x":         "Cut|CutLine",
-	"Ctrl-k":         "CutLine",
-	"Ctrl-d":         "Duplicate|DuplicateLine",
-	"Ctrl-v":         "Paste",
-	"Ctrl-a":         "SelectAll",
-	"Ctrl-t":         "AddTab",
-	"Alt-,":          "PreviousTab|LastTab",
-	"Alt-.":          "NextTab|FirstTab",
-	"Home":           "StartOfTextToggle",
-	"End":            "EndOfLine",
-	"CtrlHome":       "CursorStart",
-	"CtrlEnd":        "CursorEnd",
-	"PageUp":         "CursorPageUp",
-	"PageDown":       "CursorPageDown",
-	"CtrlPageUp":     "PreviousTab|LastTab",
-	"CtrlPageDown":   "NextTab|FirstTab",
-	"ShiftPageUp":    "SelectPageUp",
-	"ShiftPageDown":  "SelectPageDown",
-	"Ctrl-g":         "ToggleHelp",
-	"Alt-g":          "ToggleKeyMenu",
-	"Ctrl-r":         "ToggleRuler",
-	"Ctrl-l":         "command-edit:goto ",
-	"Delete":         "Delete",
-	"Ctrl-b":         "ShellMode",
-	"Ctrl-q":         "Quit",
-	"Ctrl-e":         "CommandMode",
-	"Ctrl-w":         "NextSplit|FirstSplit",
-	"Ctrl-u":         "ToggleMacro",
-	"Ctrl-j":         "PlayMacro",
-	"Insert":         "ToggleOverwriteMode",
+// DefaultBindings returns a map containing micro's default keybindings
+func DefaultBindings() map[string]string {
+	return map[string]string{
+		"Up":             "CursorUp",
+		"Down":           "CursorDown",
+		"Right":          "CursorRight",
+		"Left":           "CursorLeft",
+		"ShiftUp":        "SelectUp",
+		"ShiftDown":      "SelectDown",
+		"ShiftLeft":      "SelectLeft",
+		"ShiftRight":     "SelectRight",
+		"CtrlLeft":       "WordLeft",
+		"CtrlRight":      "WordRight",
+		"AltUp":          "MoveLinesUp",
+		"AltDown":        "MoveLinesDown",
+		"CtrlShiftRight": "SelectWordRight",
+		"CtrlShiftLeft":  "SelectWordLeft",
+		"AltLeft":        "StartOfText",
+		"AltRight":       "EndOfLine",
+		"AltShiftLeft":   "SelectToStartOfText",
+		"ShiftHome":      "SelectToStartOfText",
+		"AltShiftRight":  "SelectToEndOfLine",
+		"ShiftEnd":       "SelectToEndOfLine",
+		"CtrlUp":         "CursorStart",
+		"CtrlDown":       "CursorEnd",
+		"CtrlShiftUp":    "SelectToStart",
+		"CtrlShiftDown":  "SelectToEnd",
+		"Alt-{":          "ParagraphPrevious",
+		"Alt-}":          "ParagraphNext",
+		"Enter":          "InsertNewline",
+		"CtrlH":          "Backspace",
+		"Backspace":      "Backspace",
+		"Alt-CtrlH":      "DeleteWordLeft",
+		"Alt-Backspace":  "DeleteWordLeft",
+		"Tab":            "Autocomplete|IndentSelection|InsertTab",
+		"Backtab":        "CycleAutocompleteBack|OutdentSelection|OutdentLine",
+		"CtrlO":          "OpenFile",
+		"CtrlS":          "Save",
+		"CtrlF":          "Find",
+		"CtrlN":          "FindNext",
+		"CtrlP":          "FindPrevious",
+		"CtrlZ":          "Undo",
+		"CtrlY":          "Redo",
+		"CtrlC":          "Copy",
+		"CtrlX":          "Cut",
+		"CtrlK":          "CutLine",
+		"CtrlD":          "DuplicateLine",
+		"CtrlV":          "Paste",
+		"CtrlA":          "SelectAll",
+		"CtrlT":          "AddTab",
+		"Alt,":           "PreviousTab",
+		"Alt.":           "NextTab",
+		"Home":           "StartOfText",
+		"End":            "EndOfLine",
+		"CtrlHome":       "CursorStart",
+		"CtrlEnd":        "CursorEnd",
+		"PageUp":         "CursorPageUp",
+		"PageDown":       "CursorPageDown",
+		"CtrlPageUp":     "PreviousTab",
+		"CtrlPageDown":   "NextTab",
+		"CtrlG":          "ToggleHelp",
+		"Alt-g":          "ToggleKeyMenu",
+		"CtrlR":          "ToggleRuler",
+		"CtrlL":          "command-edit:goto ",
+		"Delete":         "Delete",
+		"CtrlB":          "ShellMode",
+		"CtrlQ":          "Quit",
+		"CtrlE":          "CommandMode",
+		"CtrlW":          "NextSplit",
+		"CtrlU":          "ToggleMacro",
+		"CtrlJ":          "PlayMacro",
+		"Insert":         "ToggleOverwriteMode",

-	// Emacs-style keybindings
-	"Alt-f": "WordRight",
-	"Alt-b": "WordLeft",
-	"Alt-a": "StartOfText",
-	"Alt-e": "EndOfLine",
-	// "Alt-p": "CursorUp",
-	// "Alt-n": "CursorDown",
+		// Emacs-style keybindings
+		"Alt-f": "WordRight",
+		"Alt-b": "WordLeft",
+		"Alt-a": "StartOfText",
+		"Alt-e": "EndOfLine",
+		// "Alt-p": "CursorUp",
+		// "Alt-n": "CursorDown",

-	// Integration with file managers
-	"F2":  "Save",
-	"F3":  "Find",
-	"F4":  "Quit",
-	"F7":  "Find",
-	"F10": "Quit",
-	"Esc": "Escape,Deselect,ClearInfo,RemoveAllMultiCursors,UnhighlightSearch",
+		// Integration with file managers
+		"F2":  "Save",
+		"F3":  "Find",
+		"F4":  "Quit",
+		"F7":  "Find",
+		"F10": "Quit",
+		"Esc": "Escape",

-	// Mouse bindings
-	"MouseWheelUp":     "ScrollUp",
-	"MouseWheelDown":   "ScrollDown",
-	"MouseLeft":        "MousePress",
-	"MouseLeftDrag":    "MouseDrag",
-	"MouseLeftRelease": "MouseRelease",
-	"MouseMiddle":      "PastePrimary",
-	"Ctrl-MouseLeft":   "MouseMultiCursor",
+		// Mouse bindings
+		"MouseWheelUp":   "ScrollUp",
+		"MouseWheelDown": "ScrollDown",
+		"MouseLeft":      "MousePress",
+		"MouseMiddle":    "PastePrimary",
+		"Ctrl-MouseLeft": "MouseMultiCursor",

-	"Alt-n":        "SpawnMultiCursor",
-	"Alt-m":        "SpawnMultiCursorSelect",
-	"AltShiftUp":   "SpawnMultiCursorUp",
-	"AltShiftDown": "SpawnMultiCursorDown",
-	"Alt-p":        "RemoveMultiCursor",
-	"Alt-c":        "RemoveAllMultiCursors",
-	"Alt-x":        "SkipMultiCursor",
-}
-
-var infodefaults = map[string]string{
-	"Up":             "HistoryUp",
-	"Down":           "HistoryDown",
-	"Right":          "CursorRight",
-	"Left":           "CursorLeft",
-	"ShiftUp":        "SelectUp",
-	"ShiftDown":      "SelectDown",
-	"ShiftLeft":      "SelectLeft",
-	"ShiftRight":     "SelectRight",
-	"AltLeft":        "StartOfTextToggle",
-	"AltRight":       "EndOfLine",
-	"AltUp":          "CursorStart",
-	"AltDown":        "CursorEnd",
-	"AltShiftRight":  "SelectWordRight",
-	"AltShiftLeft":   "SelectWordLeft",
-	"CtrlLeft":       "WordLeft",
-	"CtrlRight":      "WordRight",
-	"CtrlShiftLeft":  "SelectToStartOfTextToggle",
-	"ShiftHome":      "SelectToStartOfTextToggle",
-	"CtrlShiftRight": "SelectToEndOfLine",
-	"ShiftEnd":       "SelectToEndOfLine",
-	"CtrlUp":         "CursorStart",
-	"CtrlDown":       "CursorEnd",
-	"CtrlShiftUp":    "SelectToStart",
-	"CtrlShiftDown":  "SelectToEnd",
-	"Enter":          "ExecuteCommand",
-	"CtrlH":          "Backspace",
-	"Backspace":      "Backspace",
-	"OldBackspace":   "Backspace",
-	"Alt-CtrlH":      "DeleteWordLeft",
-	"Alt-Backspace":  "DeleteWordLeft",
-	"Tab":            "CommandComplete",
-	"Backtab":        "CycleAutocompleteBack",
-	"Ctrl-z":         "Undo",
-	"Ctrl-y":         "Redo",
-	"Ctrl-c":         "Copy",
-	"Ctrl-x":         "Cut",
-	"Ctrl-k":         "CutLine",
-	"Ctrl-v":         "Paste",
-	"Home":           "StartOfTextToggle",
-	"End":            "EndOfLine",
-	"CtrlHome":       "CursorStart",
-	"CtrlEnd":        "CursorEnd",
-	"Delete":         "Delete",
-	"Ctrl-q":         "AbortCommand",
-	"Ctrl-e":         "EndOfLine",
-	"Ctrl-a":         "StartOfLine",
-	"Ctrl-w":         "DeleteWordLeft",
-	"Insert":         "ToggleOverwriteMode",
-	"Ctrl-b":         "WordLeft",
-	"Ctrl-f":         "WordRight",
-	"Ctrl-d":         "DeleteWordLeft",
-	"Ctrl-m":         "ExecuteCommand",
-	"Ctrl-n":         "HistoryDown",
-	"Ctrl-p":         "HistoryUp",
-	"Ctrl-u":         "SelectToStart",
-
-	// Emacs-style keybindings
-	"Alt-f": "WordRight",
-	"Alt-b": "WordLeft",
-	"Alt-a": "StartOfText",
-	"Alt-e": "EndOfLine",
-
-	// Integration with file managers
-	"F10": "AbortCommand",
-	"Esc": "AbortCommand",
-
-	// Mouse bindings
-	"MouseWheelUp":     "HistoryUp",
-	"MouseWheelDown":   "HistoryDown",
-	"MouseLeft":        "MousePress",
-	"MouseLeftDrag":    "MouseDrag",
-	"MouseLeftRelease": "MouseRelease",
-	"MouseMiddle":      "PastePrimary",
+		"Alt-n":        "SpawnMultiCursor",
+		"Alt-m":        "SpawnMultiCursorSelect",
+		"AltShiftUp":   "SpawnMultiCursorUp",
+		"AltShiftDown": "SpawnMultiCursorDown",
+		"Alt-p":        "RemoveMultiCursor",
+		"Alt-c":        "RemoveAllMultiCursors",
+		"Alt-x":        "SkipMultiCursor",
+	}
 }
--- a/internal/action/events.go
+++ b/internal/action/events.go
@@ -1,17 +1,10 @@
 package action

 import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/tcell"
 )

-type Event interface {
-	Name() string
-}
+type Event interface{}

 // RawEvent is simply an escape code
 // We allow users to directly bind escape codes
@@ -20,10 +13,6 @@ type RawEvent struct {
 	esc string
 }

-func (r RawEvent) Name() string {
-	return r.esc
-}
-
 // KeyEvent is a key event containing a key code,
 // some possible modifiers (alt, ctrl, etc...) and
 // a rune if it was simply a character press
@@ -33,152 +22,17 @@ type KeyEvent struct {
 	code tcell.Key
 	mod  tcell.ModMask
 	r    rune
-	any  bool
 }

-func metaToAlt(mod tcell.ModMask) tcell.ModMask {
-	if mod&tcell.ModMeta != 0 {
-		mod &= ^tcell.ModMeta
-		mod |= tcell.ModAlt
-	}
-	return mod
-}
-
-func keyEvent(e *tcell.EventKey) KeyEvent {
-	ke := KeyEvent{
-		code: e.Key(),
-		mod:  metaToAlt(e.Modifiers()),
-	}
-	if e.Key() == tcell.KeyRune {
-		ke.r = e.Rune()
-	}
-	return ke
-}
-
-func (k KeyEvent) Name() string {
-	if k.any {
-		return "<any>"
-	}
-	s := ""
-	m := []string{}
-	if k.mod&tcell.ModShift != 0 {
-		m = append(m, "Shift")
-	}
-	if k.mod&tcell.ModAlt != 0 {
-		m = append(m, "Alt")
-	}
-	if k.mod&tcell.ModMeta != 0 {
-		m = append(m, "Meta")
-	}
-	if k.mod&tcell.ModCtrl != 0 {
-		m = append(m, "Ctrl")
-	}
-
-	ok := false
-	if s, ok = tcell.KeyNames[k.code]; !ok {
-		if k.code == tcell.KeyRune {
-			s = string(k.r)
-		} else {
-			s = fmt.Sprintf("Key[%d]", k.code)
-		}
-	}
-	if len(m) != 0 {
-		if k.mod&tcell.ModCtrl != 0 && strings.HasPrefix(s, "Ctrl-") {
-			s = s[5:]
-			if len(s) == 1 {
-				s = strings.ToLower(s)
-			}
-		}
-		return fmt.Sprintf("%s-%s", strings.Join(m, "-"), s)
-	}
-	return s
-}
-
-// A KeySequence defines a list of consecutive
-// events. All events in the sequence must be KeyEvents
-// or MouseEvents.
-type KeySequenceEvent struct {
-	keys []Event
-}
-
-func (k KeySequenceEvent) Name() string {
-	buf := bytes.Buffer{}
-	for _, e := range k.keys {
-		buf.WriteByte('<')
-		buf.WriteString(e.Name())
-		buf.WriteByte('>')
-	}
-	return buf.String()
-}
-
-type MouseState int
-
-const (
-	MousePress = iota
-	MouseDrag
-	MouseRelease
-)
-
 // MouseEvent is a mouse event with a mouse button and
 // any possible key modifiers
 type MouseEvent struct {
-	btn   tcell.ButtonMask
-	mod   tcell.ModMask
-	state MouseState
+	btn tcell.ButtonMask
+	mod tcell.ModMask
 }

-func (m MouseEvent) Name() string {
-	mod := ""
-	if m.mod&tcell.ModShift != 0 {
-		mod = "Shift-"
-	}
-	if m.mod&tcell.ModAlt != 0 {
-		mod = "Alt-"
-	}
-	if m.mod&tcell.ModMeta != 0 {
-		mod = "Meta-"
-	}
-	if m.mod&tcell.ModCtrl != 0 {
-		mod = "Ctrl-"
-	}
-
-	state := ""
-	switch m.state {
-	case MouseDrag:
-		state = "Drag"
-	case MouseRelease:
-		state = "Release"
-	}
-
-	for k, v := range mouseEvents {
-		if v == m.btn {
-			return fmt.Sprintf("%s%s%s", mod, k, state)
-		}
-	}
-	return ""
-}
-
-// ConstructEvent takes a tcell event and returns a micro
-// event. Note that tcell events can't express certain
-// micro events such as key sequences. This function is
-// mostly used for debugging/raw panes or constructing
-// intermediate micro events while parsing a sequence.
-func ConstructEvent(event tcell.Event) (Event, error) {
-	switch e := event.(type) {
-	case *tcell.EventKey:
-		return keyEvent(e), nil
-	case *tcell.EventRaw:
-		return RawEvent{
-			esc: e.EscSeq(),
-		}, nil
-	case *tcell.EventMouse:
-		return MouseEvent{
-			btn: e.Buttons(),
-			mod: metaToAlt(e.Modifiers()),
-		}, nil
-	}
-	return nil, errors.New("No micro event equivalent")
-}
+type KeyAction func(Handler) bool
+type MouseAction func(Handler, tcell.EventMouse) bool

 // A Handler will take a tcell event and execute it
 // appropriately
--- a/internal/action/globals.go
+++ b/internal/action/globals.go
@@ -1,18 +1,14 @@
 package action

-import "github.com/micro-editor/micro/v2/internal/buffer"
+import "github.com/zyedidia/micro/internal/buffer"

-// InfoBar is the global info bar.
 var InfoBar *InfoPane
-
-// LogBufPane is a global log buffer.
 var LogBufPane *BufPane

 // InitGlobals initializes the log buffer and the info bar
 func InitGlobals() {
 	InfoBar = NewInfoBar()
-	buffer.LogBuf = buffer.NewBufferFromString("", "", buffer.BTLog)
-	buffer.LogBuf.SetName("Log")
+	buffer.LogBuf = buffer.NewBufferFromString("", "Log", buffer.BTLog)
 }

 // GetInfoBar returns the infobar pane
@@ -25,6 +21,13 @@ func WriteLog(s string) {
 	buffer.WriteLog(s)
 	if LogBufPane != nil {
 		LogBufPane.CursorEnd()
+		v := LogBufPane.GetView()
+		endY := buffer.LogBuf.End().Y
+
+		if endY > v.StartLine+v.Height {
+			v.StartLine = buffer.LogBuf.End().Y - v.Height + 2
+			LogBufPane.SetView(v)
+		}
 	}
 }

@@ -34,4 +37,12 @@ func WriteLog(s string) {
 func (h *BufPane) OpenLogBuf() {
 	LogBufPane = h.HSplitBuf(buffer.LogBuf)
 	LogBufPane.CursorEnd()
+
+	v := LogBufPane.GetView()
+	endY := buffer.LogBuf.End().Y
+
+	if endY > v.StartLine+v.Height {
+		v.StartLine = buffer.LogBuf.End().Y - v.Height + 2
+		LogBufPane.SetView(v)
+	}
 }
--- a/internal/action/infocomplete.go
+++ b/internal/action/infocomplete.go
@@ -5,10 +5,9 @@ import (
 	"sort"
 	"strings"

-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/micro/v2/pkg/highlight"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/util"
 )

 // This file is meant (for now) for autocompletion in command mode, not
@@ -18,7 +17,7 @@ import (
 // CommandComplete autocompletes commands
 func CommandComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	var suggestions []string
 	for cmd := range commands {
@@ -39,7 +38,7 @@ func CommandComplete(b *buffer.Buffer) ([]string, []string) {
 // HelpComplete autocompletes help topics
 func HelpComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	var suggestions []string

@@ -78,67 +77,19 @@ func colorschemeComplete(input string) (string, []string) {
 	return chosen, suggestions
 }

-// filetypeComplete autocompletes filetype
-func filetypeComplete(input string) (string, []string) {
-	var suggestions []string
-
-	// We cannot match filetypes just by names of syntax files,
-	// since those names may be different from the actual filetype values
-	// specified inside syntax files (e.g. "c++" filetype in cpp.yaml).
-	// So we need to parse filetype values out of those files.
-	for _, f := range config.ListRealRuntimeFiles(config.RTSyntax) {
-		data, err := f.Data()
-		if err != nil {
-			continue
-		}
-		header, err := highlight.MakeHeaderYaml(data)
-		if err != nil {
-			continue
-		}
-		// Prevent duplicated defaults
-		if header.FileType == "off" || header.FileType == "unknown" {
-			continue
-		}
-		if strings.HasPrefix(header.FileType, input) {
-			suggestions = append(suggestions, header.FileType)
+func contains(s []string, e string) bool {
+	for _, a := range s {
+		if a == e {
+			return true
 		}
 	}
-headerLoop:
-	for _, f := range config.ListRuntimeFiles(config.RTSyntaxHeader) {
-		data, err := f.Data()
-		if err != nil {
-			continue
-		}
-		header, err := highlight.MakeHeader(data)
-		if err != nil {
-			continue
-		}
-		for _, v := range suggestions {
-			if v == header.FileType {
-				continue headerLoop
-			}
-		}
-		if strings.HasPrefix(header.FileType, input) {
-			suggestions = append(suggestions, header.FileType)
-		}
-	}
-
-	if strings.HasPrefix("off", input) {
-		suggestions = append(suggestions, "off")
-	}
-
-	var chosen string
-	if len(suggestions) == 1 {
-		chosen = suggestions[0]
-	}
-
-	return chosen, suggestions
+	return false
 }

 // OptionComplete autocompletes options
 func OptionComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	var suggestions []string
 	for option := range config.GlobalSettings {
@@ -165,7 +116,7 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	completeValue := false
 	args := bytes.Split(l, []byte{' '})
@@ -193,7 +144,7 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 	inputOpt = strings.TrimSpace(inputOpt)
 	var suggestions []string
 	// localSettings := config.DefaultLocalSettings()
-	var optionVal any
+	var optionVal interface{}
 	for k, option := range config.GlobalSettings {
 		if k == inputOpt {
 			optionVal = option
@@ -221,8 +172,13 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 		switch inputOpt {
 		case "colorscheme":
 			_, suggestions = colorschemeComplete(input)
-		case "filetype":
-			_, suggestions = filetypeComplete(input)
+		case "fileformat":
+			if strings.HasPrefix("unix", input) {
+				suggestions = append(suggestions, "unix")
+			}
+			if strings.HasPrefix("dos", input) {
+				suggestions = append(suggestions, "dos")
+			}
 		case "sucmd":
 			if strings.HasPrefix("sudo", input) {
 				suggestions = append(suggestions, "sudo")
@@ -230,14 +186,6 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 			if strings.HasPrefix("doas", input) {
 				suggestions = append(suggestions, "doas")
 			}
-		default:
-			if choices, ok := config.OptionChoices[inputOpt]; ok {
-				for _, choice := range choices {
-					if strings.HasPrefix(choice, input) {
-						suggestions = append(suggestions, choice)
-					}
-				}
-			}
 		}
 	}
 	sort.Strings(suggestions)
@@ -252,7 +200,7 @@ func OptionValueComplete(b *buffer.Buffer) ([]string, []string) {
 // PluginCmdComplete autocompletes the plugin command
 func PluginCmdComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	var suggestions []string
 	for _, cmd := range PluginCmds {
@@ -274,7 +222,7 @@ func PluginComplete(b *buffer.Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)
-	input, argstart := b.GetArg()
+	input, argstart := buffer.GetArg(b)

 	completeValue := false
 	args := bytes.Split(l, []byte{' '})
--- a/internal/action/infopane.go
+++ b/internal/action/infopane.go
@@ -2,60 +2,16 @@ package action

 import (
 	"bytes"
+	"strings"

-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/display"
-	"github.com/micro-editor/micro/v2/internal/info"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/info"
+	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/tcell"
 )

 type InfoKeyAction func(*InfoPane)

-var InfoBindings *KeyTree
-var InfoBufBindings *KeyTree
-
-func init() {
-	InfoBindings = NewKeyTree()
-	InfoBufBindings = NewKeyTree()
-}
-
-func InfoMapEvent(k Event, action string) {
-	config.Bindings["command"][k.Name()] = action
-
-	switch e := k.(type) {
-	case KeyEvent, KeySequenceEvent, RawEvent:
-		infoMapKey(e, action)
-	case MouseEvent:
-		infoMapMouse(e, action)
-	}
-}
-
-func infoMapKey(k Event, action string) {
-	if f, ok := InfoKeyActions[action]; ok {
-		InfoBindings.RegisterKeyBinding(k, InfoKeyActionGeneral(f))
-	} else if f, ok := BufKeyActions[action]; ok {
-		InfoBufBindings.RegisterKeyBinding(k, BufKeyActionGeneral(f))
-	}
-}
-
-func infoMapMouse(k MouseEvent, action string) {
-	// TODO: map mouse
-	if f, ok := BufMouseActions[action]; ok {
-		InfoBufBindings.RegisterMouseBinding(k, BufMouseActionGeneral(f))
-	} else {
-		infoMapKey(k, action)
-	}
-}
-
-func InfoKeyActionGeneral(a InfoKeyAction) PaneKeyAction {
-	return func(p Pane) bool {
-		a(p.(*InfoPane))
-		return true
-	}
-}
-
 type InfoPane struct {
 	*BufPane
 	*info.InfoBuf
@@ -65,7 +21,6 @@ func NewInfoPane(ib *info.InfoBuf, w display.BWindow, tab *Tab) *InfoPane {
 	ip := new(InfoPane)
 	ip.InfoBuf = ib
 	ip.BufPane = NewBufPane(ib.Buffer, w, tab)
-	ip.BufPane.bindings = InfoBufBindings

 	return ip
 }
@@ -83,22 +38,22 @@ func (h *InfoPane) Close() {

 func (h *InfoPane) HandleEvent(event tcell.Event) {
 	switch e := event.(type) {
-	case *tcell.EventResize:
-		// TODO
 	case *tcell.EventKey:
-		ke := keyEvent(e)
+		ke := KeyEvent{
+			code: e.Key(),
+			mod:  e.Modifiers(),
+			r:    e.Rune(),
+		}

 		done := h.DoKeyEvent(ke)
 		hasYN := h.HasYN
 		if e.Key() == tcell.KeyRune && hasYN {
-			y := e.Rune() == 'y' || e.Rune() == 'Y'
-			n := e.Rune() == 'n' || e.Rune() == 'N'
-			if y || n {
-				h.YNResp = y
+			if e.Rune() == 'y' && hasYN {
+				h.YNResp = true
+				h.DonePrompt(false)
+			} else if e.Rune() == 'n' && hasYN {
+				h.YNResp = false
 				h.DonePrompt(false)
-
-				InfoBindings.ResetEvents()
-				InfoBufBindings.ResetEvents()
 			}
 		}
 		if e.Key() == tcell.KeyRune && !done && !hasYN {
@@ -108,11 +63,7 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
 		if done && h.HasPrompt && !hasYN {
 			resp := string(h.LineBytes(0))
 			hist := h.History[h.PromptType]
-			if resp != hist[h.HistoryNum] {
-				h.HistoryNum = len(hist) - 1
-				hist[h.HistoryNum] = resp
-				h.HistorySearch = false
-			}
+			hist[h.HistoryNum] = resp
 			if h.EventCallback != nil {
 				h.EventCallback(resp)
 			}
@@ -122,74 +73,106 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
 	}
 }

-// DoKeyEvent executes a key event for the command bar, doing any overridden actions.
-// Returns true if the action was executed OR if there are more keys remaining
-// to process before executing an action (if this is a key sequence event).
-// Returns false if no action found.
+// DoKeyEvent executes a key event for the command bar, doing any overridden actions
 func (h *InfoPane) DoKeyEvent(e KeyEvent) bool {
-	action, more := InfoBindings.NextEvent(e, nil)
-	if action != nil && !more {
-		action(h)
-		InfoBindings.ResetEvents()
-
-		return true
-	} else if action == nil && !more {
-		InfoBindings.ResetEvents()
-		// return false //TODO:?
-	}
-
-	if !more {
-		// If no infopane action found, try to find a bufpane action.
-		//
-		// TODO: this is buggy. For example, if the command bar has the following
-		// two bindings:
-		//
-		//   "<Ctrl-x><Ctrl-p>": "HistoryUp",
-		//   "<Ctrl-x><Ctrl-v>": "Paste",
-		//
-		// the 2nd binding (with a bufpane action) doesn't work, since <Ctrl-x>
-		// has been already consumed by the 1st binding (with an infopane action).
-		//
-		// We should either iterate both InfoBindings and InfoBufBindings keytrees
-		// together, or just use the same keytree for both infopane and bufpane
-		// bindings.
-		action, more = InfoBufBindings.NextEvent(e, nil)
-		if action != nil && !more {
-			action(h.BufPane)
-			InfoBufBindings.ResetEvents()
-			return true
-		} else if action == nil && !more {
-			InfoBufBindings.ResetEvents()
+	done := false
+	if action, ok := BufKeyBindings[e]; ok {
+		estr := BufKeyStrings[e]
+		for _, s := range InfoNones {
+			if s == estr {
+				return false
+			}
+		}
+		for s, a := range InfoOverrides {
+			// TODO this is a hack and really we should have support
+			// for having binding overrides for different buffers
+			if strings.HasPrefix(estr, s) {
+				done = true
+				a(h)
+				break
+			}
+		}
+		if !done {
+			done = action(h.BufPane)
 		}
 	}
-
-	return more
+	return done
 }

-// HistoryUp cycles history up
-func (h *InfoPane) HistoryUp() {
+// InfoNones is a list of actions that should have no effect when executed
+// by an infohandler
+var InfoNones = []string{
+	"Save",
+	"SaveAll",
+	"SaveAs",
+	"Find",
+	"FindNext",
+	"FindPrevious",
+	"Center",
+	"DuplicateLine",
+	"MoveLinesUp",
+	"MoveLinesDown",
+	"OpenFile",
+	"Start",
+	"End",
+	"PageUp",
+	"PageDown",
+	"SelectPageUp",
+	"SelectPageDown",
+	"HalfPageUp",
+	"HalfPageDown",
+	"ToggleHelp",
+	"ToggleKeyMenu",
+	"ToggleDiffGutter",
+	"ToggleRuler",
+	"JumpLine",
+	"ClearStatus",
+	"ShellMode",
+	"CommandMode",
+	"AddTab",
+	"PreviousTab",
+	"NextTab",
+	"NextSplit",
+	"PreviousSplit",
+	"Unsplit",
+	"VSplit",
+	"HSplit",
+	"ToggleMacro",
+	"PlayMacro",
+	"Suspend",
+	"ScrollUp",
+	"ScrollDown",
+	"SpawnMultiCursor",
+	"SpawnMultiCursorSelect",
+	"RemoveMultiCursor",
+	"RemoveAllMultiCursors",
+	"SkipMultiCursor",
+}
+
+// InfoOverrides is the list of actions which have been overridden
+// by the infohandler
+var InfoOverrides = map[string]InfoKeyAction{
+	"CursorUp":      (*InfoPane).CursorUp,
+	"CursorDown":    (*InfoPane).CursorDown,
+	"InsertNewline": (*InfoPane).InsertNewline,
+	"Autocomplete":  (*InfoPane).Autocomplete,
+	"Escape":        (*InfoPane).Escape,
+	"Quit":          (*InfoPane).Quit,
+	"QuitAll":       (*InfoPane).QuitAll,
+}
+
+// CursorUp cycles history up
+func (h *InfoPane) CursorUp() {
 	h.UpHistory(h.History[h.PromptType])
 }

-// HistoryDown cycles history down
-func (h *InfoPane) HistoryDown() {
+// CursorDown cycles history down
+func (h *InfoPane) CursorDown() {
 	h.DownHistory(h.History[h.PromptType])
 }

-// HistorySearchUp fetches the previous history item beginning with the text
-// in the infobuffer before cursor
-func (h *InfoPane) HistorySearchUp() {
-	h.SearchUpHistory(h.History[h.PromptType])
-}
-
-// HistorySearchDown fetches the next history item beginning with the text
-// in the infobuffer before cursor
-func (h *InfoPane) HistorySearchDown() {
-	h.SearchDownHistory(h.History[h.PromptType])
-}
-
 // Autocomplete begins autocompletion
-func (h *InfoPane) CommandComplete() {
+func (h *InfoPane) Autocomplete() {
 	b := h.Buf
 	if b.HasSuggestions {
 		b.CycleAutocomplete(true)
@@ -203,39 +186,35 @@ func (h *InfoPane) CommandComplete() {
 	args := bytes.Split(l, []byte{' '})
 	cmd := string(args[0])

-	if h.PromptType == "Command" {
-		if len(args) == 1 {
-			b.Autocomplete(CommandComplete)
-		} else if action, ok := commands[cmd]; ok {
+	if len(args) == 1 {
+		b.Autocomplete(CommandComplete)
+	} else {
+		if action, ok := commands[cmd]; ok {
 			if action.completer != nil {
 				b.Autocomplete(action.completer)
 			}
 		}
-	} else {
-		// by default use filename autocompletion
-		b.Autocomplete(buffer.FileComplete)
 	}
 }

-// ExecuteCommand completes the prompt
-func (h *InfoPane) ExecuteCommand() {
+// InsertNewline completes the prompt
+func (h *InfoPane) InsertNewline() {
 	if !h.HasYN {
 		h.DonePrompt(false)
 	}
 }

-// AbortCommand cancels the prompt
-func (h *InfoPane) AbortCommand() {
+// Quit cancels the prompt
+func (h *InfoPane) Quit() {
 	h.DonePrompt(true)
 }

-// InfoKeyActions contains the list of all possible key actions the infopane could execute
-var InfoKeyActions = map[string]InfoKeyAction{
-	"HistoryUp":         (*InfoPane).HistoryUp,
-	"HistoryDown":       (*InfoPane).HistoryDown,
-	"HistorySearchUp":   (*InfoPane).HistorySearchUp,
-	"HistorySearchDown": (*InfoPane).HistorySearchDown,
-	"CommandComplete":   (*InfoPane).CommandComplete,
-	"ExecuteCommand":    (*InfoPane).ExecuteCommand,
-	"AbortCommand":      (*InfoPane).AbortCommand,
+// QuitAll cancels the prompt
+func (h *InfoPane) QuitAll() {
+	h.DonePrompt(true)
+}
+
+// Escape cancels the prompt
+func (h *InfoPane) Escape() {
+	h.DonePrompt(true)
 }
--- a/internal/action/keytree.go
+++ b/internal/action/keytree.go
@@ -1,261 +0,0 @@
-package action
-
-import (
-	"bytes"
-
-	"github.com/micro-editor/tcell/v2"
-)
-
-type PaneKeyAction func(Pane) bool
-type PaneMouseAction func(Pane, *tcell.EventMouse) bool
-type PaneKeyAnyAction func(Pane, []KeyEvent) bool
-
-// A KeyTreeNode stores a single node in the KeyTree (trie). The
-// children are stored as a map, and any node may store a list of
-// actions (the list will be nil if no actions correspond to a certain
-// node)
-type KeyTreeNode struct {
-	children map[Event]*KeyTreeNode
-
-	// Only one of these actions may be active in the current
-	// mode, and only one will be returned. If multiple actions
-	// are active, it is undefined which one will be the one
-	// returned.
-	actions []TreeAction
-}
-
-func NewKeyTreeNode() *KeyTreeNode {
-	n := new(KeyTreeNode)
-	n.children = make(map[Event]*KeyTreeNode)
-	n.actions = []TreeAction{}
-	return n
-}
-
-// A TreeAction stores an action, and a set of mode constraints for
-// the action to be active.
-type TreeAction struct {
-	// only one of these can be non-nil
-	action PaneKeyAction
-	any    PaneKeyAnyAction
-	mouse  PaneMouseAction
-
-	modes []ModeConstraint
-}
-
-// A KeyTree is a data structure for storing keybindings. It maps
-// key events to actions, and maintains a set of currently enabled
-// modes, which affects the action that is returned for a key event.
-// The tree acts like a Trie for Events to handle sequence events.
-type KeyTree struct {
-	root  *KeyTreeNode
-	modes map[string]bool
-
-	cursor KeyTreeCursor
-}
-
-// A KeyTreeCursor keeps track of the current location within the
-// tree, and stores any information from previous events that may
-// be needed to execute the action (values of wildcard events or
-// mouse events)
-type KeyTreeCursor struct {
-	node *KeyTreeNode
-
-	recordedEvents []Event
-	wildcards      []KeyEvent
-	mouseInfo      *tcell.EventMouse
-}
-
-// MakeClosure uses the information stored in a key tree cursor to construct
-// a PaneKeyAction from a TreeAction (which may have a PaneKeyAction, PaneMouseAction,
-// or AnyAction)
-func (k *KeyTreeCursor) MakeClosure(a TreeAction) PaneKeyAction {
-	if a.action != nil {
-		return a.action
-	} else if a.any != nil {
-		return func(p Pane) bool {
-			return a.any(p, k.wildcards)
-		}
-	} else if a.mouse != nil {
-		return func(p Pane) bool {
-			return a.mouse(p, k.mouseInfo)
-		}
-	}
-
-	return nil
-}
-
-// NewKeyTree allocates and returns an empty key tree
-func NewKeyTree() *KeyTree {
-	root := NewKeyTreeNode()
-	tree := new(KeyTree)
-
-	tree.root = root
-	tree.modes = make(map[string]bool)
-	tree.cursor = KeyTreeCursor{
-		node:      root,
-		wildcards: []KeyEvent{},
-		mouseInfo: nil,
-	}
-
-	return tree
-}
-
-// A ModeConstraint specifies that an action can only be executed
-// while a certain mode is enabled or disabled.
-type ModeConstraint struct {
-	mode     string
-	disabled bool
-}
-
-// RegisterKeyBinding registers a PaneKeyAction with an Event.
-func (k *KeyTree) RegisterKeyBinding(e Event, a PaneKeyAction) {
-	k.registerBinding(e, TreeAction{
-		action: a,
-		any:    nil,
-		mouse:  nil,
-		modes:  nil,
-	})
-}
-
-// RegisterKeyAnyBinding registers a PaneKeyAnyAction with an Event.
-// The event should contain an "any" event.
-func (k *KeyTree) RegisterKeyAnyBinding(e Event, a PaneKeyAnyAction) {
-	k.registerBinding(e, TreeAction{
-		action: nil,
-		any:    a,
-		mouse:  nil,
-		modes:  nil,
-	})
-}
-
-// RegisterMouseBinding registers a PaneMouseAction with an Event.
-// The event should contain a mouse event.
-func (k *KeyTree) RegisterMouseBinding(e Event, a PaneMouseAction) {
-	k.registerBinding(e, TreeAction{
-		action: nil,
-		any:    nil,
-		mouse:  a,
-		modes:  nil,
-	})
-}
-
-func (k *KeyTree) registerBinding(e Event, a TreeAction) {
-	switch ev := e.(type) {
-	case KeyEvent, MouseEvent, RawEvent:
-		newNode, ok := k.root.children[e]
-		if !ok {
-			newNode = NewKeyTreeNode()
-			k.root.children[e] = newNode
-		}
-		// newNode.actions = append(newNode.actions, a)
-		newNode.actions = []TreeAction{a}
-	case KeySequenceEvent:
-		n := k.root
-		for _, key := range ev.keys {
-			newNode, ok := n.children[key]
-			if !ok {
-				newNode = NewKeyTreeNode()
-				n.children[key] = newNode
-			}
-
-			n = newNode
-		}
-		// n.actions = append(n.actions, a)
-		n.actions = []TreeAction{a}
-	}
-}
-
-// NextEvent returns the action for the current sequence where e is the next
-// event. Even if the action was registered as a PaneKeyAnyAction or PaneMouseAction,
-// it will be returned as a PaneKeyAction closure where the appropriate arguments
-// have been provided.
-// If no action is associated with the given Event, or mode constraints are not
-// met for that action, nil is returned.
-// A boolean is returned to indicate if there is a conflict with this action. A
-// conflict occurs when there is an active action for this event but there are
-// bindings associated with further sequences starting with this event. The
-// calling function can decide what to do about the conflict (e.g. use a
-// timeout).
-func (k *KeyTree) NextEvent(e Event, mouse *tcell.EventMouse) (PaneKeyAction, bool) {
-	n := k.cursor.node
-	c, ok := n.children[e]
-
-	if !ok {
-		return nil, false
-	}
-
-	more := len(c.children) > 0
-
-	k.cursor.node = c
-
-	k.cursor.recordedEvents = append(k.cursor.recordedEvents, e)
-
-	switch ev := e.(type) {
-	case KeyEvent:
-		if ev.any {
-			k.cursor.wildcards = append(k.cursor.wildcards, ev)
-		}
-	case MouseEvent:
-		k.cursor.mouseInfo = mouse
-	}
-
-	if len(c.actions) > 0 {
-		// check if actions are active
-		for _, a := range c.actions {
-			active := true
-			for _, mc := range a.modes {
-				// if any mode constraint is not met, the action is not active
-				hasMode := k.modes[mc.mode]
-				if hasMode != mc.disabled {
-					active = false
-				}
-			}
-
-			if active {
-				// the first active action to be found is returned
-				return k.cursor.MakeClosure(a), more
-			}
-		}
-	}
-
-	return nil, more
-}
-
-// ResetEvents sets the current sequence back to the initial value.
-func (k *KeyTree) ResetEvents() {
-	k.cursor.node = k.root
-	k.cursor.wildcards = []KeyEvent{}
-	k.cursor.recordedEvents = []Event{}
-	k.cursor.mouseInfo = nil
-}
-
-// RecordedEventsStr returns the list of recorded events as a string
-func (k *KeyTree) RecordedEventsStr() string {
-	buf := &bytes.Buffer{}
-	for _, e := range k.cursor.recordedEvents {
-		buf.WriteString(e.Name())
-	}
-	return buf.String()
-}
-
-// DeleteBinding removes any currently active actions associated with the
-// given event.
-func (k *KeyTree) DeleteBinding(e Event) {
-
-}
-
-// DeleteAllBindings removes all actions associated with the given event,
-// regardless of whether they are active or not.
-func (k *KeyTree) DeleteAllBindings(e Event) {
-
-}
-
-// SetMode enables or disabled a given mode
-func (k *KeyTree) SetMode(mode string, en bool) {
-	k.modes[mode] = en
-}
-
-// HasMode returns if the given mode is currently active
-func (k *KeyTree) HasMode(mode string) bool {
-	return k.modes[mode]
-}
--- a/internal/action/pane.go
+++ b/internal/action/pane.go
@@ -1,10 +1,9 @@
 package action

 import (
-	"github.com/micro-editor/micro/v2/internal/display"
+	"github.com/zyedidia/micro/internal/display"
 )

-// A Pane is a general interface for a window in the editor.
 type Pane interface {
 	Handler
 	display.Window
--- a/internal/action/rawpane.go
+++ b/internal/action/rawpane.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"

-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/display"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/tcell"
 )

 type RawPane struct {
@@ -22,10 +22,7 @@ func NewRawPaneFromWin(b *buffer.Buffer, win display.BWindow, tab *Tab) *RawPane

 func NewRawPane(tab *Tab) *RawPane {
 	b := buffer.NewBufferFromString("", "", buffer.BTRaw)
-	b.SetName("Raw event viewer")
-
 	w := display.NewBufWindow(0, 0, 0, 0, b)
-
 	return NewRawPaneFromWin(b, w, tab)
 }

@@ -38,13 +35,6 @@ func (h *RawPane) HandleEvent(event tcell.Event) {
 	}

 	h.Buf.Insert(h.Cursor.Loc, reflect.TypeOf(event).String()[7:])
-
-	e, err := ConstructEvent(event)
-	if err == nil {
-		h.Buf.Insert(h.Cursor.Loc, fmt.Sprintf(": %s", e.Name()))
-	}
-
 	h.Buf.Insert(h.Cursor.Loc, fmt.Sprintf(": %q\n", event.EscSeq()))
-
 	h.Relocate()
 }
--- a/internal/action/tab.go
+++ b/internal/action/tab.go
@@ -1,15 +1,12 @@
 package action

 import (
-	luar "layeh.com/gopher-luar"
-
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/display"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/views"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/views"
+	"github.com/zyedidia/tcell"
 )

 // The TabList is a list of tabs and a window to display the tab bar
@@ -107,32 +104,30 @@ func (t *TabList) HandleEvent(event tcell.Event) {
 		mx, my := e.Position()
 		switch e.Buttons() {
 		case tcell.Button1:
-			if my == t.Y && len(t.List) > 1 {
-				if mx == 0 {
-					t.Scroll(-4)
-				} else if mx == t.Width-1 {
-					t.Scroll(4)
-				} else {
-					ind := t.LocFromVisual(buffer.Loc{mx, my})
-					if ind != -1 {
-						t.SetActive(ind)
-					}
-				}
+			if my == t.Y && mx == 0 {
+				t.Scroll(-4)
+				return
+			} else if my == t.Y && mx == t.Width-1 {
+				t.Scroll(4)
 				return
 			}
-		case tcell.ButtonNone:
-			if t.List[t.Active()].release {
-				// Mouse release received, while already released
-				t.ResetMouse()
-				return
+			if len(t.List) > 1 {
+				ind := t.LocFromVisual(buffer.Loc{mx, my})
+				if ind != -1 {
+					t.SetActive(ind)
+					return
+				}
+				if my == 0 {
+					return
+				}
 			}
 		case tcell.WheelUp:
-			if my == t.Y && len(t.List) > 1 {
+			if my == t.Y {
 				t.Scroll(4)
 				return
 			}
 		case tcell.WheelDown:
-			if my == t.Y && len(t.List) > 1 {
+			if my == t.Y {
 				t.Scroll(-4)
 				return
 			}
@@ -149,75 +144,11 @@ func (t *TabList) Display() {
 	}
 }

-func (t *TabList) SetActive(a int) {
-	t.TabWindow.SetActive(a)
-
-	for i, p := range t.List {
-		if i == a {
-			if !p.isActive {
-				p.isActive = true
-
-				err := config.RunPluginFn("onSetActive", luar.New(ulua.L, p.CurPane()))
-				if err != nil {
-					screen.TermMessage(err)
-				}
-			}
-		} else {
-			p.isActive = false
-		}
-	}
-}
-
-// ResetMouse resets the mouse release state after the screen was stopped
-// or the pane changed.
-// This prevents situations in which mouse releases are received at the wrong place
-// and the mouse state is still pressed.
-func (t *TabList) ResetMouse() {
-	for _, tab := range t.List {
-		if !tab.release && tab.resizing != nil {
-			tab.resizing = nil
-		}
-
-		tab.release = true
-
-		for _, p := range tab.Panes {
-			if bp, ok := p.(*BufPane); ok {
-				bp.resetMouse()
-			}
-		}
-	}
-}
-
-// CloseTerms notifies term panes that a terminal job has finished.
-func (t *TabList) CloseTerms() {
-	for _, tab := range t.List {
-		for _, p := range tab.Panes {
-			if tp, ok := p.(*TermPane); ok {
-				tp.HandleTermClose()
-			}
-		}
-	}
-}
-
 // Tabs is the global tab list
 var Tabs *TabList

 func InitTabs(bufs []*buffer.Buffer) {
-	multiopen := config.GetGlobalOption("multiopen").(string)
-	if multiopen == "tab" {
-		Tabs = NewTabList(bufs)
-	} else {
-		Tabs = NewTabList(bufs[:1])
-		for _, b := range bufs[1:] {
-			if multiopen == "vsplit" {
-				MainTab().CurPane().VSplitBuf(b)
-			} else { // default hsplit
-				MainTab().CurPane().HSplitBuf(b)
-			}
-		}
-	}
-
-	screen.RestartCallback = Tabs.ResetMouse
+	Tabs = NewTabList(bufs)
 }

 func MainTab() *Tab {
@@ -231,15 +162,10 @@ func MainTab() *Tab {
 type Tab struct {
 	*views.Node
 	*display.UIWindow
-
-	isActive bool
-
 	Panes  []Pane
 	active int

 	resizing *views.Node // node currently being resized
-	// captures whether the mouse is released
-	release bool
 }

 // NewTabFromBuffer creates a new tab from the given buffer
@@ -247,7 +173,6 @@ func NewTabFromBuffer(x, y, width, height int, b *buffer.Buffer) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
-	t.release = true

 	e := NewBufPaneFromBuf(b, t)
 	e.SetID(t.ID())
@@ -260,7 +185,6 @@ func NewTabFromPane(x, y, width, height int, pane Pane) *Tab {
 	t := new(Tab)
 	t.Node = views.NewRoot(x, y, width, height)
 	t.UIWindow = display.NewUIWindow(t.Node)
-	t.release = true
 	pane.SetTab(t)
 	pane.SetID(t.ID())

@@ -271,58 +195,43 @@ func NewTabFromPane(x, y, width, height int, pane Pane) *Tab {
 // HandleEvent takes a tcell event and usually dispatches it to the current
 // active pane. However if the event is a resize or a mouse event where the user
 // is interacting with the UI (resizing splits) then the event is consumed here
-// If the event is a mouse press event in a pane, that pane will become active
-// and get the event
+// If the event is a mouse event in a pane, that pane will become active and get
+// the event
 func (t *Tab) HandleEvent(event tcell.Event) {
 	switch e := event.(type) {
 	case *tcell.EventMouse:
 		mx, my := e.Position()
-		btn := e.Buttons()
-		switch {
-		case btn & ^(tcell.WheelUp|tcell.WheelDown|tcell.WheelLeft|tcell.WheelRight) != tcell.ButtonNone:
-			// button press or drag
-			wasReleased := t.release
-			t.release = false
-
-			if btn == tcell.Button1 {
-				if t.resizing != nil {
-					var size int
-					if t.resizing.Kind == views.STVert {
-						size = mx - t.resizing.X
-					} else {
-						size = my - t.resizing.Y + 1
-					}
-					t.resizing.ResizeSplit(size)
-					t.Resize()
-					return
-				}
-				if wasReleased {
-					t.resizing = t.GetMouseSplitNode(buffer.Loc{mx, my})
-					if t.resizing != nil {
-						return
-					}
-				}
-			}
-
-			if wasReleased {
-				for i, p := range t.Panes {
-					v := p.GetView()
-					inpane := mx >= v.X && mx < v.X+v.Width && my >= v.Y && my < v.Y+v.Height
-					if inpane {
-						t.SetActive(i)
-						break
-					}
-				}
-			}
-		case btn == tcell.ButtonNone:
-			// button release
-			t.release = true
+		switch e.Buttons() {
+		case tcell.Button1:
 			if t.resizing != nil {
-				t.resizing = nil
+				var size int
+				if t.resizing.Kind == views.STVert {
+					size = mx - t.resizing.X
+				} else {
+					size = my - t.resizing.Y + 1
+				}
+				t.resizing.ResizeSplit(size)
+				t.Resize()
 				return
 			}
+
+			resizeID := t.GetMouseSplitID(buffer.Loc{mx, my})
+			if resizeID != 0 {
+				t.resizing = t.GetNode(uint64(resizeID))
+				return
+			}
+
+			for i, p := range t.Panes {
+				v := p.GetView()
+				inpane := mx >= v.X && mx < v.X+v.Width && my >= v.Y && my < v.Y+v.Height
+				if inpane {
+					t.SetActive(i)
+					break
+				}
+			}
+		case tcell.ButtonNone:
+			t.resizing = nil
 		default:
-			// wheel move
 			for _, p := range t.Panes {
 				v := p.GetView()
 				inpane := mx >= v.X && mx < v.X+v.Width && my >= v.Y && my < v.Y+v.Height
@@ -349,16 +258,6 @@ func (t *Tab) SetActive(i int) {
 	}
 }

-// AddPane adds a pane at a given index
-func (t *Tab) AddPane(pane Pane, i int) {
-	if len(t.Panes) == i {
-		t.Panes = append(t.Panes, pane)
-		return
-	}
-	t.Panes = append(t.Panes[:i+1], t.Panes[i:]...)
-	t.Panes[i] = pane
-}
-
 // GetPane returns the pane with the given split index
 func (t *Tab) GetPane(splitid uint64) int {
 	for i, p := range t.Panes {
--- a/internal/action/terminal_supported.go
+++ b/internal/action/terminal_supported.go
@@ -1,10 +1,10 @@
-//go:build linux || darwin || dragonfly || solaris || openbsd || netbsd || freebsd
+// +build linux darwin dragonfly openbsd_amd64 freebsd

 package action

 import (
 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/micro-editor/micro/v2/internal/shell"
+	"github.com/zyedidia/micro/internal/shell"
 )

 // TermEmuSupported is a constant that marks if the terminal emulator is supported
@@ -14,7 +14,7 @@ const TermEmuSupported = true
 // if wait is true it will wait for the user to exit by pressing enter once the executable has terminated
 // if getOutput is true it will redirect the stdout of the process to a pipe which will be passed to the
 // callback which is a function that takes a string and a list of optional user arguments
-func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback func(out string, userargs []any), userargs []any) error {
+func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
 	args, err := shellquote.Split(input)
 	if err != nil {
 		return err
@@ -24,10 +24,7 @@ func RunTermEmulator(h *BufPane, input string, wait bool, getOutput bool, callba
 	}

 	t := new(shell.Terminal)
-	err = t.Start(args, getOutput, wait, callback, userargs)
-	if err != nil {
-		return err
-	}
+	t.Start(args, getOutput, wait, callback, userargs)

 	h.AddTab()
 	id := MainTab().Panes[0].ID()
--- a/internal/action/terminal_unsupported.go
+++ b/internal/action/terminal_unsupported.go
@@ -1,4 +1,4 @@
-//go:build plan9 || nacl || windows
+// +build !linux,!darwin,!freebsd,!dragonfly,!openbsd_amd64

 package action

@@ -8,6 +8,6 @@ import "errors"
 const TermEmuSupported = false

 // RunTermEmulator returns an error for unsupported systems (non-unix systems
-func RunTermEmulator(input string, wait bool, getOutput bool, callback func(out string, userargs []any), userargs []any) error {
+func RunTermEmulator(input string, wait bool, getOutput bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
 	return errors.New("Unsupported operating system")
 }
--- a/internal/action/termpane.go
+++ b/internal/action/termpane.go
@@ -4,52 +4,14 @@ import (
 	"errors"
 	"runtime"

-	"github.com/micro-editor/micro/v2/internal/clipboard"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/display"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/shell"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
+	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/internal/display"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/terminal"
 )

-type TermKeyAction func(*TermPane)
-
-var TermBindings *KeyTree
-
-func init() {
-	TermBindings = NewKeyTree()
-}
-
-func TermKeyActionGeneral(a TermKeyAction) PaneKeyAction {
-	return func(p Pane) bool {
-		a(p.(*TermPane))
-		return true
-	}
-}
-
-func TermMapEvent(k Event, action string) {
-	config.Bindings["terminal"][k.Name()] = action
-
-	switch e := k.(type) {
-	case KeyEvent, KeySequenceEvent, RawEvent:
-		termMapKey(e, action)
-	case MouseEvent:
-		termMapMouse(e, action)
-	}
-}
-
-func termMapKey(k Event, action string) {
-	if f, ok := TermKeyActions[action]; ok {
-		TermBindings.RegisterKeyBinding(k, TermKeyActionGeneral(f))
-	}
-}
-
-func termMapMouse(k MouseEvent, action string) {
-	// TODO: map mouse
-	termMapKey(k, action)
-}
-
 type TermPane struct {
 	*shell.Terminal
 	display.Window
@@ -81,10 +43,6 @@ func (t *TermPane) SetID(i uint64) {
 	t.id = i
 }

-func (t *TermPane) Name() string {
-	return t.Terminal.Name()
-}
-
 func (t *TermPane) SetTab(tab *Tab) {
 	t.tab = tab
 }
@@ -95,7 +53,6 @@ func (t *TermPane) Tab() *Tab {

 func (t *TermPane) Close() {}

-// Quit closes this termpane
 func (t *TermPane) Quit() {
 	t.Close()
 	if len(MainTab().Panes) > 1 {
@@ -109,7 +66,6 @@ func (t *TermPane) Quit() {
 	}
 }

-// Unsplit removes this split
 func (t *TermPane) Unsplit() {
 	n := MainTab().GetNode(t.id)
 	n.Unsplit()
@@ -125,22 +81,6 @@ func (t *TermPane) Unsplit() {
 // copy-paste
 func (t *TermPane) HandleEvent(event tcell.Event) {
 	if e, ok := event.(*tcell.EventKey); ok {
-		ke := keyEvent(e)
-		action, more := TermBindings.NextEvent(ke, nil)
-
-		if !more {
-			if action != nil {
-				action(t)
-				TermBindings.ResetEvents()
-				return
-			}
-			TermBindings.ResetEvents()
-		}
-
-		if more {
-			return
-		}
-
 		if t.Status == shell.TTDone {
 			switch e.Key() {
 			case tcell.KeyEscape, tcell.KeyCtrlQ, tcell.KeyEnter:
@@ -150,7 +90,7 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 			}
 		}
 		if e.Key() == tcell.KeyCtrlC && t.HasSelection() {
-			clipboard.Write(t.GetSelection(t.GetView().Width), clipboard.ClipboardReg)
+			clipboard.WriteAll(t.GetSelection(t.GetView().Width), "clipboard")
 			InfoBar.Message("Copied selection to clipboard")
 		} else if t.Status != shell.TTDone {
 			t.WriteString(event.EscSeq())
@@ -159,9 +99,9 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 		if t.Status != shell.TTDone {
 			t.WriteString(event.EscSeq())
 		}
-	} else if e, ok := event.(*tcell.EventMouse); !ok || t.State.Mode(terminal.ModeMouseMask) {
+	} else if e, ok := event.(*tcell.EventMouse); e != nil && (!ok || t.State.Mode(terminal.ModeMouseMask)) {
 		// t.WriteString(event.EscSeq())
-	} else {
+	} else if e != nil {
 		x, y := e.Position()
 		v := t.GetView()
 		x -= v.X
@@ -188,52 +128,12 @@ func (t *TermPane) HandleEvent(event tcell.Event) {
 			t.mouseReleased = true
 		}
 	}
-}

-// HandleTermClose is called when a terminal has finished its job
-// and should be closed. If that terminal is this termpane's terminal,
-// HandleTermClose will close the terminal and the termpane itself.
-func (t *TermPane) HandleTermClose() {
 	if t.Status == shell.TTClose {
 		t.Quit()
 	}
 }

-// Exit closes the termpane
-func (t *TermPane) Exit() {
-	t.Terminal.Close()
-	t.Quit()
-}
-
-// CommandMode opens the termpane's command mode
-func (t *TermPane) CommandMode() {
-	InfoBar.Prompt("> ", "", "TerminalCommand", nil, func(resp string, canceled bool) {
-		if !canceled {
-			t.HandleCommand(resp)
-		}
-	})
-}
-
-// NextSplit moves to the next split
-func (t *TermPane) NextSplit() {
-	a := t.tab.active
-	if a < len(t.tab.Panes)-1 {
-		a++
-	} else {
-		a = 0
-	}
-
-	t.tab.SetActive(a)
-}
-
-// HandleCommand handles a command for the term pane
 func (t *TermPane) HandleCommand(input string) {
 	InfoBar.Error("Commands are unsupported in term for now")
 }
-
-// TermKeyActions contains the list of all possible key actions the termpane could execute
-var TermKeyActions = map[string]TermKeyAction{
-	"Exit":        (*TermPane).Exit,
-	"CommandMode": (*TermPane).CommandMode,
-	"NextSplit":   (*TermPane).NextSplit,
-}
--- a/internal/buffer/autocomplete.go
+++ b/internal/buffer/autocomplete.go
@@ -2,12 +2,13 @@ package buffer

 import (
 	"bytes"
-	"io/fs"
+	"io/ioutil"
 	"os"
 	"sort"
 	"strings"
+	"unicode/utf8"

-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 )

 // A Completer is a function that takes a buffer and returns info
@@ -53,7 +54,9 @@ func (b *Buffer) CycleAutocomplete(forward bool) {
 	start := c.Loc
 	end := c.Loc
 	if prevSuggestion < len(b.Suggestions) && prevSuggestion >= 0 {
-		start = end.Move(-util.CharacterCountInString(b.Completions[prevSuggestion]), b)
+		start = end.Move(-utf8.RuneCountInString(b.Completions[prevSuggestion]), b)
+	} else {
+		// end = start.Move(1, b)
 	}

 	b.Replace(start, end, b.Completions[b.CurSuggestion])
@@ -64,26 +67,26 @@ func (b *Buffer) CycleAutocomplete(forward bool) {

 // GetWord gets the most recent word separated by any separator
 // (whitespace, punctuation, any non alphanumeric character)
-func (b *Buffer) GetWord() ([]byte, int) {
+func GetWord(b *Buffer) ([]byte, int) {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)

-	if c.X == 0 || util.IsWhitespace(b.RuneAt(c.Loc.Move(-1, b))) {
+	if c.X == 0 || util.IsWhitespace(b.RuneAt(c.Loc)) {
 		return []byte{}, -1
 	}

-	if util.IsNonWordChar(b.RuneAt(c.Loc.Move(-1, b))) {
+	if util.IsNonAlphaNumeric(b.RuneAt(c.Loc)) {
 		return []byte{}, c.X
 	}

-	args := bytes.FieldsFunc(l, util.IsNonWordChar)
+	args := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 	input := args[len(args)-1]
-	return input, c.X - util.CharacterCount(input)
+	return input, c.X - utf8.RuneCount(input)
 }

 // GetArg gets the most recent word (separated by ' ' only)
-func (b *Buffer) GetArg() (string, int) {
+func GetArg(b *Buffer) (string, int) {
 	c := b.GetActiveCursor()
 	l := b.LineBytes(c.Y)
 	l = util.SliceStart(l, c.X)
@@ -95,7 +98,7 @@ func (b *Buffer) GetArg() (string, int) {
 		if i == len(args)-1 {
 			break
 		}
-		argstart += util.CharacterCount(a) + 1
+		argstart += utf8.RuneCount(a) + 1
 	}

 	return input, argstart
@@ -104,20 +107,20 @@ func (b *Buffer) GetArg() (string, int) {
 // FileComplete autocompletes filenames
 func FileComplete(b *Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetArg()
+	input, argstart := GetArg(b)

 	sep := string(os.PathSeparator)
 	dirs := strings.Split(input, sep)

-	var files []fs.DirEntry
+	var files []os.FileInfo
 	var err error
 	if len(dirs) > 1 {
 		directories := strings.Join(dirs[:len(dirs)-1], sep) + sep

 		directories, _ = util.ReplaceHome(directories)
-		files, err = os.ReadDir(directories)
+		files, err = ioutil.ReadDir(directories)
 	} else {
-		files, err = os.ReadDir(".")
+		files, err = ioutil.ReadDir(".")
 	}

 	if err != nil {
@@ -153,22 +156,22 @@ func FileComplete(b *Buffer) ([]string, []string) {
 // BufferComplete autocompletes based on previous words in the buffer
 func BufferComplete(b *Buffer) ([]string, []string) {
 	c := b.GetActiveCursor()
-	input, argstart := b.GetWord()
+	input, argstart := GetWord(b)

 	if argstart == -1 {
 		return []string{}, []string{}
 	}

-	inputLen := util.CharacterCount(input)
+	inputLen := utf8.RuneCount(input)

 	suggestionsSet := make(map[string]struct{})

 	var suggestions []string
 	for i := c.Y; i >= 0; i-- {
 		l := b.LineBytes(i)
-		words := bytes.FieldsFunc(l, util.IsNonWordChar)
+		words := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 		for _, w := range words {
-			if bytes.HasPrefix(w, input) && util.CharacterCount(w) > inputLen {
+			if bytes.HasPrefix(w, input) && utf8.RuneCount(w) > inputLen {
 				strw := string(w)
 				if _, ok := suggestionsSet[strw]; !ok {
 					suggestionsSet[strw] = struct{}{}
@@ -179,9 +182,9 @@ func BufferComplete(b *Buffer) ([]string, []string) {
 	}
 	for i := c.Y + 1; i < b.LinesNum(); i++ {
 		l := b.LineBytes(i)
-		words := bytes.FieldsFunc(l, util.IsNonWordChar)
+		words := bytes.FieldsFunc(l, util.IsNonAlphaNumeric)
 		for _, w := range words {
-			if bytes.HasPrefix(w, input) && util.CharacterCount(w) > inputLen {
+			if bytes.HasPrefix(w, input) && utf8.RuneCount(w) > inputLen {
 				strw := string(w)
 				if _, ok := suggestionsSet[strw]; !ok {
 					suggestionsSet[strw] = struct{}{}
--- a/internal/buffer/backup.go
+++ b/internal/buffer/backup.go
@@ -1,26 +1,23 @@
 package buffer

 import (
-	"errors"
 	"fmt"
-	"io/fs"
+	"io"
 	"os"
 	"path/filepath"
+	"time"

-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
+	"golang.org/x/text/encoding"
 )

-const BackupMsg = `A backup was detected for:
+const backupMsg = `A backup was detected for this file. This likely means that micro
+crashed while editing this file, or another instance of micro is currently
+editing this file.

-%s
-
-This likely means that micro crashed while editing this file,
-or another instance of micro is currently editing this file,
-or an error occurred while saving this file so it may be corrupted.
-
-The backup was created on %s and its path is:
+The backup was created on %s, and the file is

 %s

@@ -28,158 +25,92 @@ The backup was created on %s and its path is:
  When the buffer is closed, the backup will be removed.
 * 'ignore' will ignore the backup, discarding its changes. The backup file
  will be removed.
-* 'abort' will abort the open operation, and instead open an empty buffer.

-Options: [r]ecover, [i]gnore, [a]bort: `
+Options: [r]ecover, [i]gnore: `

-const backupSeconds = 8
-
-type backupRequestType int
-
-const (
-	backupCreate = iota
-	backupRemove
-)
-
-type backupRequest struct {
-	buf     *SharedBuffer
-	reqType backupRequestType
-}
-
-var requestedBackups map[*SharedBuffer]bool
-
-func init() {
-	requestedBackups = make(map[*SharedBuffer]bool)
-}
-
-func (b *SharedBuffer) RequestBackup() {
-	backupRequestChan <- backupRequest{buf: b, reqType: backupCreate}
-}
-
-func (b *SharedBuffer) CancelBackup() {
-	backupRequestChan <- backupRequest{buf: b, reqType: backupRemove}
-}
-
-func handleBackupRequest(br backupRequest) {
-	switch br.reqType {
-	case backupCreate:
-		// schedule periodic backup
-		requestedBackups[br.buf] = true
-	case backupRemove:
-		br.buf.RemoveBackup()
-		delete(requestedBackups, br.buf)
-	}
-}
-
-func periodicBackup() {
-	for buf := range requestedBackups {
-		err := buf.Backup()
-		if err == nil {
-			delete(requestedBackups, buf)
-		}
-	}
-}
-
-func (b *SharedBuffer) backupDir() string {
-	backupdir, err := util.ReplaceHome(b.Settings["backupdir"].(string))
-	if backupdir == "" || err != nil {
-		backupdir = filepath.Join(config.ConfigDir, "backups")
-	}
-	return backupdir
-}
-
-func (b *SharedBuffer) keepBackup() bool {
-	return b.forceKeepBackup || b.Settings["permbackup"].(bool)
-}
-
-func (b *SharedBuffer) writeBackup(path string) (string, string, error) {
-	backupdir := b.backupDir()
-	if _, err := os.Stat(backupdir); err != nil {
-		if !errors.Is(err, fs.ErrNotExist) {
-			return "", "", err
-		}
-		if err = os.Mkdir(backupdir, os.ModePerm); err != nil {
-			return "", "", err
-		}
-	}
-
-	name, resolveName := util.DetermineEscapePath(backupdir, path)
-	tmp := name + util.BackupSuffix
-
-	_, err := b.overwriteFile(tmp)
-	if err != nil {
-		os.Remove(tmp)
-		return name, resolveName, err
-	}
-	err = os.Rename(tmp, name)
-	if err != nil {
-		os.Remove(tmp)
-		return name, resolveName, err
-	}
-
-	if resolveName != "" {
-		err = util.SafeWrite(resolveName, []byte(path), true)
-		if err != nil {
-			return name, resolveName, err
-		}
-	}
-
-	return name, resolveName, nil
-}
-
-func (b *SharedBuffer) removeBackup(path string, resolveName string) {
-	os.Remove(path)
-	if resolveName != "" {
-		os.Remove(resolveName)
-	}
-}
-
-// Backup saves the buffer to the backups directory
-func (b *SharedBuffer) Backup() error {
+// Backup saves the current buffer to ConfigDir/backups
+func (b *Buffer) Backup(checkTime bool) error {
 	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return nil
 	}

-	_, _, err := b.writeBackup(b.AbsPath)
+	if checkTime {
+		sub := time.Now().Sub(b.lastbackup)
+		if sub < time.Duration(backupTime)*time.Millisecond {
+			return nil
+		}
+	}
+
+	b.lastbackup = time.Now()
+
+	backupdir := filepath.Join(config.ConfigDir, "backups")
+	if _, err := os.Stat(backupdir); os.IsNotExist(err) {
+		os.Mkdir(backupdir, os.ModePerm)
+	}
+
+	name := filepath.Join(backupdir, util.EscapePath(b.AbsPath))
+
+	err := overwriteFile(name, encoding.Nop, func(file io.Writer) (e error) {
+		if len(b.lines) == 0 {
+			return
+		}
+
+		// end of line
+		eol := []byte{'\n'}
+
+		// write lines
+		if _, e = file.Write(b.lines[0].data); e != nil {
+			return
+		}
+
+		for _, l := range b.lines[1:] {
+			if _, e = file.Write(eol); e != nil {
+				return
+			}
+			if _, e = file.Write(l.data); e != nil {
+				return
+			}
+		}
+		return
+	}, false)
+
 	return err
 }

 // RemoveBackup removes any backup file associated with this buffer
-func (b *SharedBuffer) RemoveBackup() {
-	if b.keepBackup() || b.Path == "" || b.Type != BTDefault {
+func (b *Buffer) RemoveBackup() {
+	if !b.Settings["backup"].(bool) || b.Path == "" || b.Type != BTDefault {
 		return
 	}
-	f, resolveName := util.DetermineEscapePath(b.backupDir(), b.AbsPath)
-	b.removeBackup(f, resolveName)
+	f := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
+	os.Remove(f)
 }

 // ApplyBackup applies the corresponding backup file to this buffer (if one exists)
 // Returns true if a backup was applied
-func (b *SharedBuffer) ApplyBackup(fsize int64) (bool, bool) {
-	if b.Settings["backup"].(bool) && !b.Settings["permbackup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
-		backupfile, resolveName := util.DetermineEscapePath(b.backupDir(), b.AbsPath)
+func (b *Buffer) ApplyBackup(fsize int64) bool {
+	if b.Settings["backup"].(bool) && len(b.Path) > 0 && b.Type == BTDefault {
+		backupfile := filepath.Join(config.ConfigDir, "backups", util.EscapePath(b.AbsPath))
 		if info, err := os.Stat(backupfile); err == nil {
 			backup, err := os.Open(backupfile)
 			if err == nil {
 				defer backup.Close()
 				t := info.ModTime()
-				msg := fmt.Sprintf(BackupMsg, b.Path, t.Format("Mon Jan _2 at 15:04, 2006"), backupfile)
-				choice := screen.TermPrompt(msg, []string{"r", "i", "a", "recover", "ignore", "abort"}, true)
+				msg := fmt.Sprintf(backupMsg, t.Format("Mon Jan _2 at 15:04, 2006"), util.EscapePath(b.AbsPath))
+				choice := screen.TermPrompt(msg, []string{"r", "i", "recover", "ignore"}, true)

-				if choice%3 == 0 {
+				if choice%2 == 0 {
 					// recover
 					b.LineArray = NewLineArray(uint64(fsize), FFAuto, backup)
-					b.setModified()
-					return true, true
-				} else if choice%3 == 1 {
+					b.isModified = true
+					return true
+				} else if choice%2 == 1 {
 					// delete
-					b.removeBackup(backupfile, resolveName)
-				} else if choice%3 == 2 {
-					return false, false
+					os.Remove(backupfile)
 				}
 			}
 		}
 	}

-	return false, true
+	return false
 }
--- a/internal/buffer/buffer.go
+++ b/internal/buffer/buffer.go
--- a/internal/buffer/buffer_generated_test.go
+++ b/internal/buffer/buffer_generated_test.go
--- a/internal/buffer/buffer_test.go
+++ b/internal/buffer/buffer_test.go
@@ -1,323 +0,0 @@
-package buffer
-
-import (
-	"math/rand"
-	"strings"
-	"testing"
-
-	"github.com/micro-editor/micro/v2/internal/config"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/stretchr/testify/assert"
-	lua "github.com/yuin/gopher-lua"
-)
-
-type operation struct {
-	start Loc
-	end   Loc
-	text  []string
-}
-
-func init() {
-	ulua.L = lua.NewState()
-	config.InitRuntimeFiles(false)
-	config.InitGlobalSettings()
-	config.GlobalSettings["backup"] = false
-	config.GlobalSettings["fastdirty"] = true
-}
-
-func check(t *testing.T, before []string, operations []operation, after []string) {
-	assert := assert.New(t)
-
-	b := NewBufferFromString(strings.Join(before, "\n"), "", BTDefault)
-
-	assert.NotEqual("", b.GetName())
-	assert.Equal(false, b.ExternallyModified())
-	assert.Equal(false, b.Modified())
-	assert.Equal(1, b.NumCursors())
-
-	checkText := func(lines []string) {
-		assert.Equal([]byte(strings.Join(lines, "\n")), b.Bytes())
-		assert.Equal(len(lines), b.LinesNum())
-		for i, s := range lines {
-			assert.Equal(s, b.Line(i))
-			assert.Equal([]byte(s), b.LineBytes(i))
-		}
-	}
-
-	checkText(before)
-
-	var cursors []*Cursor
-
-	for _, op := range operations {
-		cursor := NewCursor(b, op.start)
-		cursor.SetSelectionStart(op.start)
-		cursor.SetSelectionEnd(op.end)
-		b.AddCursor(cursor)
-		cursors = append(cursors, cursor)
-	}
-
-	assert.Equal(1+len(operations), b.NumCursors())
-
-	for i, op := range operations {
-		cursor := cursors[i]
-		b.SetCurCursor(cursor.Num)
-		cursor.DeleteSelection()
-		b.Insert(cursor.Loc, strings.Join(op.text, "\n"))
-	}
-
-	checkText(after)
-
-	// must have exactly two events per operation (delete and insert)
-	for range operations {
-		b.UndoOneEvent()
-		b.UndoOneEvent()
-	}
-
-	checkText(before)
-
-	for i, op := range operations {
-		cursor := cursors[i]
-		if op.start == op.end {
-			assert.Equal(op.start, cursor.Loc)
-		} else {
-			assert.Equal(op.start, cursor.CurSelection[0])
-			assert.Equal(op.end, cursor.CurSelection[1])
-		}
-	}
-
-	for range operations {
-		b.RedoOneEvent()
-		b.RedoOneEvent()
-	}
-
-	checkText(after)
-
-	b.Close()
-}
-
-const maxLineLength = 200
-
-var alphabet = []rune(" abcdeäم📚")
-
-func randomString(length int) string {
-	runes := make([]rune, length)
-	for i := range runes {
-		runes[i] = alphabet[rand.Intn(len(alphabet))]
-	}
-	return string(runes)
-}
-
-func randomText(nLines int) string {
-	lines := make([]string, nLines)
-	for i := range lines {
-		lines[i] = randomString(rand.Intn(maxLineLength + 1))
-	}
-	return strings.Join(lines, "\n")
-}
-
-func benchCreateAndClose(testingB *testing.B, nLines int) {
-	rand.Seed(int64(nLines))
-
-	text := randomText(nLines)
-
-	testingB.ResetTimer()
-
-	for i := 0; i < testingB.N; i++ {
-		b := NewBufferFromString(text, "", BTDefault)
-		b.Close()
-	}
-}
-
-func benchRead(testingB *testing.B, nLines int) {
-	rand.Seed(int64(nLines))
-
-	b := NewBufferFromString(randomText(nLines), "", BTDefault)
-
-	testingB.ResetTimer()
-
-	for i := 0; i < testingB.N; i++ {
-		b.Bytes()
-		for j := 0; j < b.LinesNum(); j++ {
-			b.Line(j)
-			b.LineBytes(j)
-		}
-	}
-
-	testingB.StopTimer()
-
-	b.Close()
-}
-
-func benchEdit(testingB *testing.B, nLines, nCursors int) {
-	rand.Seed(int64(nLines + nCursors))
-
-	b := NewBufferFromString(randomText(nLines), "", BTDefault)
-
-	regionSize := nLines / nCursors
-
-	operations := make([]operation, nCursors)
-	for i := range operations {
-		startLine := (i * regionSize) + rand.Intn(regionSize-5)
-		startColumn := rand.Intn(util.CharacterCountInString(b.Line(startLine)) + 1)
-		endLine := startLine + 1 + rand.Intn(5)
-		endColumn := rand.Intn(util.CharacterCountInString(b.Line(endLine)) + 1)
-
-		operations[i] = operation{
-			start: Loc{startColumn, startLine},
-			end:   Loc{endColumn, endLine},
-			text:  []string{randomText(2 + rand.Intn(4))},
-		}
-	}
-
-	testingB.ResetTimer()
-
-	for i := 0; i < testingB.N; i++ {
-		b.SetCursors([]*Cursor{})
-
-		var cursors []*Cursor
-
-		for _, op := range operations {
-			cursor := NewCursor(b, op.start)
-			cursor.SetSelectionStart(op.start)
-			cursor.SetSelectionEnd(op.end)
-			b.AddCursor(cursor)
-			cursors = append(cursors, cursor)
-		}
-
-		for j, op := range operations {
-			cursor := cursors[j]
-			b.SetCurCursor(cursor.Num)
-			cursor.DeleteSelection()
-			b.Insert(cursor.Loc, op.text[0])
-		}
-
-		for b.UndoStack.Peek() != nil {
-			b.UndoOneEvent()
-		}
-	}
-
-	testingB.StopTimer()
-
-	b.Close()
-}
-
-func BenchmarkCreateAndClose10Lines(b *testing.B) {
-	benchCreateAndClose(b, 10)
-}
-
-func BenchmarkCreateAndClose100Lines(b *testing.B) {
-	benchCreateAndClose(b, 100)
-}
-
-func BenchmarkCreateAndClose1000Lines(b *testing.B) {
-	benchCreateAndClose(b, 1000)
-}
-
-func BenchmarkCreateAndClose10000Lines(b *testing.B) {
-	benchCreateAndClose(b, 10000)
-}
-
-func BenchmarkCreateAndClose100000Lines(b *testing.B) {
-	benchCreateAndClose(b, 100000)
-}
-
-func BenchmarkCreateAndClose1000000Lines(b *testing.B) {
-	benchCreateAndClose(b, 1000000)
-}
-
-func BenchmarkRead10Lines(b *testing.B) {
-	benchRead(b, 10)
-}
-
-func BenchmarkRead100Lines(b *testing.B) {
-	benchRead(b, 100)
-}
-
-func BenchmarkRead1000Lines(b *testing.B) {
-	benchRead(b, 1000)
-}
-
-func BenchmarkRead10000Lines(b *testing.B) {
-	benchRead(b, 10000)
-}
-
-func BenchmarkRead100000Lines(b *testing.B) {
-	benchRead(b, 100000)
-}
-
-func BenchmarkRead1000000Lines(b *testing.B) {
-	benchRead(b, 1000000)
-}
-
-func BenchmarkEdit10Lines1Cursor(b *testing.B) {
-	benchEdit(b, 10, 1)
-}
-
-func BenchmarkEdit100Lines1Cursor(b *testing.B) {
-	benchEdit(b, 100, 1)
-}
-
-func BenchmarkEdit100Lines10Cursors(b *testing.B) {
-	benchEdit(b, 100, 10)
-}
-
-func BenchmarkEdit1000Lines1Cursor(b *testing.B) {
-	benchEdit(b, 1000, 1)
-}
-
-func BenchmarkEdit1000Lines10Cursors(b *testing.B) {
-	benchEdit(b, 1000, 10)
-}
-
-func BenchmarkEdit1000Lines100Cursors(b *testing.B) {
-	benchEdit(b, 1000, 100)
-}
-
-func BenchmarkEdit10000Lines1Cursor(b *testing.B) {
-	benchEdit(b, 10000, 1)
-}
-
-func BenchmarkEdit10000Lines10Cursors(b *testing.B) {
-	benchEdit(b, 10000, 10)
-}
-
-func BenchmarkEdit10000Lines100Cursors(b *testing.B) {
-	benchEdit(b, 10000, 100)
-}
-
-func BenchmarkEdit10000Lines1000Cursors(b *testing.B) {
-	benchEdit(b, 10000, 1000)
-}
-
-func BenchmarkEdit100000Lines1Cursor(b *testing.B) {
-	benchEdit(b, 100000, 1)
-}
-
-func BenchmarkEdit100000Lines10Cursors(b *testing.B) {
-	benchEdit(b, 100000, 10)
-}
-
-func BenchmarkEdit100000Lines100Cursors(b *testing.B) {
-	benchEdit(b, 100000, 100)
-}
-
-func BenchmarkEdit100000Lines1000Cursors(b *testing.B) {
-	benchEdit(b, 100000, 1000)
-}
-
-func BenchmarkEdit1000000Lines1Cursor(b *testing.B) {
-	benchEdit(b, 1000000, 1)
-}
-
-func BenchmarkEdit1000000Lines10Cursors(b *testing.B) {
-	benchEdit(b, 1000000, 10)
-}
-
-func BenchmarkEdit1000000Lines100Cursors(b *testing.B) {
-	benchEdit(b, 1000000, 100)
-}
-
-func BenchmarkEdit1000000Lines1000Cursors(b *testing.B) {
-	benchEdit(b, 1000000, 1000)
-}
--- a/internal/buffer/cursor.go
+++ b/internal/buffer/cursor.go
@@ -1,13 +1,15 @@
 package buffer

 import (
-	"github.com/micro-editor/micro/v2/internal/clipboard"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"unicode/utf8"
+
+	"github.com/zyedidia/clipboard"
+	"github.com/zyedidia/micro/internal/util"
 )

 // InBounds returns whether the given location is a valid character position in the given buffer
 func InBounds(pos Loc, buf *Buffer) bool {
-	if pos.Y < 0 || pos.Y >= len(buf.lines) || pos.X < 0 || pos.X > util.CharacterCount(buf.LineBytes(pos.Y)) {
+	if pos.Y < 0 || pos.Y >= len(buf.lines) || pos.X < 0 || pos.X > utf8.RuneCount(buf.LineBytes(pos.Y)) {
 		return false
 	}

@@ -20,14 +22,8 @@ type Cursor struct {
 	buf *Buffer
 	Loc

-	// Last visual x position of the cursor. Used in cursor up/down movements
-	// for remembering the original x position when moving to a line that is
-	// shorter than current x position.
+	// Last cursor x position
 	LastVisualX int
-	// Similar to LastVisualX but takes softwrapping into account, i.e. last
-	// visual x position in a visual (wrapped) line on the screen, which may be
-	// different from the line in the buffer.
-	LastWrappedVisualX int

 	// The current selection as a range of character numbers (inclusive)
 	CurSelection [2]Loc
@@ -36,11 +32,6 @@ type Cursor struct {
 	// to know what the original selection was
 	OrigSelection [2]Loc

-	// The line number where a new trailing whitespace has been added
-	// or -1 if there is no new trailing whitespace at this cursor.
-	// This is used for checking if a trailing whitespace should be highlighted
-	NewTrailingWsY int
-
 	// Which cursor index is this (for multiple cursors)
 	Num int
 }
@@ -49,8 +40,6 @@ func NewCursor(b *Buffer, l Loc) *Cursor {
 	c := &Cursor{
 		buf: b,
 		Loc: l,
-
-		NewTrailingWsY: -1,
 	}
 	c.StoreVisualX()
 	return c
@@ -67,9 +56,8 @@ func (c *Cursor) Buf() *Buffer {
 // Goto puts the cursor at the given cursor's location and gives
 // the current cursor its selection too
 func (c *Cursor) Goto(b Cursor) {
-	c.X, c.Y = b.X, b.Y
+	c.X, c.Y, c.LastVisualX = b.X, b.Y, b.LastVisualX
 	c.OrigSelection, c.CurSelection = b.OrigSelection, b.CurSelection
-	c.StoreVisualX()
 }

 // GotoLoc puts the cursor at the given cursor's location and gives
@@ -80,11 +68,7 @@ func (c *Cursor) GotoLoc(l Loc) {
 }

 // GetVisualX returns the x value of the cursor in visual spaces
-func (c *Cursor) GetVisualX(wrap bool) int {
-	if wrap && c.buf.GetVisualX != nil {
-		return c.buf.GetVisualX(c.Loc)
-	}
-
+func (c *Cursor) GetVisualX() int {
 	if c.X <= 0 {
 		c.X = 0
 		return 0
@@ -92,6 +76,9 @@ func (c *Cursor) GetVisualX(wrap bool) int {

 	bytes := c.buf.LineBytes(c.Y)
 	tabsize := int(c.buf.Settings["tabsize"].(float64))
+	if c.X > utf8.RuneCount(bytes) {
+		c.X = utf8.RuneCount(bytes) - 1
+	}

 	return util.StringWidth(bytes, c.X, tabsize)
 }
@@ -107,7 +94,7 @@ func (c *Cursor) GetCharPosInLine(b []byte, visualPos int) int {
 // Start moves the cursor to the start of the line it is on
 func (c *Cursor) Start() {
 	c.X = 0
-	c.StoreVisualX()
+	c.LastVisualX = c.GetVisualX()
 }

 // StartOfText moves the cursor to the first non-whitespace rune of
@@ -115,38 +102,25 @@ func (c *Cursor) Start() {
 func (c *Cursor) StartOfText() {
 	c.Start()
 	for util.IsWhitespace(c.RuneUnder(c.X)) {
-		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
+		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
 			break
 		}
 		c.Right()
 	}
 }

-// IsStartOfText returns whether the cursor is at the first
-// non-whitespace rune of the line it is on
-func (c *Cursor) IsStartOfText() bool {
-	x := 0
-	for util.IsWhitespace(c.RuneUnder(x)) {
-		if x == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-			break
-		}
-		x++
-	}
-	return c.X == x
-}
-
 // End moves the cursor to the end of the line it is on
 func (c *Cursor) End() {
-	c.X = util.CharacterCount(c.buf.LineBytes(c.Y))
-	c.StoreVisualX()
+	c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
+	c.LastVisualX = c.GetVisualX()
 }

 // CopySelection copies the user's selection to either "primary"
 // or "clipboard"
-func (c *Cursor) CopySelection(target clipboard.Register) {
+func (c *Cursor) CopySelection(target string) {
 	if c.HasSelection() {
-		if target != clipboard.PrimaryReg || c.buf.Settings["useprimary"].(bool) {
-			clipboard.WriteMulti(string(c.GetSelection()), target, c.Num, c.buf.NumCursors())
+		if target != "primary" || c.buf.Settings["useprimary"].(bool) {
+			clipboard.WriteAll(string(c.GetSelection()), target)
 		}
 	}
 }
@@ -193,7 +167,7 @@ func (c *Cursor) Deselect(start bool) {
 		if start {
 			c.Loc = c.CurSelection[0]
 		} else {
-			c.Loc = c.CurSelection[1]
+			c.Loc = c.CurSelection[1].Move(-1, c.buf)
 		}
 		c.ResetSelection()
 		c.StoreVisualX()
@@ -255,14 +229,8 @@ func (c *Cursor) UpN(amount int) {
 	bytes := c.buf.LineBytes(proposedY)
 	c.X = c.GetCharPosInLine(bytes, c.LastVisualX)

-	if c.X > util.CharacterCount(bytes) || (amount < 0 && proposedY == c.Y) {
-		c.X = util.CharacterCount(bytes)
-		c.StoreVisualX()
-	}
-
-	if c.X < 0 || (amount > 0 && proposedY == c.Y) {
-		c.X = 0
-		c.StoreVisualX()
+	if c.X > utf8.RuneCount(bytes) || (amount < 0 && proposedY == c.Y) {
+		c.X = utf8.RuneCount(bytes)
 	}

 	c.Y = proposedY
@@ -304,7 +272,7 @@ func (c *Cursor) Right() {
 	if c.Loc == c.buf.End() {
 		return
 	}
-	if c.X < util.CharacterCount(c.buf.LineBytes(c.Y)) {
+	if c.X < utf8.RuneCount(c.buf.LineBytes(c.Y)) {
 		c.X++
 	} else {
 		c.Down()
@@ -325,8 +293,8 @@ func (c *Cursor) Relocate() {

 	if c.X < 0 {
 		c.X = 0
-	} else if c.X > util.CharacterCount(c.buf.LineBytes(c.Y)) {
-		c.X = util.CharacterCount(c.buf.LineBytes(c.Y))
+	} else if c.X > utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+		c.X = utf8.RuneCount(c.buf.LineBytes(c.Y))
 	}
 }

@@ -352,7 +320,7 @@ func (c *Cursor) SelectWord() {
 	c.SetSelectionStart(Loc{backward, c.Y})
 	c.OrigSelection[0] = c.CurSelection[0]

-	lineLen := util.CharacterCount(c.buf.LineBytes(c.Y)) - 1
+	lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
 	for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
 		forward++
 	}
@@ -384,7 +352,7 @@ func (c *Cursor) AddWordToSelection() {
 	if c.Loc.GreaterThan(c.OrigSelection[1]) {
 		forward := c.X

-		lineLen := util.CharacterCount(c.buf.LineBytes(c.Y)) - 1
+		lineLen := utf8.RuneCount(c.buf.LineBytes(c.Y)) - 1
 		for forward < lineLen && util.IsWordChar(c.RuneUnder(forward+1)) {
 			forward++
 		}
@@ -410,29 +378,16 @@ func (c *Cursor) SelectTo(loc Loc) {

 // WordRight moves the cursor one word to the right
 func (c *Cursor) WordRight() {
-	if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-		c.Right()
-		return
-	}
 	for util.IsWhitespace(c.RuneUnder(c.X)) {
-		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
+		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
+			c.Right()
 			return
 		}
 		c.Right()
 	}
-	if util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) &&
-		util.IsNonWordChar(c.RuneUnder(c.X+1)) {
-		for util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-		return
-	}
 	c.Right()
 	for util.IsWordChar(c.RuneUnder(c.X)) {
-		if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
+		if c.X == utf8.RuneCount(c.buf.LineBytes(c.Y)) {
 			return
 		}
 		c.Right()
@@ -441,10 +396,6 @@ func (c *Cursor) WordRight() {

 // WordLeft moves the cursor one word to the left
 func (c *Cursor) WordLeft() {
-	if c.X == 0 {
-		c.Left()
-		return
-	}
 	c.Left()
 	for util.IsWhitespace(c.RuneUnder(c.X)) {
 		if c.X == 0 {
@@ -452,17 +403,6 @@ func (c *Cursor) WordLeft() {
 		}
 		c.Left()
 	}
-	if util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) &&
-		util.IsNonWordChar(c.RuneUnder(c.X-1)) {
-		for util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		c.Right()
-		return
-	}
 	c.Left()
 	for util.IsWordChar(c.RuneUnder(c.X)) {
 		if c.X == 0 {
@@ -473,143 +413,17 @@ func (c *Cursor) WordLeft() {
 	c.Right()
 }

-// SubWordRight moves the cursor one sub-word to the right
-func (c *Cursor) SubWordRight() {
-	if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-		c.Right()
-		return
-	}
-	if util.IsWhitespace(c.RuneUnder(c.X)) {
-		for util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-		return
-	}
-	if util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-		for util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-		return
-	}
-	if util.IsSubwordDelimiter(c.RuneUnder(c.X)) {
-		for util.IsSubwordDelimiter(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-		if util.IsWhitespace(c.RuneUnder(c.X)) {
-			return
-		}
-	}
-	if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-		return
-	}
-	if util.IsUpperLetter(c.RuneUnder(c.X)) &&
-		util.IsUpperLetter(c.RuneUnder(c.X+1)) {
-		for util.IsUpperAlphanumeric(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-		if util.IsLowerAlphanumeric(c.RuneUnder(c.X)) {
-			c.Left()
-		}
-	} else {
-		c.Right()
-		for util.IsLowerAlphanumeric(c.RuneUnder(c.X)) {
-			if c.X == util.CharacterCount(c.buf.LineBytes(c.Y)) {
-				return
-			}
-			c.Right()
-		}
-	}
-}
-
-// SubWordLeft moves the cursor one sub-word to the left
-func (c *Cursor) SubWordLeft() {
-	if c.X == 0 {
-		c.Left()
-		return
-	}
-	c.Left()
-	if util.IsWhitespace(c.RuneUnder(c.X)) {
-		for util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		c.Right()
-		return
-	}
-	if util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-		for util.IsNonWordChar(c.RuneUnder(c.X)) && !util.IsWhitespace(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		c.Right()
-		return
-	}
-	if util.IsSubwordDelimiter(c.RuneUnder(c.X)) {
-		for util.IsSubwordDelimiter(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		if util.IsWhitespace(c.RuneUnder(c.X)) {
-			c.Right()
-			return
-		}
-	}
-	if c.X == 0 {
-		return
-	}
-	if util.IsUpperLetter(c.RuneUnder(c.X)) &&
-		util.IsUpperLetter(c.RuneUnder(c.X-1)) {
-		for util.IsUpperAlphanumeric(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		if !util.IsUpperAlphanumeric(c.RuneUnder(c.X)) {
-			c.Right()
-		}
-	} else {
-		for util.IsLowerAlphanumeric(c.RuneUnder(c.X)) {
-			if c.X == 0 {
-				return
-			}
-			c.Left()
-		}
-		if !util.IsAlphanumeric(c.RuneUnder(c.X)) {
-			c.Right()
-		}
-	}
-}
-
 // RuneUnder returns the rune under the given x position
 func (c *Cursor) RuneUnder(x int) rune {
 	line := c.buf.LineBytes(c.Y)
-	if len(line) == 0 || x >= util.CharacterCount(line) {
+	if len(line) == 0 || x >= utf8.RuneCount(line) {
 		return '\n'
 	} else if x < 0 {
 		x = 0
 	}
 	i := 0
 	for len(line) > 0 {
-		r, _, size := util.DecodeCharacter(line)
+		r, size := utf8.DecodeRune(line)
 		line = line[size:]

 		if i == x {
@@ -622,6 +436,5 @@ func (c *Cursor) RuneUnder(x int) rune {
 }

 func (c *Cursor) StoreVisualX() {
-	c.LastVisualX = c.GetVisualX(false)
-	c.LastWrappedVisualX = c.GetVisualX(true)
+	c.LastVisualX = c.GetVisualX()
 }
--- a/internal/buffer/eventhandler.go
+++ b/internal/buffer/eventhandler.go
@@ -3,12 +3,12 @@ package buffer
 import (
 	"bytes"
 	"time"
+	"unicode/utf8"

-	"github.com/micro-editor/micro/v2/internal/config"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
 	dmp "github.com/sergi/go-diff/diffmatchpatch"
+	"github.com/zyedidia/micro/internal/config"
+	ulua "github.com/zyedidia/micro/internal/lua"
+	"github.com/zyedidia/micro/internal/screen"
 	luar "layeh.com/gopher-luar"
 )

@@ -41,77 +41,6 @@ type Delta struct {
 	End   Loc
 }

-// DoTextEvent runs a text event
-func (eh *EventHandler) DoTextEvent(t *TextEvent, useUndo bool) {
-	oldl := eh.buf.LinesNum()
-
-	if useUndo {
-		eh.Execute(t)
-	} else {
-		ExecuteTextEvent(t, eh.buf)
-	}
-
-	if len(t.Deltas) != 1 {
-		return
-	}
-
-	text := t.Deltas[0].Text
-	start := t.Deltas[0].Start
-	lastnl := -1
-	var endX int
-	var textX int
-	if t.EventType == TextEventInsert {
-		linecount := eh.buf.LinesNum() - oldl
-		textcount := util.CharacterCount(text)
-		lastnl = bytes.LastIndex(text, []byte{'\n'})
-		if lastnl >= 0 {
-			endX = util.CharacterCount(text[lastnl+1:])
-			textX = endX
-		} else {
-			endX = start.X + textcount
-			textX = textcount
-		}
-		t.Deltas[0].End = clamp(Loc{endX, start.Y + linecount}, eh.buf.LineArray)
-	}
-	end := t.Deltas[0].End
-
-	for _, c := range eh.cursors {
-		move := func(loc Loc) Loc {
-			if t.EventType == TextEventInsert {
-				if start.Y != loc.Y && loc.GreaterThan(start) {
-					loc.Y += end.Y - start.Y
-				} else if loc.Y == start.Y && loc.GreaterEqual(start) {
-					loc.Y += end.Y - start.Y
-					if lastnl >= 0 {
-						loc.X += textX - start.X
-					} else {
-						loc.X += textX
-					}
-				}
-				return loc
-			} else {
-				if loc.Y != end.Y && loc.GreaterThan(end) {
-					loc.Y -= end.Y - start.Y
-				} else if loc.Y == end.Y && loc.GreaterEqual(end) {
-					loc = loc.MoveLA(-DiffLA(start, end, eh.buf.LineArray), eh.buf.LineArray)
-				}
-				return loc
-			}
-		}
-		c.Loc = move(c.Loc)
-		c.CurSelection[0] = move(c.CurSelection[0])
-		c.CurSelection[1] = move(c.CurSelection[1])
-		c.OrigSelection[0] = move(c.OrigSelection[0])
-		c.OrigSelection[1] = move(c.OrigSelection[1])
-		c.Relocate()
-		c.StoreVisualX()
-	}
-
-	if useUndo {
-		eh.updateTrailingWs(t)
-	}
-}
-
 // ExecuteTextEvent runs a text event
 func ExecuteTextEvent(t *TextEvent, buf *SharedBuffer) {
 	if t.EventType == TextEventInsert {
@@ -127,7 +56,7 @@ func ExecuteTextEvent(t *TextEvent, buf *SharedBuffer) {
 			t.Deltas[i].Text = buf.remove(d.Start, d.End)
 			buf.insert(d.Start, d.Text)
 			t.Deltas[i].Start = d.Start
-			t.Deltas[i].End = Loc{d.Start.X + util.CharacterCount(d.Text), d.Start.Y}
+			t.Deltas[i].End = Loc{d.Start.X + utf8.RuneCount(d.Text), d.Start.Y}
 		}
 		for i, j := 0, len(t.Deltas)-1; i < j; i, j = i+1, j-1 {
 			t.Deltas[i], t.Deltas[j] = t.Deltas[j], t.Deltas[i]
@@ -136,9 +65,9 @@ func ExecuteTextEvent(t *TextEvent, buf *SharedBuffer) {
 }

 // UndoTextEvent undoes a text event
-func (eh *EventHandler) UndoTextEvent(t *TextEvent) {
+func UndoTextEvent(t *TextEvent, buf *SharedBuffer) {
 	t.EventType = -t.EventType
-	eh.DoTextEvent(t, false)
+	ExecuteTextEvent(t, buf)
 }

 // EventHandler executes text manipulations and allows undoing and redoing
@@ -170,12 +99,12 @@ func (eh *EventHandler) ApplyDiff(new string) {
 	loc := eh.buf.Start()
 	for _, d := range diff {
 		if d.Type == dmp.DiffDelete {
-			eh.Remove(loc, loc.MoveLA(util.CharacterCountInString(d.Text), eh.buf.LineArray))
+			eh.Remove(loc, loc.MoveLA(utf8.RuneCountInString(d.Text), eh.buf.LineArray))
 		} else {
 			if d.Type == dmp.DiffInsert {
 				eh.Insert(loc, d.Text)
 			}
-			loc = loc.MoveLA(util.CharacterCountInString(d.Text), eh.buf.LineArray)
+			loc = loc.MoveLA(utf8.RuneCountInString(d.Text), eh.buf.LineArray)
 		}
 	}
 }
@@ -188,9 +117,6 @@ func (eh *EventHandler) Insert(start Loc, textStr string) {

 // InsertBytes creates an insert text event and executes it
 func (eh *EventHandler) InsertBytes(start Loc, text []byte) {
-	if len(text) == 0 {
-		return
-	}
 	start = clamp(start, eh.buf.LineArray)
 	e := &TextEvent{
 		C:         *eh.cursors[eh.active],
@@ -198,14 +124,50 @@ func (eh *EventHandler) InsertBytes(start Loc, text []byte) {
 		Deltas:    []Delta{{text, start, Loc{0, 0}}},
 		Time:      time.Now(),
 	}
-	eh.DoTextEvent(e, true)
+	oldl := eh.buf.LinesNum()
+	eh.Execute(e)
+	linecount := eh.buf.LinesNum() - oldl
+	textcount := utf8.RuneCount(text)
+	lastnl := bytes.LastIndex(text, []byte{'\n'})
+	var endX int
+	var textX int
+	if lastnl >= 0 {
+		endX = utf8.RuneCount(text[lastnl+1:])
+		textX = endX
+	} else {
+		endX = start.X + textcount
+		textX = textcount
+	}
+
+	e.Deltas[0].End = clamp(Loc{endX, start.Y + linecount}, eh.buf.LineArray)
+	end := e.Deltas[0].End
+
+	for _, c := range eh.cursors {
+		move := func(loc Loc) Loc {
+			if start.Y != end.Y && loc.GreaterThan(start) {
+				loc.Y += end.Y - start.Y
+			} else if loc.Y == start.Y && loc.GreaterEqual(start) {
+				loc.Y += end.Y - start.Y
+				if lastnl >= 0 {
+					loc.X = textX
+				} else {
+					loc.X += textX
+				}
+			}
+			return loc
+		}
+		c.Loc = move(c.Loc)
+		c.Relocate()
+		c.CurSelection[0] = move(c.CurSelection[0])
+		c.CurSelection[1] = move(c.CurSelection[1])
+		c.OrigSelection[0] = move(c.OrigSelection[0])
+		c.OrigSelection[1] = move(c.OrigSelection[1])
+		c.LastVisualX = c.GetVisualX()
+	}
 }

 // Remove creates a remove text event and executes it
 func (eh *EventHandler) Remove(start, end Loc) {
-	if start == end {
-		return
-	}
 	start = clamp(start, eh.buf.LineArray)
 	end = clamp(end, eh.buf.LineArray)
 	e := &TextEvent{
@@ -214,7 +176,24 @@ func (eh *EventHandler) Remove(start, end Loc) {
 		Deltas:    []Delta{{[]byte{}, start, end}},
 		Time:      time.Now(),
 	}
-	eh.DoTextEvent(e, true)
+	eh.Execute(e)
+
+	for _, c := range eh.cursors {
+		move := func(loc Loc) Loc {
+			if start.Y != end.Y && loc.GreaterThan(end) {
+				loc.Y -= end.Y - start.Y
+			} else if loc.Y == end.Y && loc.GreaterEqual(end) {
+				loc = loc.MoveLA(-DiffLA(start, end, eh.buf.LineArray), eh.buf.LineArray)
+			}
+			return loc
+		}
+		c.Loc = move(c.Loc)
+		c.CurSelection[0] = move(c.CurSelection[0])
+		c.CurSelection[1] = move(c.CurSelection[1])
+		c.OrigSelection[0] = move(c.OrigSelection[0])
+		c.OrigSelection[1] = move(c.OrigSelection[1])
+		c.LastVisualX = c.GetVisualX()
+	}
 }

 // MultipleReplace creates an multiple insertions executes them
@@ -241,7 +220,7 @@ func (eh *EventHandler) Execute(t *TextEvent) {
 	}
 	eh.UndoStack.Push(t)

-	b, err := config.RunPluginFnBool(nil, "onBeforeTextEvent", luar.New(ulua.L, eh.buf), luar.New(ulua.L, t))
+	b, err := config.RunPluginFnBool("onBeforeTextEvent", luar.New(ulua.L, eh.buf), luar.New(ulua.L, t))
 	if err != nil {
 		screen.TermMessage(err)
 	}
@@ -253,11 +232,11 @@ func (eh *EventHandler) Execute(t *TextEvent) {
 	ExecuteTextEvent(t, eh.buf)
 }

-// Undo the first event in the undo stack. Returns false if the stack is empty.
-func (eh *EventHandler) Undo() bool {
+// Undo the first event in the undo stack
+func (eh *EventHandler) Undo() {
 	t := eh.UndoStack.Peek()
 	if t == nil {
-		return false
+		return
 	}

 	startTime := t.Time.UnixNano() / int64(time.Millisecond)
@@ -266,16 +245,15 @@ func (eh *EventHandler) Undo() bool {
 	for {
 		t = eh.UndoStack.Peek()
 		if t == nil {
-			break
+			return
 		}

 		if t.Time.UnixNano()/int64(time.Millisecond) < endTime {
-			break
+			return
 		}

 		eh.UndoOneEvent()
 	}
-	return true
 }

 // UndoOneEvent undoes one event
@@ -286,25 +264,29 @@ func (eh *EventHandler) UndoOneEvent() {
 	if t == nil {
 		return
 	}
+
 	// Undo it
 	// Modifies the text event
-	eh.UndoTextEvent(t)
+	UndoTextEvent(t, eh.buf)

 	// Set the cursor in the right place
-	if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
-		eh.cursors[t.C.Num].Goto(t.C)
-		eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
+	teCursor := t.C
+	if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
+		t.C = *eh.cursors[teCursor.Num]
+		eh.cursors[teCursor.Num].Goto(teCursor)
+	} else {
+		teCursor.Num = -1
 	}

 	// Push it to the redo stack
 	eh.RedoStack.Push(t)
 }

-// Redo the first event in the redo stack. Returns false if the stack is empty.
-func (eh *EventHandler) Redo() bool {
+// Redo the first event in the redo stack
+func (eh *EventHandler) Redo() {
 	t := eh.RedoStack.Peek()
 	if t == nil {
-		return false
+		return
 	}

 	startTime := t.Time.UnixNano() / int64(time.Millisecond)
@@ -313,16 +295,15 @@ func (eh *EventHandler) Redo() bool {
 	for {
 		t = eh.RedoStack.Peek()
 		if t == nil {
-			break
+			return
 		}

 		if t.Time.UnixNano()/int64(time.Millisecond) > endTime {
-			break
+			return
 		}

 		eh.RedoOneEvent()
 	}
-	return true
 }

 // RedoOneEvent redoes one event
@@ -332,68 +313,16 @@ func (eh *EventHandler) RedoOneEvent() {
 		return
 	}

-	if t.C.Num >= 0 && t.C.Num < len(eh.cursors) {
-		eh.cursors[t.C.Num].Goto(t.C)
-		eh.cursors[t.C.Num].NewTrailingWsY = t.C.NewTrailingWsY
-	}
-
 	// Modifies the text event
-	eh.UndoTextEvent(t)
+	UndoTextEvent(t, eh.buf)
+
+	teCursor := t.C
+	if teCursor.Num >= 0 && teCursor.Num < len(eh.cursors) {
+		t.C = *eh.cursors[teCursor.Num]
+		eh.cursors[teCursor.Num].Goto(teCursor)
+	} else {
+		teCursor.Num = -1
+	}

 	eh.UndoStack.Push(t)
 }
-
-// updateTrailingWs updates the cursor's trailing whitespace status after a text event
-func (eh *EventHandler) updateTrailingWs(t *TextEvent) {
-	if len(t.Deltas) != 1 {
-		return
-	}
-	text := t.Deltas[0].Text
-	start := t.Deltas[0].Start
-	end := t.Deltas[0].End
-
-	c := eh.cursors[eh.active]
-	isEol := func(loc Loc) bool {
-		return loc.X == util.CharacterCount(eh.buf.LineBytes(loc.Y))
-	}
-	if t.EventType == TextEventInsert && c.Loc == end && isEol(end) {
-		var addedTrailingWs bool
-		addedAfterWs := false
-		addedWsOnly := false
-		if start.Y == end.Y {
-			addedTrailingWs = util.HasTrailingWhitespace(text)
-			addedWsOnly = util.IsBytesWhitespace(text)
-			addedAfterWs = start.X > 0 && util.IsWhitespace(c.buf.RuneAt(Loc{start.X - 1, start.Y}))
-		} else {
-			lastnl := bytes.LastIndex(text, []byte{'\n'})
-			addedTrailingWs = util.HasTrailingWhitespace(text[lastnl+1:])
-		}
-
-		if addedTrailingWs && !(addedAfterWs && addedWsOnly) {
-			c.NewTrailingWsY = c.Y
-		} else if !addedTrailingWs {
-			c.NewTrailingWsY = -1
-		}
-	} else if t.EventType == TextEventRemove && c.Loc == start && isEol(start) {
-		removedAfterWs := util.HasTrailingWhitespace(eh.buf.LineBytes(start.Y))
-		var removedWsOnly bool
-		if start.Y == end.Y {
-			removedWsOnly = util.IsBytesWhitespace(text)
-		} else {
-			firstnl := bytes.Index(text, []byte{'\n'})
-			removedWsOnly = util.IsBytesWhitespace(text[:firstnl])
-		}
-
-		if removedAfterWs && !removedWsOnly {
-			c.NewTrailingWsY = c.Y
-		} else if !removedAfterWs {
-			c.NewTrailingWsY = -1
-		}
-	} else if c.NewTrailingWsY != -1 && start.Y != end.Y && c.Loc.GreaterThan(start) &&
-		((t.EventType == TextEventInsert && c.Y == c.NewTrailingWsY+(end.Y-start.Y)) ||
-			(t.EventType == TextEventRemove && c.Y == c.NewTrailingWsY-(end.Y-start.Y))) {
-		// The cursor still has its new trailingws
-		// but its line number was shifted by insert or remove of lines above
-		c.NewTrailingWsY = c.Y
-	}
-}
--- a/internal/buffer/line_array.go
+++ b/internal/buffer/line_array.go
@@ -2,12 +2,11 @@ package buffer

 import (
 	"bufio"
-	"bytes"
 	"io"
 	"sync"
+	"unicode/utf8"

-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/micro/v2/pkg/highlight"
+	"github.com/zyedidia/micro/pkg/highlight"
 )

 // Finds the byte index of the nth rune in a byte slice
@@ -19,7 +18,7 @@ func runeToByteIndex(n int, txt []byte) int {
 	count := 0
 	i := 0
 	for len(txt) > 0 {
-		_, _, size := util.DecodeCharacter(txt)
+		_, size := utf8.DecodeRune(txt)

 		txt = txt[size:]
 		count += size
@@ -32,31 +31,15 @@ func runeToByteIndex(n int, txt []byte) int {
 	return count
 }

-// A searchState contains the search match info for a single line
-type searchState struct {
-	search     string
-	useRegex   bool
-	ignorecase bool
-	match      [][2]int
-	done       bool
-}
-
 // A Line contains the data in bytes as well as a highlight state, match
 // and a flag for whether the highlighting needs to be updated
 type Line struct {
 	data []byte

-	state highlight.State
-	match highlight.LineMatch
-	lock  sync.Mutex
-
-	// The search states for the line, used for highlighting of search matches,
-	// separately from the syntax highlighting.
-	// A map is used because the line array may be shared between multiple buffers
-	// (multiple instances of the same file opened in different edit panes)
-	// which have distinct searches, so in the general case there are multiple
-	// searches per a line, one search per a Buffer containing this line.
-	search map[*Buffer]*searchState
+	state       highlight.State
+	match       highlight.LineMatch
+	rehighlight bool
+	lock        sync.Mutex
 }

 const (
@@ -74,7 +57,6 @@ type LineArray struct {
 	lines    []Line
 	Endings  FileFormat
 	initsize uint64
-	lock     sync.Mutex
 }

 // Append efficiently appends lines together
@@ -104,8 +86,6 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 	br := bufio.NewReader(reader)
 	var loaded int

-	la.Endings = endings
-
 	n := 0
 	for {
 		data, err := br.ReadBytes('\n')
@@ -116,12 +96,12 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 		dlen := len(data)
 		if dlen > 1 && data[dlen-2] == '\r' {
 			data = append(data[:dlen-2], '\n')
-			if la.Endings == FFAuto {
+			if endings == FFAuto {
 				la.Endings = FFDos
 			}
 			dlen = len(data)
 		} else if dlen > 0 {
-			if la.Endings == FFAuto {
+			if endings == FFAuto {
 				la.Endings = FFUnix
 			}
 		}
@@ -147,18 +127,20 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 		if err != nil {
 			if err == io.EOF {
 				la.lines = Append(la.lines, Line{
-					data:  data,
-					state: nil,
-					match: nil,
+					data:        data[:],
+					state:       nil,
+					match:       nil,
+					rehighlight: false,
 				})
 			}
 			// Last line was read
 			break
 		} else {
 			la.lines = Append(la.lines, Line{
-				data:  data[:dlen-1],
-				state: nil,
-				match: nil,
+				data:        data[:dlen-1],
+				state:       nil,
+				match:       nil,
+				rehighlight: false,
 			})
 		}
 		n++
@@ -170,52 +152,44 @@ func NewLineArray(size uint64, endings FileFormat, reader io.Reader) *LineArray
 // Bytes returns the string that should be written to disk when
 // the line array is saved
 func (la *LineArray) Bytes() []byte {
-	b := new(bytes.Buffer)
-	// initsize should provide a good estimate
-	b.Grow(int(la.initsize + 4096))
+	str := make([]byte, 0, la.initsize+1000) // initsize should provide a good estimate
 	for i, l := range la.lines {
-		b.Write(l.data)
+		str = append(str, l.data...)
 		if i != len(la.lines)-1 {
 			if la.Endings == FFDos {
-				b.WriteByte('\r')
+				str = append(str, '\r')
 			}
-			b.WriteByte('\n')
+			str = append(str, '\n')
 		}
 	}
-	return b.Bytes()
+	return str
 }

 // newlineBelow adds a newline below the given line number
 func (la *LineArray) newlineBelow(y int) {
 	la.lines = append(la.lines, Line{
-		data:  []byte{' '},
-		state: nil,
-		match: nil,
+		data:        []byte{' '},
+		state:       nil,
+		match:       nil,
+		rehighlight: false,
 	})
 	copy(la.lines[y+2:], la.lines[y+1:])
 	la.lines[y+1] = Line{
-		data:  []byte{},
-		state: la.lines[y].state,
-		match: nil,
+		data:        []byte{},
+		state:       la.lines[y].state,
+		match:       nil,
+		rehighlight: false,
 	}
 }

 // Inserts a byte array at a given location
 func (la *LineArray) insert(pos Loc, value []byte) {
-	la.lock.Lock()
-	defer la.lock.Unlock()
-
 	x, y := runeToByteIndex(pos.X, la.lines[pos.Y].data), pos.Y
 	for i := 0; i < len(value); i++ {
-		if value[i] == '\n' || (value[i] == '\r' && i < len(value)-1 && value[i+1] == '\n') {
+		if value[i] == '\n' {
 			la.split(Loc{x, y})
 			x = 0
 			y++
-
-			if value[i] == '\r' {
-				i++
-			}
-
 			continue
 		}
 		la.insertByte(Loc{x, y}, value[i])
@@ -232,26 +206,24 @@ func (la *LineArray) insertByte(pos Loc, value byte) {

 // joinLines joins the two lines a and b
 func (la *LineArray) joinLines(a, b int) {
-	la.lines[a].data = append(la.lines[a].data, la.lines[b].data...)
+	la.insert(Loc{len(la.lines[a].data), a}, la.lines[b].data)
 	la.deleteLine(b)
 }

 // split splits a line at a given position
 func (la *LineArray) split(pos Loc) {
 	la.newlineBelow(pos.Y)
-	la.lines[pos.Y+1].data = append(la.lines[pos.Y+1].data, la.lines[pos.Y].data[pos.X:]...)
+	la.insert(Loc{0, pos.Y + 1}, la.lines[pos.Y].data[pos.X:])
 	la.lines[pos.Y+1].state = la.lines[pos.Y].state
 	la.lines[pos.Y].state = nil
 	la.lines[pos.Y].match = nil
 	la.lines[pos.Y+1].match = nil
+	la.lines[pos.Y].rehighlight = true
 	la.deleteToEnd(Loc{pos.X, pos.Y})
 }

 // removes from start to end
 func (la *LineArray) remove(start, end Loc) []byte {
-	la.lock.Lock()
-	defer la.lock.Unlock()
-
 	sub := la.Substr(start, end)
 	startX := runeToByteIndex(start.X, la.lines[start.Y].data)
 	endX := runeToByteIndex(end.X, la.lines[end.Y].data)
@@ -285,6 +257,11 @@ func (la *LineArray) deleteLines(y1, y2 int) {
 	la.lines = la.lines[:y1+copy(la.lines[y1:], la.lines[y2+1:])]
 }

+// DeleteByte deletes the byte at a position
+func (la *LineArray) deleteByte(pos Loc) {
+	la.lines[pos.Y].data = la.lines[pos.Y].data[:pos.X+copy(la.lines[pos.Y].data[pos.X:], la.lines[pos.Y].data[pos.X+1:])]
+}
+
 // Substr returns the string representation between two locations
 func (la *LineArray) Substr(start, end Loc) []byte {
 	startX := runeToByteIndex(start.X, la.lines[start.Y].data)
@@ -319,15 +296,15 @@ func (la *LineArray) Start() Loc {
 // End returns the location of the last character in the buffer
 func (la *LineArray) End() Loc {
 	numlines := len(la.lines)
-	return Loc{util.CharacterCount(la.lines[numlines-1].data), numlines - 1}
+	return Loc{utf8.RuneCount(la.lines[numlines-1].data), numlines - 1}
 }

 // LineBytes returns line n as an array of bytes
-func (la *LineArray) LineBytes(lineN int) []byte {
-	if lineN >= len(la.lines) || lineN < 0 {
+func (la *LineArray) LineBytes(n int) []byte {
+	if n >= len(la.lines) || n < 0 {
 		return []byte{}
 	}
-	return la.lines[lineN].data
+	return la.lines[n].data
 }

 // State gets the highlight state for the given line number
@@ -358,88 +335,14 @@ func (la *LineArray) Match(lineN int) highlight.LineMatch {
 	return la.lines[lineN].match
 }

-// Locks the whole LineArray
-func (la *LineArray) Lock() {
-	la.lock.Lock()
+func (la *LineArray) Rehighlight(lineN int) bool {
+	la.lines[lineN].lock.Lock()
+	defer la.lines[lineN].lock.Unlock()
+	return la.lines[lineN].rehighlight
 }

-// Unlocks the whole LineArray
-func (la *LineArray) Unlock() {
-	la.lock.Unlock()
-}
-
-// SearchMatch returns true if the location `pos` is within a match
-// of the last search for the buffer `b`.
-// It is used for efficient highlighting of search matches (separately
-// from the syntax highlighting).
-// SearchMatch searches for the matches if it is called first time
-// for the given line or if the line was modified. Otherwise the
-// previously found matches are used.
-//
-// The buffer `b` needs to be passed because the line array may be shared
-// between multiple buffers (multiple instances of the same file opened
-// in different edit panes) which have distinct searches, so SearchMatch
-// needs to know which search to match against.
-func (la *LineArray) SearchMatch(b *Buffer, pos Loc) bool {
-	if b.LastSearch == "" {
-		return false
-	}
-
-	lineN := pos.Y
-	if la.lines[lineN].search == nil {
-		la.lines[lineN].search = make(map[*Buffer]*searchState)
-	}
-	s, ok := la.lines[lineN].search[b]
-	if !ok {
-		// Note: here is a small harmless leak: when the buffer `b` is closed,
-		// `s` is not deleted from the map. It means that the buffer
-		// will not be garbage-collected until the line array is garbage-collected,
-		// i.e. until all the buffers sharing this file are closed.
-		s = new(searchState)
-		la.lines[lineN].search[b] = s
-	}
-	if !ok || s.search != b.LastSearch || s.useRegex != b.LastSearchRegex ||
-		s.ignorecase != b.Settings["ignorecase"].(bool) {
-		s.search = b.LastSearch
-		s.useRegex = b.LastSearchRegex
-		s.ignorecase = b.Settings["ignorecase"].(bool)
-		s.done = false
-	}
-
-	if !s.done {
-		s.match = nil
-		start := Loc{0, lineN}
-		end := Loc{util.CharacterCount(la.lines[lineN].data), lineN}
-		for start.X < end.X {
-			m, found, _ := b.FindNext(b.LastSearch, start, end, start, true, b.LastSearchRegex)
-			if !found {
-				break
-			}
-			s.match = append(s.match, [2]int{m[0].X, m[1].X})
-
-			start.X = m[1].X
-			if m[1].X == m[0].X {
-				start.X = m[1].X + 1
-			}
-		}
-
-		s.done = true
-	}
-
-	for _, m := range s.match {
-		if pos.X >= m[0] && pos.X < m[1] {
-			return true
-		}
-	}
-	return false
-}
-
-// invalidateSearchMatches marks search matches for the given line as outdated.
-// It is called when the line is modified.
-func (la *LineArray) invalidateSearchMatches(lineN int) {
-	if la.lines[lineN].search != nil {
-		for _, s := range la.lines[lineN].search {
-			s.done = false
-		}
-	}
+func (la *LineArray) SetRehighlight(lineN int, on bool) {
+	la.lines[lineN].lock.Lock()
+	defer la.lines[lineN].lock.Unlock()
+	la.lines[lineN].rehighlight = on
 }
--- a/internal/buffer/line_array_test.go
+++ b/internal/buffer/line_array_test.go
@@ -46,15 +46,14 @@ func TestInsert(t *testing.T) {

 	assert.Equal(t, []byte("Uppen Sevarne staþe, foobar sel þar him þuhte,"), sub1)

-	la.insert(Loc{25, 2}, []byte("H̼̥̯͇͙̕͘͞e̸̦̞̠̣̰͙̼̥̦̼̖̬͕͕̰̯̫͇̕ĺ̜̠̩̯̯͙̼̭̠͕̮̞͜l̶͓̫̞̮͈͞ͅo̸͔͙̳̠͈̮̼̳͙̥̲͜͠"))
-
+	la.insert(Loc{25, 2}, []byte("ಮಣ್ಣಾಗಿ"))
 	sub2 := la.Substr(Loc{0, 2}, Loc{60, 2})
-	assert.Equal(t, []byte("He wonede at Ernleȝe at æH̼̥̯͇͙̕͘͞e̸̦̞̠̣̰͙̼̥̦̼̖̬͕͕̰̯̫͇̕ĺ̜̠̩̯̯͙̼̭̠͕̮̞͜l̶͓̫̞̮͈͞ͅo̸͔͙̳̠͈̮̼̳͙̥̲͜͠ðelen are chirechen,"), sub2)
+	assert.Equal(t, []byte("He wonede at Ernleȝe at æಮಣ್ಣಾಗಿðelen are chirechen,"), sub2)
 }

 func TestRemove(t *testing.T) {
 	la.remove(Loc{20, 3}, Loc{27, 3})
-	la.remove(Loc{25, 2}, Loc{30, 2})
+	la.remove(Loc{25, 2}, Loc{32, 2})

 	bytes := la.Bytes()
 	assert.Equal(t, unicode_txt, string(bytes))
--- a/internal/buffer/loc.go
+++ b/internal/buffer/loc.go
@@ -1,7 +1,9 @@
 package buffer

 import (
-	"github.com/micro-editor/micro/v2/internal/util"
+	"unicode/utf8"
+
+	"github.com/zyedidia/micro/internal/util"
 )

 // Loc stores a location
@@ -9,7 +11,7 @@ type Loc struct {
 	X, Y int
 }

-// LessThan returns true if l is smaller than b
+// LessThan returns true if b is smaller
 func (l Loc) LessThan(b Loc) bool {
 	if l.Y < b.Y {
 		return true
@@ -17,7 +19,7 @@ func (l Loc) LessThan(b Loc) bool {
 	return l.Y == b.Y && l.X < b.X
 }

-// GreaterThan returns true if l is bigger than b
+// GreaterThan returns true if b is bigger
 func (l Loc) GreaterThan(b Loc) bool {
 	if l.Y > b.Y {
 		return true
@@ -25,7 +27,7 @@ func (l Loc) GreaterThan(b Loc) bool {
 	return l.Y == b.Y && l.X > b.X
 }

-// GreaterEqual returns true if l is greater than or equal to b
+// GreaterEqual returns true if b is greater than or equal to b
 func (l Loc) GreaterEqual(b Loc) bool {
 	if l.Y > b.Y {
 		return true
@@ -36,7 +38,7 @@ func (l Loc) GreaterEqual(b Loc) bool {
 	return l == b
 }

-// LessEqual returns true if l is less than or equal to b
+// LessEqual returns true if b is less than or equal to b
 func (l Loc) LessEqual(b Loc) bool {
 	if l.Y < b.Y {
 		return true
@@ -47,16 +49,6 @@ func (l Loc) LessEqual(b Loc) bool {
 	return l == b
 }

-// Clamp clamps a loc between start and end
-func (l Loc) Clamp(start, end Loc) Loc {
-	if l.GreaterEqual(end) {
-		return end
-	} else if l.LessThan(start) {
-		return start
-	}
-	return l
-}
-
 // The following functions require a buffer to know where newlines are

 // Diff returns the distance between two locations
@@ -76,9 +68,9 @@ func DiffLA(a, b Loc, buf *LineArray) int {
 	loc := 0
 	for i := a.Y + 1; i < b.Y; i++ {
 		// + 1 for the newline
-		loc += util.CharacterCount(buf.LineBytes(i)) + 1
+		loc += utf8.RuneCount(buf.LineBytes(i)) + 1
 	}
-	loc += util.CharacterCount(buf.LineBytes(a.Y)) - a.X + b.X + 1
+	loc += utf8.RuneCount(buf.LineBytes(a.Y)) - a.X + b.X + 1
 	return loc
 }

@@ -88,7 +80,7 @@ func (l Loc) right(buf *LineArray) Loc {
 		return Loc{l.X + 1, l.Y}
 	}
 	var res Loc
-	if l.X < util.CharacterCount(buf.LineBytes(l.Y)) {
+	if l.X < utf8.RuneCount(buf.LineBytes(l.Y)) {
 		res = Loc{l.X + 1, l.Y}
 	} else {
 		res = Loc{0, l.Y + 1}
@@ -105,7 +97,7 @@ func (l Loc) left(buf *LineArray) Loc {
 	if l.X > 0 {
 		res = Loc{l.X - 1, l.Y}
 	} else {
-		res = Loc{util.CharacterCount(buf.LineBytes(l.Y - 1)), l.Y - 1}
+		res = Loc{utf8.RuneCount(buf.LineBytes(l.Y - 1)), l.Y - 1}
 	}
 	return res
 }
@@ -113,13 +105,14 @@ func (l Loc) left(buf *LineArray) Loc {
 // MoveLA moves the cursor n characters to the left or right
 // It moves the cursor left if n is negative
 func (l Loc) MoveLA(n int, buf *LineArray) Loc {
-	for n > 0 {
-		l = l.right(buf)
-		n--
+	if n > 0 {
+		for i := 0; i < n; i++ {
+			l = l.right(buf)
+		}
+		return l
 	}
-	for n < 0 {
+	for i := 0; i < util.Abs(n); i++ {
 		l = l.left(buf)
-		n++
 	}
 	return l
 }
@@ -148,5 +141,10 @@ func ByteOffset(pos Loc, buf *Buffer) int {

 // clamps a loc within a buffer
 func clamp(pos Loc, la *LineArray) Loc {
-	return pos.Clamp(la.Start(), la.End())
+	if pos.GreaterEqual(la.End()) {
+		return la.End()
+	} else if pos.LessThan(la.Start()) {
+		return la.Start()
+	}
+	return pos
 }
--- a/internal/buffer/message.go
+++ b/internal/buffer/message.go
@@ -1,8 +1,8 @@
 package buffer

 import (
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/tcell"
 )

 type MsgType int
@@ -82,13 +82,3 @@ func (b *Buffer) ClearMessages(owner string) {
 func (b *Buffer) ClearAllMessages() {
 	b.Messages = make([]*Message, 0)
 }
-
-type Messager interface {
-	Message(msg ...any)
-}
-
-var prompt Messager
-
-func SetMessager(m Messager) {
-	prompt = m
-}
--- a/internal/buffer/save.go
+++ b/internal/buffer/save.go
@@ -5,18 +5,19 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"io/fs"
 	"os"
 	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"runtime"
-	"time"
 	"unicode"
+	"unicode/utf8"

-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/htmlindex"
 	"golang.org/x/text/transform"
 )

@@ -24,192 +25,46 @@ import (
 // because hashing is too slow
 const LargeFileThreshold = 50000

-type wrappedFile struct {
-	name        string
-	writeCloser io.WriteCloser
-	withSudo    bool
-	screenb     bool
-	cmd         *exec.Cmd
-	sigChan     chan os.Signal
-}
-
-type saveResponse struct {
-	size int
-	err  error
-}
-
-type saveRequest struct {
-	buf              *Buffer
-	path             string
-	withSudo         bool
-	newFile          bool
-	saveResponseChan chan saveResponse
-}
-
-var saveRequestChan chan saveRequest
-var backupRequestChan chan backupRequest
-
-func init() {
-	// Both saveRequestChan and backupRequestChan need to be non-buffered
-	// so the save/backup goroutine receives both save and backup requests
-	// in the same order the main goroutine sends them.
-	saveRequestChan = make(chan saveRequest)
-	backupRequestChan = make(chan backupRequest)
-
-	go func() {
-		duration := backupSeconds * float64(time.Second)
-		backupTicker := time.NewTicker(time.Duration(duration))
-
-		for {
-			select {
-			case sr := <-saveRequestChan:
-				size, err := sr.buf.safeWrite(sr.path, sr.withSudo, sr.newFile)
-				sr.saveResponseChan <- saveResponse{size, err}
-			case br := <-backupRequestChan:
-				handleBackupRequest(br)
-			case <-backupTicker.C:
-				periodicBackup()
-			}
-		}
-	}()
-}
-
-func openFile(name string, withSudo bool) (wrappedFile, error) {
-	var err error
+// overwriteFile opens the given file for writing, truncating if one exists, and then calls
+// the supplied function with the file as io.Writer object, also making sure the file is
+// closed afterwards.
+func overwriteFile(name string, enc encoding.Encoding, fn func(io.Writer) error, withSudo bool) (err error) {
 	var writeCloser io.WriteCloser
-	var screenb bool
-	var cmd *exec.Cmd
-	var sigChan chan os.Signal

 	if withSudo {
-		conv := "notrunc"
-		// TODO: both platforms do not support dd with conv=fsync yet
-		if !(runtime.GOOS == "illumos" || runtime.GOOS == "netbsd") {
-			conv += ",fsync"
+		cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
+
+		if writeCloser, err = cmd.StdinPipe(); err != nil {
+			return
 		}

-		cmd = exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "conv="+conv, "of="+name)
-		writeCloser, err = cmd.StdinPipe()
-		if err != nil {
-			return wrappedFile{}, err
-		}
+		c := make(chan os.Signal, 1)
+		signal.Notify(c, os.Interrupt)
+		go func() {
+			<-c
+			cmd.Process.Kill()
+		}()

-		sigChan = make(chan os.Signal, 1)
-		signal.Reset(os.Interrupt)
-		signal.Notify(sigChan, os.Interrupt)
-
-		screenb = screen.TempFini()
-		// need to start the process now, otherwise when we flush the file
-		// contents to its stdin it might hang because the kernel's pipe size
-		// is too small to handle the full file contents all at once
-		err = cmd.Start()
-		if err != nil {
+		defer func() {
+			screenb := screen.TempFini()
+			if e := cmd.Run(); e != nil && err == nil {
+				err = e
+			}
 			screen.TempStart(screenb)
-
-			signal.Notify(util.Sigterm, os.Interrupt)
-			signal.Stop(sigChan)
-
-			return wrappedFile{}, err
-		}
-	} else {
-		writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE, util.FileMode)
-		if err != nil {
-			return wrappedFile{}, err
-		}
+		}()
+	} else if writeCloser, err = os.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644); err != nil {
+		return
 	}

-	return wrappedFile{name, writeCloser, withSudo, screenb, cmd, sigChan}, nil
-}
+	w := bufio.NewWriter(transform.NewWriter(writeCloser, enc.NewEncoder()))
+	err = fn(w)
+	w.Flush()

-func (wf wrappedFile) Truncate() error {
-	if wf.withSudo {
-		// we don't need to stop the screen here, since it is still stopped
-		// by openFile()
-		// truncate might not be available on every platfom, so use dd instead
-		cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "count=0", "of="+wf.name)
-		return cmd.Run()
-	}
-	return wf.writeCloser.(*os.File).Truncate(0)
-}
-
-func (wf wrappedFile) Write(b *SharedBuffer) (int, error) {
-	file := bufio.NewWriter(transform.NewWriter(wf.writeCloser, b.encoding.NewEncoder()))
-
-	b.Lock()
-	defer b.Unlock()
-
-	if len(b.lines) == 0 {
-		return 0, nil
+	if e := writeCloser.Close(); e != nil && err == nil {
+		err = e
 	}

-	// end of line
-	var eol []byte
-	if b.Endings == FFDos {
-		eol = []byte{'\r', '\n'}
-	} else {
-		eol = []byte{'\n'}
-	}
-
-	err := wf.Truncate()
-	if err != nil {
-		return 0, err
-	}
-
-	// write lines
-	size, err := file.Write(b.lines[0].data)
-	if err != nil {
-		return 0, err
-	}
-
-	for _, l := range b.lines[1:] {
-		if _, err = file.Write(eol); err != nil {
-			return 0, err
-		}
-		if _, err = file.Write(l.data); err != nil {
-			return 0, err
-		}
-		size += len(eol) + len(l.data)
-	}
-
-	err = file.Flush()
-	if err == nil && !wf.withSudo {
-		// Call Sync() on the file to make sure the content is safely on disk.
-		f := wf.writeCloser.(*os.File)
-		err = f.Sync()
-	}
-	return size, err
-}
-
-func (wf wrappedFile) Close() error {
-	err := wf.writeCloser.Close()
-	if wf.withSudo {
-		// wait for dd to finish and restart the screen if we used sudo
-		err := wf.cmd.Wait()
-		screen.TempStart(wf.screenb)
-
-		signal.Notify(util.Sigterm, os.Interrupt)
-		signal.Stop(wf.sigChan)
-
-		if err != nil {
-			return err
-		}
-	}
-	return err
-}
-
-func (b *SharedBuffer) overwriteFile(name string) (int, error) {
-	file, err := openFile(name, false)
-	if err != nil {
-		return 0, err
-	}
-
-	size, err := file.Write(b)
-
-	err2 := file.Close()
-	if err2 != nil && err == nil {
-		err = err2
-	}
-	return size, err
+	return
 }

 // Save saves the buffer to its default path
@@ -217,17 +72,9 @@ func (b *Buffer) Save() error {
 	return b.SaveAs(b.Path)
 }

-// AutoSave saves the buffer to its default path
-func (b *Buffer) AutoSave() error {
-	if !b.Modified() {
-		return nil
-	}
-	return b.saveToFile(b.Path, false, true)
-}
-
 // SaveAs saves the buffer to a specified path (filename), creating the file if it does not exist
 func (b *Buffer) SaveAs(filename string) error {
-	return b.saveToFile(filename, false, false)
+	return b.saveToFile(filename, false)
 }

 func (b *Buffer) SaveWithSudo() error {
@@ -235,10 +82,10 @@ func (b *Buffer) SaveWithSudo() error {
 }

 func (b *Buffer) SaveAsWithSudo(filename string) error {
-	return b.saveToFile(filename, true, false)
+	return b.saveToFile(filename, true)
 }

-func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error {
+func (b *Buffer) saveToFile(filename string, withSudo bool) error {
 	var err error
 	if b.Type.Readonly {
 		return errors.New("Cannot save readonly buffer")
@@ -246,12 +93,16 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 	if b.Type.Scratch {
 		return errors.New("Cannot save scratch buffer")
 	}
+	if withSudo && runtime.GOOS == "windows" {
+		return errors.New("Save with sudo not supported on Windows")
+	}

-	if !autoSave && b.Settings["rmtrailingws"].(bool) {
+	b.UpdateRules()
+	if b.Settings["rmtrailingws"].(bool) {
 		for i, l := range b.lines {
-			leftover := util.CharacterCount(bytes.TrimRightFunc(l.data, unicode.IsSpace))
+			leftover := utf8.RuneCount(bytes.TrimRightFunc(l.data, unicode.IsSpace))

-			linelen := util.CharacterCount(l.data)
+			linelen := utf8.RuneCount(l.data)
 			b.Remove(Loc{leftover, i}, Loc{linelen, i})
 		}

@@ -261,39 +112,23 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 	if b.Settings["eofnewline"].(bool) {
 		end := b.End()
 		if b.RuneAt(Loc{end.X - 1, end.Y}) != '\n' {
-			b.insert(end, []byte{'\n'})
+			b.Insert(end, "\n")
 		}
 	}

-	filename, err = util.ReplaceHome(filename)
-	if err != nil {
-		return err
-	}
+	// Update the last time this file was updated after saving
+	defer func() {
+		b.ModTime, _ = util.GetModTime(filename)
+		err = b.Serialize()
+	}()

-	newFile := false
-	fileInfo, err := os.Stat(filename)
-	if err != nil {
-		if !errors.Is(err, fs.ErrNotExist) {
-			return err
-		}
-		newFile = true
-	}
-	if err == nil && fileInfo.IsDir() {
-		return errors.New("Error: " + filename + " is a directory and cannot be saved")
-	}
-	if err == nil && !fileInfo.Mode().IsRegular() {
-		return errors.New("Error: " + filename + " is not a regular file and cannot be saved")
-	}
-
-	absFilename, err := filepath.Abs(filename)
-	if err != nil {
-		return err
-	}
+	// Removes any tilde and replaces with the absolute path to home
+	absFilename, _ := util.ReplaceHome(filename)

 	// Get the leading path to the file | "." is returned if there's no leading path provided
 	if dirname := filepath.Dir(absFilename); dirname != "." {
 		// Check if the parent dirs don't exist
-		if _, statErr := os.Stat(dirname); errors.Is(statErr, fs.ErrNotExist) {
+		if _, statErr := os.Stat(dirname); os.IsNotExist(statErr) {
 			// Prompt to make sure they want to create the dirs that are missing
 			if b.Settings["mkparents"].(bool) {
 				// Create all leading dir(s) since they don't exist
@@ -307,94 +142,59 @@ func (b *Buffer) saveToFile(filename string, withSudo bool, autoSave bool) error
 		}
 	}

-	saveResponseChan := make(chan saveResponse)
-	saveRequestChan <- saveRequest{b, absFilename, withSudo, newFile, saveResponseChan}
-	result := <-saveResponseChan
-	err = result.err
-	if err != nil {
-		if errors.Is(err, util.ErrOverwrite) {
-			screen.TermMessage(err)
-			err = errors.Unwrap(err)
+	var fileSize int

-			b.UpdateModTime()
+	enc, err := htmlindex.Get(b.Settings["encoding"].(string))
+	if err != nil {
+		return err
+	}
+
+	fwriter := func(file io.Writer) (e error) {
+		if len(b.lines) == 0 {
+			return
 		}
+
+		// end of line
+		var eol []byte
+		if b.Endings == FFDos {
+			eol = []byte{'\r', '\n'}
+		} else {
+			eol = []byte{'\n'}
+		}
+
+		// write lines
+		if fileSize, e = file.Write(b.lines[0].data); e != nil {
+			return
+		}
+
+		for _, l := range b.lines[1:] {
+			if _, e = file.Write(eol); e != nil {
+				return
+			}
+			if _, e = file.Write(l.data); e != nil {
+				return
+			}
+			fileSize += len(eol) + len(l.data)
+		}
+		return
+	}
+
+	if err = overwriteFile(absFilename, enc, fwriter, withSudo); err != nil {
 		return err
 	}

 	if !b.Settings["fastdirty"].(bool) {
-		if result.size > LargeFileThreshold {
+		if fileSize > LargeFileThreshold {
 			// For large files 'fastdirty' needs to be on
 			b.Settings["fastdirty"] = true
 		} else {
-			b.calcHash(&b.origHash)
+			calcHash(b, &b.origHash)
 		}
 	}

-	newPath := b.Path != filename
-	if newPath {
-		b.RemoveBackup()
-	}
-
 	b.Path = filename
-	b.AbsPath = absFilename
+	absPath, _ := filepath.Abs(filename)
+	b.AbsPath = absPath
 	b.isModified = false
-	b.UpdateModTime()
-
-	if newPath {
-		// need to update glob-based and filetype-based settings
-		b.ReloadSettings(true)
-	}
-
-	err = b.Serialize()
 	return err
 }
-
-// safeWrite writes the buffer to a file in a "safe" way, preventing loss of the
-// contents of the file if it fails to write the new contents.
-// This means that the file is not overwritten directly but by writing to the
-// backup file first.
-func (b *SharedBuffer) safeWrite(path string, withSudo bool, newFile bool) (int, error) {
-	file, err := openFile(path, withSudo)
-	if err != nil {
-		return 0, err
-	}
-
-	defer func() {
-		if newFile && err != nil {
-			os.Remove(path)
-		}
-	}()
-
-	// Try to backup first before writing
-	backupName, resolveName, err := b.writeBackup(path)
-	if err != nil {
-		file.Close()
-		return 0, err
-	}
-
-	// Backup saved, so cancel pending periodic backup, if any
-	delete(requestedBackups, b)
-
-	b.forceKeepBackup = true
-	size := 0
-	{
-		// If we failed to write or close, keep the backup we made
-		size, err = file.Write(b)
-		if err != nil {
-			file.Close()
-			return 0, util.OverwriteError{err, backupName}
-		}
-
-		err = file.Close()
-		if err != nil {
-			return 0, util.OverwriteError{err, backupName}
-		}
-	}
-	b.forceKeepBackup = false
-
-	if !b.keepBackup() {
-		b.removeBackup(backupName, resolveName)
-	}
-
-	return size, err
-}
--- a/internal/buffer/search.go
+++ b/internal/buffer/search.go
@@ -4,71 +4,10 @@ import (
 	"regexp"
 	"unicode/utf8"

-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/util"
 )

-// We want "^" and "$" to match only the beginning/end of a line, not the
-// beginning/end of the search region if it is in the middle of a line.
-// In that case we use padded regexps to require a rune before or after
-// the match. (This also affects other empty-string patters like "\\b".)
-// The following two flags indicate the padding used.
-const (
-	padStart = 1 << iota
-	padEnd
-)
-
-func findLineParams(b *Buffer, start, end Loc, i int, r *regexp.Regexp) ([]byte, int, int, *regexp.Regexp) {
-	l := b.LineBytes(i)
-	charpos := 0
-	padMode := 0
-
-	if i == end.Y {
-		nchars := util.CharacterCount(l)
-		end.X = util.Clamp(end.X, 0, nchars)
-		if end.X < nchars {
-			l = util.SliceStart(l, end.X+1)
-			padMode |= padEnd
-		}
-	}
-
-	if i == start.Y {
-		nchars := util.CharacterCount(l)
-		start.X = util.Clamp(start.X, 0, nchars)
-		if start.X > 0 {
-			charpos = start.X - 1
-			l = util.SliceEnd(l, charpos)
-			padMode |= padStart
-		}
-	}
-
-	if padMode != 0 {
-		re, err := regexp.Compile(r.String() + `\E`)
-		if err == nil {
-			// r contains \Q without closing \E
-			r = re
-		}
-
-		if padMode == padStart {
-			r = regexp.MustCompile(".(?:" + r.String() + ")")
-		} else if padMode == padEnd {
-			r = regexp.MustCompile("(?:" + r.String() + ").")
-		} else {
-			// padMode == padStart|padEnd
-			r = regexp.MustCompile(".(?:" + r.String() + ").")
-		}
-	}
-
-	return l, charpos, padMode, r
-}
-
 func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
-	lastcn := util.CharacterCount(b.LineBytes(b.LinesNum() - 1))
-	if start.Y > b.LinesNum()-1 {
-		start.X = lastcn - 1
-	}
-	if end.Y > b.LinesNum()-1 {
-		end.X = lastcn
-	}
 	start.Y = util.Clamp(start.Y, 0, b.LinesNum()-1)
 	end.Y = util.Clamp(end.Y, 0, b.LinesNum()-1)

@@ -77,19 +16,30 @@ func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 	}

 	for i := start.Y; i <= end.Y; i++ {
-		l, charpos, padMode, rPadded := findLineParams(b, start, end, i, r)
+		l := b.LineBytes(i)
+		charpos := 0

-		match := rPadded.FindIndex(l)
+		if i == start.Y && start.Y == end.Y {
+			nchars := utf8.RuneCount(l)
+			start.X = util.Clamp(start.X, 0, nchars)
+			end.X = util.Clamp(end.X, 0, nchars)
+			l = util.SliceStart(l, end.X)
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == start.Y {
+			nchars := utf8.RuneCount(l)
+			start.X = util.Clamp(start.X, 0, nchars)
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == end.Y {
+			nchars := utf8.RuneCount(l)
+			end.X = util.Clamp(end.X, 0, nchars)
+			l = util.SliceStart(l, end.X)
+		}
+
+		match := r.FindIndex(l)

 		if match != nil {
-			if padMode&padStart != 0 {
-				_, size := utf8.DecodeRune(l[match[0]:])
-				match[0] += size
-			}
-			if padMode&padEnd != 0 {
-				_, size := utf8.DecodeLastRune(l[:match[1]])
-				match[1] -= size
-			}
 			start := Loc{charpos + util.RunePos(l, match[0]), i}
 			end := Loc{charpos + util.RunePos(l, match[1]), i}
 			return [2]Loc{start, end}, true
@@ -99,13 +49,6 @@ func (b *Buffer) findDown(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 }

 func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
-	lastcn := util.CharacterCount(b.LineBytes(b.LinesNum() - 1))
-	if start.Y > b.LinesNum()-1 {
-		start.X = lastcn - 1
-	}
-	if end.Y > b.LinesNum()-1 {
-		end.X = lastcn
-	}
 	start.Y = util.Clamp(start.Y, 0, b.LinesNum()-1)
 	end.Y = util.Clamp(end.Y, 0, b.LinesNum()-1)

@@ -114,39 +57,38 @@ func (b *Buffer) findUp(r *regexp.Regexp, start, end Loc) ([2]Loc, bool) {
 	}

 	for i := end.Y; i >= start.Y; i-- {
-		charCount := util.CharacterCount(b.LineBytes(i))
-		from := Loc{0, i}.Clamp(start, end)
-		to := Loc{charCount, i}.Clamp(start, end)
+		l := b.LineBytes(i)
+		charpos := 0

-		allMatches := b.findAll(r, from, to)
-		if allMatches != nil {
-			match := allMatches[len(allMatches)-1]
-			return [2]Loc{match[0], match[1]}, true
+		if i == start.Y && start.Y == end.Y {
+			nchars := utf8.RuneCount(l)
+			start.X = util.Clamp(start.X, 0, nchars)
+			end.X = util.Clamp(end.X, 0, nchars)
+			l = util.SliceStart(l, end.X)
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == start.Y {
+			nchars := utf8.RuneCount(l)
+			start.X = util.Clamp(start.X, 0, nchars)
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == end.Y {
+			nchars := utf8.RuneCount(l)
+			end.X = util.Clamp(end.X, 0, nchars)
+			l = util.SliceStart(l, end.X)
+		}
+
+		match := r.FindIndex(l)
+
+		if match != nil {
+			start := Loc{charpos + util.RunePos(l, match[0]), i}
+			end := Loc{charpos + util.RunePos(l, match[1]), i}
+			return [2]Loc{start, end}, true
 		}
 	}
 	return [2]Loc{}, false
 }

-func (b *Buffer) findAll(r *regexp.Regexp, start, end Loc) [][2]Loc {
-	var matches [][2]Loc
-	loc := start
-	for {
-		match, found := b.findDown(r, loc, end)
-		if !found {
-			break
-		}
-		matches = append(matches, match)
-		if match[0] != match[1] {
-			loc = match[1]
-		} else if match[1] != end {
-			loc = match[1].Move(1, b)
-		} else {
-			break
-		}
-	}
-	return matches
-}
-
 // FindNext finds the next occurrence of a given string in the buffer
 // It returns the start and end location of the match (if found) and
 // a boolean indicating if it was found
@@ -190,58 +132,47 @@ func (b *Buffer) FindNext(s string, start, end, from Loc, down bool, useRegex bo
 }

 // ReplaceRegex replaces all occurrences of 'search' with 'replace' in the given area
-// and returns the number of replacements made and the number of characters
-// added or removed on the last line of the range
-func (b *Buffer) ReplaceRegex(start, end Loc, search *regexp.Regexp, replace []byte, captureGroups bool) (int, int) {
+// and returns the number of replacements made and the number of runes
+// added or removed
+func (b *Buffer) ReplaceRegex(start, end Loc, search *regexp.Regexp, replace []byte) (int, int) {
 	if start.GreaterThan(end) {
 		start, end = end, start
 	}

-	charsEnd := util.CharacterCount(b.LineBytes(end.Y))
+	netrunes := 0
+
 	found := 0
 	var deltas []Delta
-
 	for i := start.Y; i <= end.Y; i++ {
-		l := b.LineBytes(i)
-		charCount := util.CharacterCount(l)
-		if (i == start.Y && start.X > 0) || (i == end.Y && end.X < charCount) {
-			// This replacement code works in general, but it creates a separate
-			// modification for each match. We only use it for the first and last
-			// lines, which may use padded regexps
+		l := b.lines[i].data
+		charpos := 0

-			from := Loc{0, i}.Clamp(start, end)
-			to := Loc{charCount, i}.Clamp(start, end)
-			matches := b.findAll(search, from, to)
-			found += len(matches)
-
-			for j := len(matches) - 1; j >= 0; j-- {
-				// if we counted upwards, the different deltas would interfere
-				match := matches[j]
-				var newText []byte
-				if captureGroups {
-					newText = search.ReplaceAll(b.Substr(match[0], match[1]), replace)
-				} else {
-					newText = replace
-				}
-				deltas = append(deltas, Delta{newText, match[0], match[1]})
-			}
-		} else {
-			newLine := search.ReplaceAllFunc(l, func(in []byte) []byte {
-				found++
-				var result []byte
-				if captureGroups {
-					match := search.FindSubmatchIndex(in)
-					result = search.Expand(result, replace, in, match)
-				} else {
-					result = replace
-				}
-				return result
-			})
-			deltas = append(deltas, Delta{newLine, Loc{0, i}, Loc{charCount, i}})
+		if start.Y == end.Y && i == start.Y {
+			l = util.SliceStart(l, end.X)
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == start.Y {
+			l = util.SliceEnd(l, start.X)
+			charpos = start.X
+		} else if i == end.Y {
+			l = util.SliceStart(l, end.X)
 		}
-	}
+		newText := search.ReplaceAllFunc(l, func(in []byte) []byte {
+			result := []byte{}
+			for _, submatches := range search.FindAllSubmatchIndex(in, -1) {
+				result = search.Expand(result, replace, in, submatches)
+			}
+			found++
+			netrunes += utf8.RuneCount(in) - utf8.RuneCount(result)
+			return result
+		})

+		from := Loc{charpos, i}
+		to := Loc{charpos + utf8.RuneCount(l), i}
+
+		deltas = append(deltas, Delta{newText, from, to})
+	}
 	b.MultipleReplace(deltas)

-	return found, util.CharacterCount(b.LineBytes(end.Y)) - charsEnd
+	return found, netrunes
 }
--- a/internal/buffer/serialize.go
+++ b/internal/buffer/serialize.go
@@ -1,15 +1,17 @@
 package buffer

 import (
-	"bytes"
 	"encoding/gob"
 	"errors"
+	"io"
 	"os"
 	"path/filepath"
 	"time"

-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"golang.org/x/text/encoding"
+
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/util"
 )

 // The SerializedBuffer holds the types that get serialized when a buffer is saved
@@ -29,34 +31,16 @@ func (b *Buffer) Serialize() error {
 		return nil
 	}

-	buffer := SerializedBuffer{
-		Cursor:  b.GetActiveCursor().Loc,
-		ModTime: b.ModTime,
-	}
-	if b.Settings["saveundo"].(bool) {
-		buffer.EventHandler = b.EventHandler
-	}
+	name := filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath))

-	var buf bytes.Buffer
-	err := gob.NewEncoder(&buf).Encode(buffer)
-	if err != nil {
+	return overwriteFile(name, encoding.Nop, func(file io.Writer) error {
+		err := gob.NewEncoder(file).Encode(SerializedBuffer{
+			b.EventHandler,
+			b.GetActiveCursor().Loc,
+			b.ModTime,
+		})
 		return err
-	}
-
-	name, resolveName := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
-	err = util.SafeWrite(name, buf.Bytes(), true)
-	if err != nil {
-		return err
-	}
-
-	if resolveName != "" {
-		err = util.SafeWrite(resolveName, []byte(b.AbsPath), true)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+	}, false)
 }

 // Unserialize loads the buffer info from config.ConfigDir/buffers
@@ -66,10 +50,9 @@ func (b *Buffer) Unserialize() error {
 	if b.Path == "" {
 		return nil
 	}
-	name, _ := util.DetermineEscapePath(filepath.Join(config.ConfigDir, "buffers"), b.AbsPath)
-	file, err := os.Open(name)
+	file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", util.EscapePath(b.AbsPath)))
+	defer file.Close()
 	if err == nil {
-		defer file.Close()
 		var buffer SerializedBuffer
 		decoder := gob.NewDecoder(file)
 		err = decoder.Decode(&buffer)
@@ -80,7 +63,7 @@ func (b *Buffer) Unserialize() error {
 			b.StartCursor = buffer.Cursor
 		}

-		if b.Settings["saveundo"].(bool) && buffer.EventHandler != nil {
+		if b.Settings["saveundo"].(bool) {
 			// We should only use last time's eventhandler if the file wasn't modified by someone else in the meantime
 			if b.ModTime == buffer.ModTime {
 				b.EventHandler = buffer.EventHandler
--- a/internal/buffer/settings.go
+++ b/internal/buffer/settings.go
@@ -1,89 +1,24 @@
 package buffer

 import (
-	"crypto/md5"
-	"reflect"
-
-	"github.com/micro-editor/micro/v2/internal/config"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"golang.org/x/text/encoding/htmlindex"
-	"golang.org/x/text/encoding/unicode"
-	luar "layeh.com/gopher-luar"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
 )

-func (b *Buffer) ReloadSettings(reloadFiletype bool) {
-	settings := config.ParsedSettings()
-	config.UpdatePathGlobLocals(settings, b.AbsPath)
-
-	oldFiletype := b.Settings["filetype"].(string)
-
-	_, local := b.LocalSettings["filetype"]
-	_, volatile := config.VolatileSettings["filetype"]
-	if reloadFiletype && !local && !volatile {
-		// need to update filetype before updating other settings based on it
-		b.Settings["filetype"] = "unknown"
-		if v, ok := settings["filetype"]; ok {
-			b.Settings["filetype"] = v
-		}
-	}
-
-	// update syntax rules, which will also update filetype if needed
-	b.UpdateRules()
-
-	curFiletype := b.Settings["filetype"].(string)
-	if oldFiletype != curFiletype {
-		b.doCallbacks("filetype", oldFiletype, curFiletype)
-	}
-
-	config.UpdateFileTypeLocals(settings, curFiletype)
-
-	for k, v := range config.DefaultCommonSettings() {
-		if k == "filetype" {
-			// prevent recursion
-			continue
-		}
-		if _, ok := config.VolatileSettings[k]; ok {
-			// reload should not override volatile settings
-			continue
-		}
-		if _, ok := b.LocalSettings[k]; ok {
-			// reload should not override local settings
-			continue
-		}
-		if _, ok := settings[k]; ok {
-			b.DoSetOptionNative(k, settings[k])
-		} else {
-			b.DoSetOptionNative(k, v)
-		}
-	}
-}
-
-func (b *Buffer) DoSetOptionNative(option string, nativeValue any) {
-	oldValue := b.Settings[option]
-	if reflect.DeepEqual(oldValue, nativeValue) {
-		return
-	}
-
+func (b *Buffer) SetOptionNative(option string, nativeValue interface{}) error {
 	b.Settings[option] = nativeValue

 	if option == "fastdirty" {
 		if !nativeValue.(bool) {
-			if b.Size() > LargeFileThreshold {
-				b.Settings["fastdirty"] = true
-			} else {
-				if !b.isModified {
-					b.calcHash(&b.origHash)
-				} else {
-					// prevent using an old stale origHash value
-					b.origHash = [md5.Size]byte{}
-				}
+			e := calcHash(b, &b.origHash)
+			if e == ErrFileTooLarge {
+				b.Settings["fastdirty"] = false
 			}
 		}
 	} else if option == "statusline" {
 		screen.Redraw()
 	} else if option == "filetype" {
-		b.ReloadSettings(false)
+		b.UpdateRules()
 	} else if option == "fileformat" {
 		switch b.Settings["fileformat"].(string) {
 		case "unix":
@@ -91,7 +26,7 @@ func (b *Buffer) DoSetOptionNative(option string, nativeValue any) {
 		case "dos":
 			b.Endings = FFDos
 		}
-		b.setModified()
+		b.isModified = true
 	} else if option == "syntax" {
 		if !nativeValue.(bool) {
 			b.ClearMatches()
@@ -99,53 +34,11 @@ func (b *Buffer) DoSetOptionNative(option string, nativeValue any) {
 			b.UpdateRules()
 		}
 	} else if option == "encoding" {
-		enc, err := htmlindex.Get(b.Settings["encoding"].(string))
-		if err != nil {
-			enc = unicode.UTF8
-			b.Settings["encoding"] = "utf-8"
-		}
-		b.encoding = enc
-		b.setModified()
+		b.isModified = true
 	} else if option == "readonly" && b.Type.Kind == BTDefault.Kind {
 		b.Type.Readonly = nativeValue.(bool)
-	} else if option == "hlsearch" {
-		for _, buf := range OpenBuffers {
-			if b.SharedBuffer == buf.SharedBuffer {
-				buf.HighlightSearch = nativeValue.(bool)
-			}
-		}
-	} else {
-		for _, pl := range config.Plugins {
-			if option == pl.Name {
-				if nativeValue.(bool) {
-					if !pl.Loaded {
-						pl.Load()
-					}
-					_, err := pl.Call("init")
-					if err != nil && err != config.ErrNoSuchFunction {
-						screen.TermMessage(err)
-					}
-				} else if !nativeValue.(bool) && pl.Loaded {
-					_, err := pl.Call("deinit")
-					if err != nil && err != config.ErrNoSuchFunction {
-						screen.TermMessage(err)
-					}
-				}
-			}
-		}
 	}

-	b.doCallbacks(option, oldValue, nativeValue)
-}
-
-func (b *Buffer) SetOptionNative(option string, nativeValue any) error {
-	if err := config.OptionIsValid(option, nativeValue); err != nil {
-		return err
-	}
-
-	b.DoSetOptionNative(option, nativeValue)
-	b.LocalSettings[option] = true
-
 	return nil
 }

@@ -155,22 +48,10 @@ func (b *Buffer) SetOption(option, value string) error {
 		return config.ErrInvalidOption
 	}

-	nativeValue, err := config.GetNativeValue(option, value)
+	nativeValue, err := config.GetNativeValue(option, b.Settings[option], value)
 	if err != nil {
 		return err
 	}

 	return b.SetOptionNative(option, nativeValue)
 }
-
-func (b *Buffer) doCallbacks(option string, oldValue any, newValue any) {
-	if b.OptionCallback != nil {
-		b.OptionCallback(option, newValue)
-	}
-
-	if err := config.RunPluginFn("onBufferOptionChanged",
-		luar.New(ulua.L, b), luar.New(ulua.L, option),
-		luar.New(ulua.L, oldValue), luar.New(ulua.L, newValue)); err != nil {
-		screen.TermMessage(err)
-	}
-}
--- a/internal/clipboard/clipboard.go
+++ b/internal/clipboard/clipboard.go
@@ -1,163 +0,0 @@
-package clipboard
-
-import (
-	"errors"
-
-	"github.com/zyedidia/clipper"
-)
-
-type Method int
-
-const (
-	// External relies on external tools for accessing the clipboard
-	// These include xclip, xsel, wl-clipboard for linux, pbcopy/pbpaste on Mac,
-	// and Syscalls on Windows.
-	External Method = iota
-	// Terminal uses the terminal to manage the clipboard via OSC 52. Many
-	// terminals do not support OSC 52, in which case this method won't work.
-	Terminal
-	// Internal just manages the clipboard with an internal buffer and doesn't
-	// attempt to interface with the system clipboard
-	Internal
-)
-
-// CurrentMethod is the method used to store clipboard information
-var CurrentMethod Method = Internal
-
-// A Register is a buffer used to store text. The system clipboard has the 'clipboard'
-// and 'primary' (linux-only) registers, but other registers may be used internal to micro.
-type Register int
-
-const (
-	// ClipboardReg is the main system clipboard
-	ClipboardReg Register = -1
-	// PrimaryReg is the system primary clipboard (linux only)
-	PrimaryReg = -2
-)
-
-var clipboard clipper.Clipboard
-
-// Initialize attempts to initialize the clipboard using the given method
-func Initialize(m Method) error {
-	var err error
-	switch m {
-	case External:
-		clips := make([]clipper.Clipboard, 0, len(clipper.Clipboards)+1)
-		clips = append(clips, &clipper.Custom{
-			Name: "micro-clip",
-		})
-		clips = append(clips, clipper.Clipboards...)
-		clipboard, err = clipper.GetClipboard(clips...)
-	}
-	if err != nil {
-		CurrentMethod = Internal
-	}
-	return err
-}
-
-// SetMethod changes the clipboard access method
-func SetMethod(m string) Method {
-	switch m {
-	case "internal":
-		CurrentMethod = Internal
-	case "external":
-		CurrentMethod = External
-	case "terminal":
-		CurrentMethod = Terminal
-	}
-	return CurrentMethod
-}
-
-// Read reads from a clipboard register
-func Read(r Register) (string, error) {
-	return read(r, CurrentMethod)
-}
-
-// Write writes text to a clipboard register
-func Write(text string, r Register) error {
-	return write(text, r, CurrentMethod)
-}
-
-// ReadMulti reads text from a clipboard register for a certain multi-cursor
-func ReadMulti(r Register, num, ncursors int) (string, error) {
-	clip, err := Read(r)
-	if err != nil {
-		return "", err
-	}
-	if ValidMulti(r, clip, ncursors) {
-		return multi.getText(r, num), nil
-	}
-	return clip, nil
-}
-
-// WriteMulti writes text to a clipboard register for a certain multi-cursor
-func WriteMulti(text string, r Register, num int, ncursors int) error {
-	return writeMulti(text, r, num, ncursors, CurrentMethod)
-}
-
-// ValidMulti checks if the internal multi-clipboard is valid and up-to-date
-// with the system clipboard
-func ValidMulti(r Register, clip string, ncursors int) bool {
-	return multi.isValid(r, clip, ncursors)
-}
-
-func writeMulti(text string, r Register, num int, ncursors int, m Method) error {
-	multi.writeText(text, r, num, ncursors)
-	return write(multi.getAllText(r), r, m)
-}
-
-func read(r Register, m Method) (string, error) {
-	switch m {
-	case External:
-		switch r {
-		case ClipboardReg:
-			b, e := clipboard.ReadAll(clipper.RegClipboard)
-			return string(b), e
-		case PrimaryReg:
-			b, e := clipboard.ReadAll(clipper.RegPrimary)
-			return string(b), e
-		default:
-			return internal.read(r), nil
-		}
-	case Internal:
-		return internal.read(r), nil
-	case Terminal:
-		switch r {
-		case ClipboardReg:
-			// terminal paste works by sending an esc sequence to the
-			// terminal to trigger a paste event
-			return terminal.read("clipboard")
-		case PrimaryReg:
-			return terminal.read("primary")
-		default:
-			return internal.read(r), nil
-		}
-	}
-	return "", errors.New("Invalid clipboard method")
-}
-
-func write(text string, r Register, m Method) error {
-	switch m {
-	case External:
-		switch r {
-		case ClipboardReg:
-			return clipboard.WriteAll(clipper.RegClipboard, []byte(text))
-		case PrimaryReg:
-			return clipboard.WriteAll(clipper.RegPrimary, []byte(text))
-		default:
-			internal.write(text, r)
-		}
-	case Internal:
-		internal.write(text, r)
-	case Terminal:
-		switch r {
-		case ClipboardReg:
-			return terminal.write(text, "c")
-		case PrimaryReg:
-			return terminal.write(text, "p")
-		default:
-			internal.write(text, r)
-		}
-	}
-	return nil
-}
--- a/internal/clipboard/internal.go
+++ b/internal/clipboard/internal.go
@@ -1,17 +0,0 @@
-package clipboard
-
-type internalClipboard map[Register]string
-
-var internal internalClipboard
-
-func init() {
-	internal = make(internalClipboard)
-}
-
-func (c internalClipboard) read(r Register) string {
-	return c[r]
-}
-
-func (c internalClipboard) write(text string, r Register) {
-	c[r] = text
-}
--- a/internal/clipboard/multi.go
+++ b/internal/clipboard/multi.go
@@ -1,63 +0,0 @@
-package clipboard
-
-import (
-	"bytes"
-)
-
-// For storing multi cursor clipboard contents
-type multiClipboard map[Register][]string
-
-var multi multiClipboard
-
-func (c multiClipboard) getAllText(r Register) string {
-	content := c[r]
-	if content == nil {
-		return ""
-	}
-
-	buf := &bytes.Buffer{}
-	for _, s := range content {
-		buf.WriteString(s)
-	}
-	return buf.String()
-}
-
-func (c multiClipboard) getText(r Register, num int) string {
-	content := c[r]
-	if content == nil || len(content) <= num {
-		return ""
-	}
-
-	return content[num]
-}
-
-// isValid checks if the text stored in this multi-clipboard is the same as the
-// text stored in the system clipboard (provided as an argument), and therefore
-// if it is safe to use the multi-clipboard for pasting instead of the system
-// clipboard.
-func (c multiClipboard) isValid(r Register, clipboard string, ncursors int) bool {
-	content := c[r]
-	if content == nil || len(content) != ncursors {
-		return false
-	}
-
-	return clipboard == c.getAllText(r)
-}
-
-func (c multiClipboard) writeText(text string, r Register, num int, ncursors int) {
-	content := c[r]
-	if content == nil || len(content) != ncursors {
-		content = make([]string, ncursors, ncursors)
-		c[r] = content
-	}
-
-	if num >= ncursors {
-		return
-	}
-
-	content[num] = text
-}
-
-func init() {
-	multi = make(multiClipboard)
-}
--- a/internal/clipboard/terminal.go
+++ b/internal/clipboard/terminal.go
@@ -1,33 +0,0 @@
-package clipboard
-
-import (
-	"errors"
-	"time"
-
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/tcell/v2"
-)
-
-type terminalClipboard struct{}
-
-var terminal terminalClipboard
-
-func (t terminalClipboard) read(reg string) (string, error) {
-	screen.Screen.GetClipboard(reg)
-	// wait at most 200ms for response
-	for {
-		select {
-		case event := <-screen.Events:
-			e, ok := event.(*tcell.EventPaste)
-			if ok {
-				return e.Text(), nil
-			}
-		case <-time.After(200 * time.Millisecond):
-			return "", errors.New("No clipboard received from terminal")
-		}
-	}
-}
-
-func (t terminalClipboard) write(text, reg string) error {
-	return screen.Screen.SetClipboard(text, reg)
-}
--- a/internal/config/autosave.go
+++ b/internal/config/autosave.go
@@ -1,49 +1,45 @@
 package config

 import (
+	"sync"
 	"time"
 )

 var Autosave chan bool
-var autotime chan float64
+var autotime int
+
+// lock for autosave
+var autolock sync.Mutex

 func init() {
 	Autosave = make(chan bool)
-	autotime = make(chan float64)
 }

-func SetAutoTime(a float64) {
-	autotime <- a
+func SetAutoTime(a int) {
+	autolock.Lock()
+	autotime = a
+	autolock.Unlock()
+}
+
+func GetAutoTime() int {
+	autolock.Lock()
+	a := autotime
+	autolock.Unlock()
+	return a
 }

 func StartAutoSave() {
 	go func() {
-		var a float64
-		var t *time.Timer
-		var elapsed <-chan time.Time
 		for {
-			select {
-			case a = <-autotime:
-				if t != nil {
-					t.Stop()
-					for len(elapsed) > 0 {
-						<-elapsed
-					}
-				}
-				if a > 0 {
-					if t != nil {
-						t.Reset(time.Duration(a * float64(time.Second)))
-					} else {
-						t = time.NewTimer(time.Duration(a * float64(time.Second)))
-						elapsed = t.C
-					}
-				}
-			case <-elapsed:
-				if a > 0 {
-					t.Reset(time.Duration(a * float64(time.Second)))
-					Autosave <- true
-				}
+			if autotime < 1 {
+				break
 			}
+			time.Sleep(time.Duration(autotime) * time.Second)
+			// it's possible autotime was changed while sleeping
+			if autotime < 1 {
+				break
+			}
+			Autosave <- true
 		}
 	}()
 }
--- a/internal/config/colorscheme.go
+++ b/internal/config/colorscheme.go
@@ -6,13 +6,13 @@ import (
 	"strconv"
 	"strings"

-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/tcell"
 )

-// DefStyle is Micro's default style
+// Micro's default style
 var DefStyle tcell.Style = tcell.StyleDefault

-// Colorscheme is the current colorscheme
+// The current colorscheme
 var Colorscheme map[string]tcell.Style

 // GetColor takes in a syntax group and returns the colorscheme's style for that group
@@ -52,63 +52,43 @@ func InitColorscheme() error {
 	Colorscheme = make(map[string]tcell.Style)
 	DefStyle = tcell.StyleDefault

-	c, err := LoadDefaultColorscheme()
-	if err == nil {
-		Colorscheme = c
-	} else {
-		// The colorscheme setting seems broken (maybe because we have not validated
-		// it earlier, see comment in verifySetting()). So reset it to the default
-		// colorscheme and try again.
-		GlobalSettings["colorscheme"] = DefaultGlobalOnlySettings["colorscheme"]
-		if c, err2 := LoadDefaultColorscheme(); err2 == nil {
-			Colorscheme = c
-		}
-	}
-
-	return err
+	return LoadDefaultColorscheme()
 }

 // LoadDefaultColorscheme loads the default colorscheme from $(ConfigDir)/colorschemes
-func LoadDefaultColorscheme() (map[string]tcell.Style, error) {
-	var parsedColorschemes []string
-	return LoadColorscheme(GlobalSettings["colorscheme"].(string), &parsedColorschemes)
+func LoadDefaultColorscheme() error {
+	return LoadColorscheme(GlobalSettings["colorscheme"].(string))
 }

 // LoadColorscheme loads the given colorscheme from a directory
-func LoadColorscheme(colorschemeName string, parsedColorschemes *[]string) (map[string]tcell.Style, error) {
-	c := make(map[string]tcell.Style)
+func LoadColorscheme(colorschemeName string) error {
 	file := FindRuntimeFile(RTColorscheme, colorschemeName)
 	if file == nil {
-		return c, errors.New(colorschemeName + " is not a valid colorscheme")
+		return errors.New(colorschemeName + " is not a valid colorscheme")
 	}
 	if data, err := file.Data(); err != nil {
-		return c, errors.New("Error loading colorscheme: " + err.Error())
+		return errors.New("Error loading colorscheme: " + err.Error())
 	} else {
-		var err error
-		c, err = ParseColorscheme(file.Name(), string(data), parsedColorschemes)
+		Colorscheme, err = ParseColorscheme(string(data))
 		if err != nil {
-			return c, err
+			return err
 		}
 	}
-	return c, nil
+	return nil
 }

 // ParseColorscheme parses the text definition for a colorscheme and returns the corresponding object
 // Colorschemes are made up of color-link statements linking a color group to a list of colors
 // For example, color-link keyword (blue,red) makes all keywords have a blue foreground and
 // red background
-func ParseColorscheme(name string, text string, parsedColorschemes *[]string) (map[string]tcell.Style, error) {
+func ParseColorscheme(text string) (map[string]tcell.Style, error) {
 	var err error
-	colorParser := regexp.MustCompile(`color-link\s+(\S*)\s+"(.*)"`)
-	includeParser := regexp.MustCompile(`include\s+"(.*)"`)
+	parser := regexp.MustCompile(`color-link\s+(\S*)\s+"(.*)"`)
+
 	lines := strings.Split(text, "\n")
+
 	c := make(map[string]tcell.Style)

-	if parsedColorschemes != nil {
-		*parsedColorschemes = append(*parsedColorschemes, name)
-	}
-
-lineLoop:
 	for _, line := range lines {
 		if strings.TrimSpace(line) == "" ||
 			strings.TrimSpace(line)[0] == '#' {
@@ -116,30 +96,7 @@ lineLoop:
 			continue
 		}

-		matches := includeParser.FindSubmatch([]byte(line))
-		if len(matches) == 2 {
-			// support includes only in case parsedColorschemes are given
-			if parsedColorschemes != nil {
-				include := string(matches[1])
-				for _, name := range *parsedColorschemes {
-					// check for circular includes...
-					if name == include {
-						// ...and prevent them
-						continue lineLoop
-					}
-				}
-				includeScheme, err := LoadColorscheme(include, parsedColorschemes)
-				if err != nil {
-					return c, err
-				}
-				for k, v := range includeScheme {
-					c[k] = v
-				}
-			}
-			continue
-		}
-
-		matches = colorParser.FindSubmatch([]byte(line))
+		matches := parser.FindSubmatch([]byte(line))
 		if len(matches) == 3 {
 			link := string(matches[1])
 			colors := string(matches[2])
@@ -160,11 +117,16 @@ lineLoop:

 // StringToStyle returns a style from a string
 // The strings must be in the format "extra foregroundcolor,backgroundcolor"
-// The 'extra' can be bold, reverse, italic or underline
+// The 'extra' can be bold, reverse, or underline
 func StringToStyle(str string) tcell.Style {
 	var fg, bg string
 	spaceSplit := strings.Split(str, " ")
-	split := strings.Split(spaceSplit[len(spaceSplit)-1], ",")
+	var split []string
+	if len(spaceSplit) > 1 {
+		split = strings.Split(spaceSplit[1], ",")
+	} else {
+		split = strings.Split(str, ",")
+	}
 	if len(split) > 1 {
 		fg, bg = split[0], split[1]
 	} else {
@@ -174,31 +136,21 @@ func StringToStyle(str string) tcell.Style {
 	bg = strings.TrimSpace(bg)

 	var fgColor, bgColor tcell.Color
-	var ok bool
-	if fg == "" || fg == "default" {
+	if fg == "" {
 		fgColor, _, _ = DefStyle.Decompose()
 	} else {
-		fgColor, ok = StringToColor(fg)
-		if !ok {
-			fgColor, _, _ = DefStyle.Decompose()
-		}
+		fgColor = StringToColor(fg)
 	}
-	if bg == "" || bg == "default" {
+	if bg == "" {
 		_, bgColor, _ = DefStyle.Decompose()
 	} else {
-		bgColor, ok = StringToColor(bg)
-		if !ok {
-			_, bgColor, _ = DefStyle.Decompose()
-		}
+		bgColor = StringToColor(bg)
 	}

 	style := DefStyle.Foreground(fgColor).Background(bgColor)
 	if strings.Contains(str, "bold") {
 		style = style.Bold(true)
 	}
-	if strings.Contains(str, "italic") {
-		style = style.Italic(true)
-	}
 	if strings.Contains(str, "reverse") {
 		style = style.Reverse(true)
 	}
@@ -210,59 +162,95 @@ func StringToStyle(str string) tcell.Style {

 // StringToColor returns a tcell color from a string representation of a color
 // We accept either bright... or light... to mean the brighter version of a color
-func StringToColor(str string) (tcell.Color, bool) {
+func StringToColor(str string) tcell.Color {
 	switch str {
 	case "black":
-		return tcell.ColorBlack, true
+		return tcell.ColorBlack
 	case "red":
-		return tcell.ColorMaroon, true
+		return tcell.ColorMaroon
 	case "green":
-		return tcell.ColorGreen, true
+		return tcell.ColorGreen
 	case "yellow":
-		return tcell.ColorOlive, true
+		return tcell.ColorOlive
 	case "blue":
-		return tcell.ColorNavy, true
+		return tcell.ColorNavy
 	case "magenta":
-		return tcell.ColorPurple, true
+		return tcell.ColorPurple
 	case "cyan":
-		return tcell.ColorTeal, true
+		return tcell.ColorTeal
 	case "white":
-		return tcell.ColorSilver, true
+		return tcell.ColorSilver
 	case "brightblack", "lightblack":
-		return tcell.ColorGray, true
+		return tcell.ColorGray
 	case "brightred", "lightred":
-		return tcell.ColorRed, true
+		return tcell.ColorRed
 	case "brightgreen", "lightgreen":
-		return tcell.ColorLime, true
+		return tcell.ColorLime
 	case "brightyellow", "lightyellow":
-		return tcell.ColorYellow, true
+		return tcell.ColorYellow
 	case "brightblue", "lightblue":
-		return tcell.ColorBlue, true
+		return tcell.ColorBlue
 	case "brightmagenta", "lightmagenta":
-		return tcell.ColorFuchsia, true
+		return tcell.ColorFuchsia
 	case "brightcyan", "lightcyan":
-		return tcell.ColorAqua, true
+		return tcell.ColorAqua
 	case "brightwhite", "lightwhite":
-		return tcell.ColorWhite, true
+		return tcell.ColorWhite
 	case "default":
-		return tcell.ColorDefault, true
+		return tcell.ColorDefault
 	default:
 		// Check if this is a 256 color
 		if num, err := strconv.Atoi(str); err == nil {
-			return GetColor256(num), true
+			return GetColor256(num)
 		}
-		// Check if this is a truecolor hex value
-		if len(str) == 7 && str[0] == '#' {
-			return tcell.GetColor(str), true
-		}
-		return tcell.ColorDefault, false
+		// Probably a truecolor hex value
+		return tcell.GetColor(str)
 	}
 }

 // GetColor256 returns the tcell color for a number between 0 and 255
 func GetColor256(color int) tcell.Color {
-	if color == 0 {
-		return tcell.ColorDefault
+	colors := []tcell.Color{tcell.ColorBlack, tcell.ColorMaroon, tcell.ColorGreen,
+		tcell.ColorOlive, tcell.ColorNavy, tcell.ColorPurple,
+		tcell.ColorTeal, tcell.ColorSilver, tcell.ColorGray,
+		tcell.ColorRed, tcell.ColorLime, tcell.ColorYellow,
+		tcell.ColorBlue, tcell.ColorFuchsia, tcell.ColorAqua,
+		tcell.ColorWhite, tcell.Color16, tcell.Color17, tcell.Color18, tcell.Color19, tcell.Color20,
+		tcell.Color21, tcell.Color22, tcell.Color23, tcell.Color24, tcell.Color25, tcell.Color26, tcell.Color27, tcell.Color28,
+		tcell.Color29, tcell.Color30, tcell.Color31, tcell.Color32, tcell.Color33, tcell.Color34, tcell.Color35, tcell.Color36,
+		tcell.Color37, tcell.Color38, tcell.Color39, tcell.Color40, tcell.Color41, tcell.Color42, tcell.Color43, tcell.Color44,
+		tcell.Color45, tcell.Color46, tcell.Color47, tcell.Color48, tcell.Color49, tcell.Color50, tcell.Color51, tcell.Color52,
+		tcell.Color53, tcell.Color54, tcell.Color55, tcell.Color56, tcell.Color57, tcell.Color58, tcell.Color59, tcell.Color60,
+		tcell.Color61, tcell.Color62, tcell.Color63, tcell.Color64, tcell.Color65, tcell.Color66, tcell.Color67, tcell.Color68,
+		tcell.Color69, tcell.Color70, tcell.Color71, tcell.Color72, tcell.Color73, tcell.Color74, tcell.Color75, tcell.Color76,
+		tcell.Color77, tcell.Color78, tcell.Color79, tcell.Color80, tcell.Color81, tcell.Color82, tcell.Color83, tcell.Color84,
+		tcell.Color85, tcell.Color86, tcell.Color87, tcell.Color88, tcell.Color89, tcell.Color90, tcell.Color91, tcell.Color92,
+		tcell.Color93, tcell.Color94, tcell.Color95, tcell.Color96, tcell.Color97, tcell.Color98, tcell.Color99, tcell.Color100,
+		tcell.Color101, tcell.Color102, tcell.Color103, tcell.Color104, tcell.Color105, tcell.Color106, tcell.Color107, tcell.Color108,
+		tcell.Color109, tcell.Color110, tcell.Color111, tcell.Color112, tcell.Color113, tcell.Color114, tcell.Color115, tcell.Color116,
+		tcell.Color117, tcell.Color118, tcell.Color119, tcell.Color120, tcell.Color121, tcell.Color122, tcell.Color123, tcell.Color124,
+		tcell.Color125, tcell.Color126, tcell.Color127, tcell.Color128, tcell.Color129, tcell.Color130, tcell.Color131, tcell.Color132,
+		tcell.Color133, tcell.Color134, tcell.Color135, tcell.Color136, tcell.Color137, tcell.Color138, tcell.Color139, tcell.Color140,
+		tcell.Color141, tcell.Color142, tcell.Color143, tcell.Color144, tcell.Color145, tcell.Color146, tcell.Color147, tcell.Color148,
+		tcell.Color149, tcell.Color150, tcell.Color151, tcell.Color152, tcell.Color153, tcell.Color154, tcell.Color155, tcell.Color156,
+		tcell.Color157, tcell.Color158, tcell.Color159, tcell.Color160, tcell.Color161, tcell.Color162, tcell.Color163, tcell.Color164,
+		tcell.Color165, tcell.Color166, tcell.Color167, tcell.Color168, tcell.Color169, tcell.Color170, tcell.Color171, tcell.Color172,
+		tcell.Color173, tcell.Color174, tcell.Color175, tcell.Color176, tcell.Color177, tcell.Color178, tcell.Color179, tcell.Color180,
+		tcell.Color181, tcell.Color182, tcell.Color183, tcell.Color184, tcell.Color185, tcell.Color186, tcell.Color187, tcell.Color188,
+		tcell.Color189, tcell.Color190, tcell.Color191, tcell.Color192, tcell.Color193, tcell.Color194, tcell.Color195, tcell.Color196,
+		tcell.Color197, tcell.Color198, tcell.Color199, tcell.Color200, tcell.Color201, tcell.Color202, tcell.Color203, tcell.Color204,
+		tcell.Color205, tcell.Color206, tcell.Color207, tcell.Color208, tcell.Color209, tcell.Color210, tcell.Color211, tcell.Color212,
+		tcell.Color213, tcell.Color214, tcell.Color215, tcell.Color216, tcell.Color217, tcell.Color218, tcell.Color219, tcell.Color220,
+		tcell.Color221, tcell.Color222, tcell.Color223, tcell.Color224, tcell.Color225, tcell.Color226, tcell.Color227, tcell.Color228,
+		tcell.Color229, tcell.Color230, tcell.Color231, tcell.Color232, tcell.Color233, tcell.Color234, tcell.Color235, tcell.Color236,
+		tcell.Color237, tcell.Color238, tcell.Color239, tcell.Color240, tcell.Color241, tcell.Color242, tcell.Color243, tcell.Color244,
+		tcell.Color245, tcell.Color246, tcell.Color247, tcell.Color248, tcell.Color249, tcell.Color250, tcell.Color251, tcell.Color252,
+		tcell.Color253, tcell.Color254, tcell.Color255,
 	}
-	return tcell.PaletteColor(color)
+
+	if color >= 0 && color < len(colors) {
+		return colors[color]
+	}
+
+	return tcell.ColorDefault
 }
--- a/internal/config/colorscheme_test.go
+++ b/internal/config/colorscheme_test.go
@@ -3,8 +3,8 @@ package config
 import (
 	"testing"

-	"github.com/micro-editor/tcell/v2"
 	"github.com/stretchr/testify/assert"
+	"github.com/zyedidia/tcell"
 )

 func TestSimpleStringToStyle(t *testing.T) {
@@ -26,18 +26,6 @@ func TestAttributeStringToStyle(t *testing.T) {
 	assert.NotEqual(t, 0, attr&tcell.AttrBold)
 }

-func TestMultiAttributesStringToStyle(t *testing.T) {
-	s := StringToStyle("bold italic underline cyan,brightcyan")
-
-	fg, bg, attr := s.Decompose()
-
-	assert.Equal(t, tcell.ColorTeal, fg)
-	assert.Equal(t, tcell.ColorAqua, bg)
-	assert.NotEqual(t, 0, attr&tcell.AttrBold)
-	assert.NotEqual(t, 0, attr&tcell.AttrItalic)
-	assert.NotEqual(t, 0, attr&tcell.AttrUnderline)
-}
-
 func TestColor256StringToStyle(t *testing.T) {
 	s := StringToStyle("128,60")

@@ -65,7 +53,7 @@ color-link constant "#AE81FF,#282828"
 color-link constant.string "#E6DB74,#282828"
 color-link constant.string.char "#BDE6AD,#282828"`

-	c, err := ParseColorscheme("testColorscheme", testColorscheme, nil)
+	c, err := ParseColorscheme(testColorscheme)
 	assert.Nil(t, err)

 	fg, bg, _ := c["comment"].Decompose()
--- a/internal/config/globals.go
+++ b/internal/config/globals.go
@@ -4,12 +4,4 @@ const (
 	DoubleClickThreshold = 400 // How many milliseconds to wait before a second click is not a double click
 )

-var Bindings map[string]map[string]string
-
-func init() {
-	Bindings = map[string]map[string]string{
-		"command":  make(map[string]string),
-		"buffer":   make(map[string]string),
-		"terminal": make(map[string]string),
-	}
-}
+var Bindings map[string]string
--- a/internal/config/plugin.go
+++ b/internal/config/plugin.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"log"

-	ulua "github.com/micro-editor/micro/v2/internal/lua"
 	lua "github.com/yuin/gopher-lua"
+	ulua "github.com/zyedidia/micro/internal/lua"
 )

 // ErrNoSuchFunction is returned when Call is executed on a function that does not exist
@@ -28,7 +28,7 @@ func LoadAllPlugins() error {
 func RunPluginFn(fn string, args ...lua.LValue) error {
 	var reterr error
 	for _, p := range Plugins {
-		if !p.IsLoaded() {
+		if !p.IsEnabled() {
 			continue
 		}
 		_, err := p.Call(fn, args...)
@@ -42,11 +42,11 @@ func RunPluginFn(fn string, args ...lua.LValue) error {
 // RunPluginFnBool runs a function in all plugins and returns
 // false if any one of them returned false
 // also returns an error if any of the plugins had an error
-func RunPluginFnBool(settings map[string]any, fn string, args ...lua.LValue) (bool, error) {
+func RunPluginFnBool(fn string, args ...lua.LValue) (bool, error) {
 	var reterr error
 	retbool := true
 	for _, p := range Plugins {
-		if !p.IsLoaded() || (settings != nil && settings[p.Name] == false) {
+		if !p.IsEnabled() {
 			continue
 		}
 		val, err := p.Call(fn, args...)
@@ -71,11 +71,11 @@ type Plugin struct {
 	Info    *PluginInfo   // json file containing info
 	Srcs    []RuntimeFile // lua files
 	Loaded  bool
-	Builtin bool
+	Default bool // pre-installed plugin
 }

-// IsLoaded returns if a plugin is enabled
-func (p *Plugin) IsLoaded() bool {
+// IsEnabled returns if a plugin is enabled
+func (p *Plugin) IsEnabled() bool {
 	if v, ok := GlobalSettings[p.Name]; ok {
 		return v.(bool) && p.Loaded
 	}
@@ -101,7 +101,7 @@ func (p *Plugin) Load() error {
 		}
 	}
 	p.Loaded = true
-	RegisterCommonOption(p.Name, true)
+	RegisterGlobalOption(p.Name, true)
 	return nil
 }

@@ -133,7 +133,7 @@ func (p *Plugin) Call(fn string, args ...lua.LValue) (lua.LValue, error) {
 func FindPlugin(name string) *Plugin {
 	var pl *Plugin
 	for _, p := range Plugins {
-		if !p.IsLoaded() {
+		if !p.IsEnabled() {
 			continue
 		}
 		if p.Name == name {
@@ -143,3 +143,15 @@ func FindPlugin(name string) *Plugin {
 	}
 	return pl
 }
+
+// FindAnyPlugin does not require the plugin to be enabled
+func FindAnyPlugin(name string) *Plugin {
+	var pl *Plugin
+	for _, p := range Plugins {
+		if p.Name == name {
+			pl = p
+			break
+		}
+	}
+	return pl
+}
--- a/internal/config/plugin_installer.go
+++ b/internal/config/plugin_installer.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -13,10 +14,10 @@ import (
 	"sync"

 	"github.com/blang/semver"
-	"github.com/micro-editor/json5"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/util"
 	lua "github.com/yuin/gopher-lua"
+	"github.com/zyedidia/json5"
+	ulua "github.com/zyedidia/micro/internal/lua"
+	"github.com/zyedidia/micro/internal/util"
 )

 var (
@@ -42,7 +43,6 @@ type PluginPackage struct {
 	Author      string
 	Tags        []string
 	Versions    PluginVersions
-	Builtin     bool
 }

 // PluginPackages is a list of PluginPackage instances.
@@ -76,9 +76,6 @@ func (pp *PluginPackage) String() string {
 	buf := new(bytes.Buffer)
 	buf.WriteString("Plugin: ")
 	buf.WriteString(pp.Name)
-	if pp.Builtin {
-		buf.WriteString(" (built-in)")
-	}
 	buf.WriteRune('\n')
 	if pp.Author != "" {
 		buf.WriteString("Author: ")
@@ -228,7 +225,7 @@ func GetAllPluginPackages(out io.Writer) PluginPackages {
 			if strs, ok := data.([]string); ok {
 				return strs
 			}
-			if ifs, ok := data.([]any); ok {
+			if ifs, ok := data.([]interface{}); ok {
 				result := make([]string, len(ifs))
 				for i, urlIf := range ifs {
 					if url, ok := urlIf.(string); ok {
@@ -338,7 +335,7 @@ func isUnknownCoreVersion() bool {
 	return err != nil
 }

-func newStaticPluginVersion(name, version string, builtin bool) *PluginVersion {
+func newStaticPluginVersion(name, version string) *PluginVersion {
 	vers, err := semver.ParseTolerant(version)

 	if err != nil {
@@ -347,8 +344,7 @@ func newStaticPluginVersion(name, version string, builtin bool) *PluginVersion {
 		}
 	}
 	pl := &PluginPackage{
-		Name:    name,
-		Builtin: builtin,
+		Name: name,
 	}
 	pv := &PluginVersion{
 		pack:    pl,
@@ -363,15 +359,15 @@ func newStaticPluginVersion(name, version string, builtin bool) *PluginVersion {
 func GetInstalledVersions(withCore bool) PluginVersions {
 	result := PluginVersions{}
 	if withCore {
-		result = append(result, newStaticPluginVersion(CorePluginName, util.Version, true))
+		result = append(result, newStaticPluginVersion(CorePluginName, util.Version))
 	}

 	for _, p := range Plugins {
-		if !p.IsLoaded() {
+		if !p.IsEnabled() {
 			continue
 		}
 		version := GetInstalledPluginVersion(p.Name)
-		if pv := newStaticPluginVersion(p.Name, version, p.Builtin); pv != nil {
+		if pv := newStaticPluginVersion(p.Name, version); pv != nil {
 			result = append(result, pv)
 		}
 	}
@@ -400,7 +396,7 @@ func (pv *PluginVersion) DownloadAndInstall(out io.Writer) error {
 		return err
 	}
 	defer resp.Body.Close()
-	data, err := io.ReadAll(resp.Body)
+	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -483,7 +479,9 @@ func (pl PluginPackages) GetAllVersions(name string) PluginVersions {
 	result := make(PluginVersions, 0)
 	p := pl.Get(name)
 	if p != nil {
-		result = append(result, p.Versions...)
+		for _, v := range p.Versions {
+			result = append(result, v)
+		}
 	}
 	return result
 }
@@ -576,7 +574,7 @@ func (pv PluginVersions) install(out io.Writer) {
 // UninstallPlugin deletes the plugin folder of the given plugin
 func UninstallPlugin(out io.Writer, name string) {
 	for _, p := range Plugins {
-		if !p.IsLoaded() {
+		if !p.IsEnabled() {
 			continue
 		}
 		if p.Name == name {
@@ -609,7 +607,7 @@ func UpdatePlugins(out io.Writer, plugins []string) {
 	// if no plugins are specified, update all installed plugins.
 	if len(plugins) == 0 {
 		for _, p := range Plugins {
-			if !p.IsLoaded() || p.Builtin || p.Name == "initlua" {
+			if !p.IsEnabled() {
 				continue
 			}
 			plugins = append(plugins, p.Name)
@@ -618,7 +616,7 @@ func UpdatePlugins(out io.Writer, plugins []string) {

 	fmt.Fprintln(out, "Checking for plugin updates")
 	microVersion := PluginVersions{
-		newStaticPluginVersion(CorePluginName, util.Version, true),
+		newStaticPluginVersion(CorePluginName, util.Version),
 	}

 	var updates = make(PluginDependencies, 0)
@@ -650,14 +648,14 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 			if pp == nil {
 				fmt.Fprintln(out, "Unknown plugin \""+plugin+"\"")
 			} else if err := pp.IsInstallable(out); err != nil {
-				fmt.Fprintln(out, "Error installing "+plugin+": ", err)
+				fmt.Fprintln(out, "Error installing ", plugin, ": ", err)
 			} else {
 				for _, installed := range installedVersions {
 					if pp.Name == installed.Pack().Name {
 						if pp.Versions[0].Version.Compare(installed.Version) == 1 {
-							fmt.Fprintln(out, pp.Name, "is already installed but out-of-date: use 'plugin update "+pp.Name+"' to update")
+							fmt.Fprintln(out, pp.Name, " is already installed but out-of-date: use 'plugin update ", pp.Name, "' to update")
 						} else {
-							fmt.Fprintln(out, pp.Name, "is already installed")
+							fmt.Fprintln(out, pp.Name, " is already installed")
 						}
 					}
 				}
@@ -668,14 +666,10 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 	case "remove":
 		removed := ""
 		for _, plugin := range args {
-			if plugin == "initlua" {
-				fmt.Fprintln(out, "initlua cannot be removed, but can be disabled via settings.")
-				continue
-			}
 			// check if the plugin exists.
 			for _, p := range Plugins {
-				if p.Name == plugin && p.Builtin {
-					fmt.Fprintln(out, p.Name, "is a built-in plugin which cannot be removed, but can be disabled via settings.")
+				if p.Name == plugin && p.Default {
+					fmt.Fprintln(out, "Default plugins cannot be removed, but can be disabled via settings.")
 					continue
 				}
 				if p.Name == plugin {
@@ -685,9 +679,8 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 				}
 			}
 		}
-		removed = strings.TrimSpace(removed)
 		if removed != "" {
-			fmt.Fprintln(out, "Removed", removed)
+			fmt.Fprintln(out, "Removed ", removed)
 		} else {
 			fmt.Fprintln(out, "No plugins removed")
 		}
@@ -697,17 +690,11 @@ func PluginCommand(out io.Writer, cmd string, args []string) {
 		plugins := GetInstalledVersions(false)
 		fmt.Fprintln(out, "The following plugins are currently installed:")
 		for _, p := range plugins {
-			if p.Pack().Name == "initlua" {
-				fmt.Fprintf(out, "%s\n", "initlua")
-			} else if p.Pack().Builtin {
-				fmt.Fprintf(out, "%s (built-in)\n", p.Pack().Name)
-			} else {
-				fmt.Fprintf(out, "%s (%s)\n", p.Pack().Name, p.Version)
-			}
+			fmt.Fprintf(out, "%s (%s)\n", p.Pack().Name, p.Version)
 		}
 	case "search":
 		plugins := SearchPlugin(out, args)
-		fmt.Fprintln(out, len(plugins), "plugins found")
+		fmt.Fprintln(out, len(plugins), " plugins found")
 		for _, p := range plugins {
 			fmt.Fprintln(out, "----------------")
 			fmt.Fprintln(out, p.String())
--- a/internal/config/plugin_installer_test.go
+++ b/internal/config/plugin_installer_test.go
@@ -5,7 +5,7 @@ import (

 	"github.com/blang/semver"

-	"github.com/micro-editor/json5"
+	"github.com/zyedidia/json5"
 )

 func TestDependencyResolving(t *testing.T) {
--- a/internal/config/rtfiles.go
+++ b/internal/config/rtfiles.go
@@ -2,13 +2,13 @@ package config

 import (
 	"errors"
+	"io/ioutil"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
-
-	rt "github.com/micro-editor/micro/v2/runtime"
 )

 const (
@@ -38,10 +38,6 @@ var allFiles [][]RuntimeFile
 var realFiles [][]RuntimeFile

 func init() {
-	initRuntimeVars()
-}
-
-func initRuntimeVars() {
 	allFiles = make([][]RuntimeFile, NumTypes)
 	realFiles = make([][]RuntimeFile, NumTypes)
 }
@@ -60,6 +56,12 @@ type realFile string
 // some asset file
 type assetFile string

+// some file on filesystem but with a different name
+type namedFile struct {
+	realFile
+	name string
+}
+
 // a file with the data stored in memory
 type memoryFile struct {
 	name string
@@ -79,16 +81,20 @@ func (rf realFile) Name() string {
 }

 func (rf realFile) Data() ([]byte, error) {
-	return os.ReadFile(string(rf))
+	return ioutil.ReadFile(string(rf))
 }

 func (af assetFile) Name() string {
-	fn := filepath.Base(string(af))
-	return fn[:len(fn)-len(filepath.Ext(fn))]
+	fn := path.Base(string(af))
+	return fn[:len(fn)-len(path.Ext(fn))]
 }

 func (af assetFile) Data() ([]byte, error) {
-	return rt.Asset(string(af))
+	return Asset(string(af))
+}
+
+func (nf namedFile) Name() string {
+	return nf.name
 }

 // AddRuntimeFile registers a file for the given filetype
@@ -105,7 +111,7 @@ func AddRealRuntimeFile(fileType RTFiletype, file RuntimeFile) {
 // AddRuntimeFilesFromDirectory registers each file from the given directory for
 // the filetype which matches the file-pattern
 func AddRuntimeFilesFromDirectory(fileType RTFiletype, directory, pattern string) {
-	files, _ := os.ReadDir(directory)
+	files, _ := ioutil.ReadDir(directory)
 	for _, f := range files {
 		if ok, _ := filepath.Match(pattern, f.Name()); !f.IsDir() && ok {
 			fullPath := filepath.Join(directory, f.Name())
@@ -117,21 +123,13 @@ func AddRuntimeFilesFromDirectory(fileType RTFiletype, directory, pattern string
 // AddRuntimeFilesFromAssets registers each file from the given asset-directory for
 // the filetype which matches the file-pattern
 func AddRuntimeFilesFromAssets(fileType RTFiletype, directory, pattern string) {
-	files, err := rt.AssetDir(directory)
+	files, err := AssetDir(directory)
 	if err != nil {
 		return
 	}
-
-assetLoop:
 	for _, f := range files {
-		if ok, _ := filepath.Match(pattern, f); ok {
-			af := assetFile(filepath.Join(directory, f))
-			for _, rf := range realFiles[fileType] {
-				if af.Name() == rf.Name() {
-					continue assetLoop
-				}
-			}
-			AddRuntimeFile(fileType, af)
+		if ok, _ := path.Match(pattern, f); ok {
+			AddRuntimeFile(fileType, assetFile(path.Join(directory, f)))
 		}
 	}
 }
@@ -158,49 +156,36 @@ func ListRealRuntimeFiles(fileType RTFiletype) []RuntimeFile {
 	return realFiles[fileType]
 }

-// InitRuntimeFiles initializes all assets files and the config directory.
-// If `user` is false, InitRuntimeFiles ignores the config directory and
-// initializes asset files only.
-func InitRuntimeFiles(user bool) {
+// InitRuntimeFiles initializes all assets file and the config directory
+func InitRuntimeFiles() {
 	add := func(fileType RTFiletype, dir, pattern string) {
-		if user {
-			AddRuntimeFilesFromDirectory(fileType, filepath.Join(ConfigDir, dir), pattern)
-		}
-		AddRuntimeFilesFromAssets(fileType, filepath.Join("runtime", dir), pattern)
+		AddRuntimeFilesFromDirectory(fileType, filepath.Join(ConfigDir, dir), pattern)
+		AddRuntimeFilesFromAssets(fileType, path.Join("runtime", dir), pattern)
 	}

-	initRuntimeVars()
-
 	add(RTColorscheme, "colorschemes", "*.micro")
 	add(RTSyntax, "syntax", "*.yaml")
 	add(RTSyntaxHeader, "syntax", "*.hdr")
 	add(RTHelp, "help", "*.md")
-}

-// InitPlugins initializes the plugins
-func InitPlugins() {
-	Plugins = Plugins[:0]
 	initlua := filepath.Join(ConfigDir, "init.lua")
-
 	if _, err := os.Stat(initlua); !os.IsNotExist(err) {
 		p := new(Plugin)
 		p.Name = "initlua"
 		p.DirName = "initlua"
 		p.Srcs = append(p.Srcs, realFile(initlua))
-		p.Builtin = false
 		Plugins = append(Plugins, p)
 	}

 	// Search ConfigDir for plugin-scripts
 	plugdir := filepath.Join(ConfigDir, "plug")
-	files, _ := os.ReadDir(plugdir)
+	files, _ := ioutil.ReadDir(plugdir)

 	isID := regexp.MustCompile(`^[_A-Za-z0-9]+$`).MatchString

 	for _, d := range files {
-		plugpath := filepath.Join(plugdir, d.Name())
-		if stat, err := os.Stat(plugpath); err == nil && stat.IsDir() {
-			srcs, _ := os.ReadDir(plugpath)
+		if d.IsDir() {
+			srcs, _ := ioutil.ReadDir(filepath.Join(plugdir, d.Name()))
 			p := new(Plugin)
 			p.Name = d.Name()
 			p.DirName = d.Name()
@@ -208,7 +193,7 @@ func InitPlugins() {
 				if strings.HasSuffix(f.Name(), ".lua") {
 					p.Srcs = append(p.Srcs, realFile(filepath.Join(plugdir, d.Name(), f.Name())))
 				} else if strings.HasSuffix(f.Name(), ".json") {
-					data, err := os.ReadFile(filepath.Join(plugdir, d.Name(), f.Name()))
+					data, err := ioutil.ReadFile(filepath.Join(plugdir, d.Name(), f.Name()))
 					if err != nil {
 						continue
 					}
@@ -229,26 +214,18 @@ func InitPlugins() {
 	}

 	plugdir = filepath.Join("runtime", "plugins")
-	if files, err := rt.AssetDir(plugdir); err == nil {
-	outer:
+	if files, err := AssetDir(plugdir); err == nil {
 		for _, d := range files {
-			for _, p := range Plugins {
-				if p.Name == d {
-					log.Println(p.Name, "built-in plugin overridden by user-defined one")
-					continue outer
-				}
-			}
-
-			if srcs, err := rt.AssetDir(filepath.Join(plugdir, d)); err == nil {
+			if srcs, err := AssetDir(filepath.Join(plugdir, d)); err == nil {
 				p := new(Plugin)
 				p.Name = d
 				p.DirName = d
-				p.Builtin = true
+				p.Default = true
 				for _, f := range srcs {
 					if strings.HasSuffix(f, ".lua") {
 						p.Srcs = append(p.Srcs, assetFile(filepath.Join(plugdir, d, f)))
 					} else if strings.HasSuffix(f, ".json") {
-						data, err := rt.Asset(filepath.Join(plugdir, d, f))
+						data, err := Asset(filepath.Join(plugdir, d, f))
 						if err != nil {
 							continue
 						}
@@ -300,7 +277,7 @@ func PluginAddRuntimeFile(plugin string, filetype RTFiletype, filePath string) e
 	if _, err := os.Stat(fullpath); err == nil {
 		AddRealRuntimeFile(filetype, realFile(fullpath))
 	} else {
-		fullpath = filepath.Join("runtime", "plugins", pldir, filePath)
+		fullpath = path.Join("runtime", "plugins", pldir, filePath)
 		AddRuntimeFile(filetype, assetFile(fullpath))
 	}
 	return nil
@@ -317,7 +294,7 @@ func PluginAddRuntimeFilesFromDirectory(plugin string, filetype RTFiletype, dire
 	if _, err := os.Stat(fullpath); err == nil {
 		AddRuntimeFilesFromDirectory(filetype, fullpath, pattern)
 	} else {
-		fullpath = filepath.Join("runtime", "plugins", pldir, directory)
+		fullpath = path.Join("runtime", "plugins", pldir, directory)
 		AddRuntimeFilesFromAssets(filetype, fullpath, pattern)
 	}
 	return nil
--- a/internal/config/rtfiles_test.go
+++ b/internal/config/rtfiles_test.go
@@ -7,7 +7,7 @@ import (
 )

 func init() {
-	InitRuntimeFiles(false)
+	InitRuntimeFiles()
 }

 func TestAddFile(t *testing.T) {
--- a/internal/config/runtime.go
+++ b/internal/config/runtime.go
--- a/internal/config/settings.go
+++ b/internal/config/settings.go
@@ -3,463 +3,223 @@ package config
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
-	"runtime"
 	"strconv"
 	"strings"

-	"github.com/micro-editor/json5"
-	"github.com/micro-editor/micro/v2/internal/util"
 	"github.com/zyedidia/glob"
+	"github.com/zyedidia/json5"
+	"github.com/zyedidia/micro/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 )

-type optionValidator func(string, any) error
-
-// a list of settings that need option validators
-var optionValidators = map[string]optionValidator{
-	"autosave":        validateNonNegativeValue,
-	"clipboard":       validateChoice,
-	"colorcolumn":     validateNonNegativeValue,
-	"colorscheme":     validateColorscheme,
-	"detectlimit":     validateNonNegativeValue,
-	"encoding":        validateEncoding,
-	"fileformat":      validateChoice,
-	"helpsplit":       validateChoice,
-	"matchbracestyle": validateChoice,
-	"multiopen":       validateChoice,
-	"pageoverlap":     validateNonNegativeValue,
-	"reload":          validateChoice,
-	"scrollmargin":    validateNonNegativeValue,
-	"scrollspeed":     validateNonNegativeValue,
-	"tabsize":         validatePositiveValue,
-	"truecolor":       validateChoice,
-}
-
-// a list of settings with pre-defined choices
-var OptionChoices = map[string][]string{
-	"clipboard":       {"internal", "external", "terminal"},
-	"fileformat":      {"unix", "dos"},
-	"helpsplit":       {"hsplit", "vsplit"},
-	"matchbracestyle": {"underline", "highlight"},
-	"multiopen":       {"tab", "hsplit", "vsplit"},
-	"reload":          {"prompt", "auto", "disabled"},
-	"truecolor":       {"auto", "on", "off"},
-}
-
-// a list of settings that can be globally and locally modified and their
-// default values
-var defaultCommonSettings = map[string]any{
-	"autoindent":      true,
-	"autosu":          false,
-	"backup":          true,
-	"backupdir":       "",
-	"basename":        false,
-	"colorcolumn":     float64(0),
-	"cursorline":      true,
-	"detectlimit":     float64(100),
-	"diffgutter":      false,
-	"encoding":        "utf-8",
-	"eofnewline":      true,
-	"fastdirty":       false,
-	"fileformat":      defaultFileFormat(),
-	"filetype":        "unknown",
-	"hlsearch":        false,
-	"hltaberrors":     false,
-	"hltrailingws":    false,
-	"ignorecase":      true,
-	"incsearch":       true,
-	"indentchar":      " ", // Deprecated
-	"keepautoindent":  false,
-	"matchbrace":      true,
-	"matchbraceleft":  true,
-	"matchbracestyle": "underline",
-	"mkparents":       false,
-	"pageoverlap":     float64(2),
-	"permbackup":      false,
-	"readonly":        false,
-	"relativeruler":   false,
-	"reload":          "prompt",
-	"rmtrailingws":    false,
-	"ruler":           true,
-	"savecursor":      false,
-	"saveundo":        false,
-	"scrollbar":       false,
-	"scrollmargin":    float64(3),
-	"scrollspeed":     float64(2),
-	"showchars":       "",
-	"smartpaste":      true,
-	"softwrap":        false,
-	"splitbottom":     true,
-	"splitright":      true,
-	"statusformatl":   "$(filename) $(modified)$(overwrite)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)",
-	"statusformatr":   "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help",
-	"statusline":      true,
-	"syntax":          true,
-	"tabmovement":     false,
-	"tabsize":         float64(4),
-	"tabstospaces":    false,
-	"truecolor":       "auto",
-	"useprimary":      true,
-	"wordwrap":        false,
-}
-
-// a list of settings that should only be globally modified and their
-// default values
-var DefaultGlobalOnlySettings = map[string]any{
-	"autosave":       float64(0),
-	"clipboard":      "external",
-	"colorscheme":    "default",
-	"divchars":       "|-",
-	"divreverse":     true,
-	"fakecursor":     defaultFakeCursor(),
-	"helpsplit":      "hsplit",
-	"infobar":        true,
-	"keymenu":        false,
-	"lockbindings":   false,
-	"mouse":          true,
-	"multiopen":      "tab",
-	"parsecursor":    false,
-	"paste":          false,
-	"pluginchannels": []string{"https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"},
-	"pluginrepos":    []string{},
-	"savehistory":    true,
-	"scrollbarchar":  "|",
-	"sucmd":          "sudo",
-	"tabhighlight":   false,
-	"tabreverse":     true,
-	"xterm":          false,
-}
-
-// a list of settings that should never be globally modified
-var LocalSettings = []string{
-	"filetype",
-	"readonly",
-}
+type optionValidator func(string, interface{}) error

 var (
-	ErrInvalidOption    = errors.New("Invalid option")
-	ErrInvalidValue     = errors.New("Invalid value")
-	ErrOptNotToggleable = errors.New("Option not toggleable")
+	ErrInvalidOption = errors.New("Invalid option")
+	ErrInvalidValue  = errors.New("Invalid value")

 	// The options that the user can set
-	GlobalSettings map[string]any
+	GlobalSettings map[string]interface{}

 	// This is the raw parsed json
-	parsedSettings     map[string]any
-	settingsParseError bool
-
-	// ModifiedSettings is a map of settings which should be written to disk
-	// because they have been modified by the user in this session
-	ModifiedSettings map[string]bool
-
-	// VolatileSettings is a map of settings which should not be written to disk
-	// because they have been temporarily set for this session only
-	VolatileSettings map[string]bool
+	parsedSettings map[string]interface{}
 )

-func writeFile(name string, txt []byte) error {
-	return util.SafeWrite(name, txt, false)
-}
-
 func init() {
-	ModifiedSettings = make(map[string]bool)
-	VolatileSettings = make(map[string]bool)
+	parsedSettings = make(map[string]interface{})
 }

-func validateParsedSettings() error {
-	var err error
-	defaults := DefaultAllSettings()
-	for k, v := range parsedSettings {
-		if strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
-			if strings.HasPrefix(k, "ft:") {
-				for k1, v1 := range v.(map[string]any) {
-					if _, ok := defaults[k1]; ok {
-						if e := verifySetting(k1, v1, defaults[k1]); e != nil {
-							err = e
-							parsedSettings[k].(map[string]any)[k1] = defaults[k1]
-							continue
-						}
-					}
-				}
-			} else {
-				tk := strings.TrimPrefix(k, "glob:")
-				if _, e := glob.Compile(tk); e != nil {
-					err = errors.New("Error with glob setting " + tk + ": " + e.Error())
-					delete(parsedSettings, k)
-					continue
-				}
-				if !strings.HasPrefix(k, "glob:") {
-					// Support non-prefixed glob settings but internally convert
-					// them to prefixed ones for simplicity.
-					delete(parsedSettings, k)
-					k = "glob:" + k
-					parsedSettings[k] = v
-				}
-				for k1, v1 := range v.(map[string]any) {
-					if _, ok := defaults[k1]; ok {
-						if e := verifySetting(k1, v1, defaults[k1]); e != nil {
-							err = e
-							parsedSettings[k].(map[string]any)[k1] = defaults[k1]
-							continue
-						}
-					}
-				}
-			}
-			continue
-		}
-
-		if k == "autosave" {
-			// if autosave is a boolean convert it to float
-			s, ok := v.(bool)
-			if ok {
-				if s {
-					parsedSettings["autosave"] = 8.0
-				} else {
-					parsedSettings["autosave"] = 0.0
-				}
-			}
-			continue
-		}
-
-		if _, ok := defaults[k]; ok {
-			if e := verifySetting(k, v, defaults[k]); e != nil {
-				err = e
-				parsedSettings[k] = defaults[k]
-				continue
-			}
-		}
-	}
-	return err
+// Options with validators
+var optionValidators = map[string]optionValidator{
+	"autosave":     validateNonNegativeValue,
+	"tabsize":      validatePositiveValue,
+	"scrollmargin": validateNonNegativeValue,
+	"scrollspeed":  validateNonNegativeValue,
+	"colorscheme":  validateColorscheme,
+	"colorcolumn":  validateNonNegativeValue,
+	"fileformat":   validateLineEnding,
+	"encoding":     validateEncoding,
 }

 func ReadSettings() error {
-	parsedSettings = make(map[string]any)
 	filename := filepath.Join(ConfigDir, "settings.json")
 	if _, e := os.Stat(filename); e == nil {
-		input, err := os.ReadFile(filename)
+		input, err := ioutil.ReadFile(filename)
 		if err != nil {
-			settingsParseError = true
 			return errors.New("Error reading settings.json file: " + err.Error())
 		}
 		if !strings.HasPrefix(string(input), "null") {
 			// Unmarshal the input into the parsed map
 			err = json5.Unmarshal(input, &parsedSettings)
 			if err != nil {
-				settingsParseError = true
 				return errors.New("Error reading settings.json: " + err.Error())
 			}
-			err = validateParsedSettings()
-			if err != nil {
-				return err
+
+			// check if autosave is a boolean and convert it to float if so
+			if v, ok := parsedSettings["autosave"]; ok {
+				s, ok := v.(bool)
+				if ok {
+					if s {
+						parsedSettings["autosave"] = 8.0
+					} else {
+						parsedSettings["autosave"] = 0.0
+					}
+				}
 			}
 		}
 	}
 	return nil
 }

-func ParsedSettings() map[string]any {
-	s := make(map[string]any)
-	for k, v := range parsedSettings {
-		if strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
-			continue
-		}
-		s[k] = v
-	}
-	return s
-}
-
-func verifySetting(option string, value any, def any) error {
-	var interfaceArr []any
-	valType := reflect.TypeOf(value)
-	defType := reflect.TypeOf(def)
-	assignable := false
-
-	switch option {
-	case "pluginrepos", "pluginchannels":
-		assignable = valType.AssignableTo(reflect.TypeOf(interfaceArr))
-	default:
-		assignable = defType.AssignableTo(valType)
-	}
-	if !assignable {
-		return fmt.Errorf("Error: setting '%s' has incorrect type (%s), using default value: %v (%s)", option, valType, def, defType)
-	}
-
-	if option == "colorscheme" {
-		// Plugins are not initialized yet, so do not verify if the colorscheme
-		// exists yet, since the colorscheme may be added by a plugin later.
-		return nil
-	}
-
-	if err := OptionIsValid(option, value); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // InitGlobalSettings initializes the options map and sets all options to their default values
 // Must be called after ReadSettings
-func InitGlobalSettings() error {
-	var err error
-	GlobalSettings = DefaultAllSettings()
+func InitGlobalSettings() {
+	GlobalSettings = DefaultGlobalSettings()

 	for k, v := range parsedSettings {
 		if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
 			GlobalSettings[k] = v
 		}
 	}
-	return err
 }

-// UpdatePathGlobLocals scans the already parsed settings and sets the options locally
-// based on whether the path matches a glob
+// InitLocalSettings scans the json in settings.json and sets the options locally based
+// on whether the filetype or path matches ft or glob local settings
 // Must be called after ReadSettings
-func UpdatePathGlobLocals(settings map[string]any, path string) {
+func InitLocalSettings(settings map[string]interface{}, path string) error {
+	var parseError error
 	for k, v := range parsedSettings {
-		if strings.HasPrefix(reflect.TypeOf(v).String(), "map") && strings.HasPrefix(k, "glob:") {
-			tk := strings.TrimPrefix(k, "glob:")
-			g, _ := glob.Compile(tk)
-			if g.MatchString(path) {
-				for k1, v1 := range v.(map[string]any) {
-					settings[k1] = v1
+		if strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
+			if strings.HasPrefix(k, "ft:") {
+				if settings["filetype"].(string) == k[3:] {
+					for k1, v1 := range v.(map[string]interface{}) {
+						settings[k1] = v1
+					}
+				}
+			} else {
+				g, err := glob.Compile(k)
+				if err != nil {
+					parseError = errors.New("Error with glob setting " + k + ": " + err.Error())
+					continue
 				}
-			}
-		}
-	}
-}

-// UpdateFileTypeLocals scans the already parsed settings and sets the options locally
-// based on whether the filetype matches to "ft:"
-// Must be called after ReadSettings
-func UpdateFileTypeLocals(settings map[string]any, filetype string) {
-	for k, v := range parsedSettings {
-		if strings.HasPrefix(reflect.TypeOf(v).String(), "map") && strings.HasPrefix(k, "ft:") {
-			if filetype == k[3:] {
-				for k1, v1 := range v.(map[string]any) {
-					if k1 != "filetype" {
+				if g.MatchString(path) {
+					for k1, v1 := range v.(map[string]interface{}) {
 						settings[k1] = v1
 					}
 				}
 			}
 		}
 	}
+	return parseError
 }

 // WriteSettings writes the settings to the specified filename as JSON
 func WriteSettings(filename string) error {
-	if settingsParseError {
-		// Don't write settings if there was a parse error
-		// because this will delete the settings.json if it
-		// is invalid. Instead we should allow the user to fix
-		// it manually.
-		return nil
-	}
-
 	var err error
 	if _, e := os.Stat(ConfigDir); e == nil {
-		defaults := DefaultAllSettings()
-
-		// remove any options froms parsedSettings that have since been marked as default
-		for k, v := range parsedSettings {
-			if !strings.HasPrefix(reflect.TypeOf(v).String(), "map") {
-				cur, okcur := GlobalSettings[k]
-				_, vol := VolatileSettings[k]
-				if def, ok := defaults[k]; ok && okcur && !vol && reflect.DeepEqual(cur, def) {
-					delete(parsedSettings, k)
-				}
-			}
-		}
-
-		// add any options to parsedSettings that have since been marked as non-default
 		for k, v := range GlobalSettings {
-			if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
-				if _, wr := ModifiedSettings[k]; wr {
-					parsedSettings[k] = v
-				}
-			}
+			parsedSettings[k] = v
 		}

 		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
-		txt = append(txt, '\n')
-		err = writeFile(filename, txt)
+		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return err
 }

-// OverwriteSettings writes the current settings to settings.json and
-// resets any user configuration of local settings present in settings.json
 func OverwriteSettings(filename string) error {
-	settings := make(map[string]any)
-
 	var err error
 	if _, e := os.Stat(ConfigDir); e == nil {
-		defaults := DefaultAllSettings()
-		for k, v := range GlobalSettings {
-			if def, ok := defaults[k]; !ok || !reflect.DeepEqual(v, def) {
-				if _, wr := ModifiedSettings[k]; wr {
-					settings[k] = v
-				}
-			}
-		}
-
-		txt, _ := json.MarshalIndent(parsedSettings, "", "    ")
-		txt = append(txt, '\n')
-		err = writeFile(filename, txt)
+		txt, _ := json.MarshalIndent(GlobalSettings, "", "    ")
+		err = ioutil.WriteFile(filename, append(txt, '\n'), 0644)
 	}
 	return err
 }

 // RegisterCommonOptionPlug creates a new option (called pl.name). This is meant to be called by plugins to add options.
-func RegisterCommonOptionPlug(pl string, name string, defaultvalue any) error {
-	return RegisterCommonOption(pl+"."+name, defaultvalue)
-}
-
-// RegisterGlobalOptionPlug creates a new global-only option (named pl.name)
-func RegisterGlobalOptionPlug(pl string, name string, defaultvalue any) error {
-	return RegisterGlobalOption(pl+"."+name, defaultvalue)
-}
-
-// RegisterCommonOption creates a new option
-func RegisterCommonOption(name string, defaultvalue any) error {
-	if _, ok := GlobalSettings[name]; !ok {
+func RegisterCommonOptionPlug(pl string, name string, defaultvalue interface{}) error {
+	name = pl + "." + name
+	if v, ok := GlobalSettings[name]; !ok {
+		defaultCommonSettings[name] = defaultvalue
 		GlobalSettings[name] = defaultvalue
+		err := WriteSettings(filepath.Join(ConfigDir, "settings.json"))
+		if err != nil {
+			return errors.New("Error writing settings.json file: " + err.Error())
+		}
+	} else {
+		defaultCommonSettings[name] = v
 	}
-	defaultCommonSettings[name] = defaultvalue
 	return nil
 }

+// RegisterGlobalOptionPlug creates a new global-only option (named pl.name)
+func RegisterGlobalOptionPlug(pl string, name string, defaultvalue interface{}) error {
+	return RegisterGlobalOption(pl+"."+name, defaultvalue)
+}
+
 // RegisterGlobalOption creates a new global-only option
-func RegisterGlobalOption(name string, defaultvalue any) error {
-	if _, ok := GlobalSettings[name]; !ok {
+func RegisterGlobalOption(name string, defaultvalue interface{}) error {
+	if v, ok := GlobalSettings[name]; !ok {
+		DefaultGlobalOnlySettings[name] = defaultvalue
 		GlobalSettings[name] = defaultvalue
+		err := WriteSettings(filepath.Join(ConfigDir, "settings.json"))
+		if err != nil {
+			return errors.New("Error writing settings.json file: " + err.Error())
+		}
+	} else {
+		DefaultGlobalOnlySettings[name] = v
 	}
-	DefaultGlobalOnlySettings[name] = defaultvalue
 	return nil
 }

 // GetGlobalOption returns the global value of the given option
-func GetGlobalOption(name string) any {
+func GetGlobalOption(name string) interface{} {
 	return GlobalSettings[name]
 }

-func defaultFileFormat() string {
-	if runtime.GOOS == "windows" {
-		return "dos"
-	}
-	return "unix"
-}
-
-func defaultFakeCursor() bool {
-	_, wt := os.LookupEnv("WT_SESSION")
-	if runtime.GOOS == "windows" && !wt {
-		// enabled for windows consoles where the cursor is slow
-		return true
-	}
-	return false
+var defaultCommonSettings = map[string]interface{}{
+	"autoindent":     true,
+	"autosu":         false,
+	"backup":         true,
+	"basename":       false,
+	"colorcolumn":    float64(0),
+	"cursorline":     true,
+	"diffgutter":     false,
+	"encoding":       "utf-8",
+	"eofnewline":     false,
+	"fastdirty":      false,
+	"fileformat":     "unix",
+	"filetype":       "unknown",
+	"ignorecase":     false,
+	"indentchar":     " ",
+	"keepautoindent": false,
+	"matchbrace":     true,
+	"mkparents":      false,
+	"readonly":       false,
+	"rmtrailingws":   false,
+	"ruler":          true,
+	"savecursor":     false,
+	"saveundo":       false,
+	"scrollbar":      false,
+	"scrollmargin":   float64(3),
+	"scrollspeed":    float64(2),
+	"smartpaste":     true,
+	"softwrap":       false,
+	"splitbottom":    true,
+	"splitright":     true,
+	"statusformatl":  "$(filename) $(modified)($(line),$(col)) $(status.paste)| ft:$(opt:filetype) | $(opt:fileformat) | $(opt:encoding)",
+	"statusformatr":  "$(bind:ToggleKeyMenu): bindings, $(bind:ToggleHelp): help",
+	"statusline":     true,
+	"syntax":         true,
+	"tabmovement":    false,
+	"tabsize":        float64(4),
+	"tabstospaces":   false,
+	"useprimary":     true,
 }

 func GetInfoBarOffset() int {
@@ -473,20 +233,55 @@ func GetInfoBarOffset() int {
 	return offset
 }

-// DefaultCommonSettings returns a map of all common buffer settings
-// and their default values
-func DefaultCommonSettings() map[string]any {
-	commonsettings := make(map[string]any)
+// DefaultCommonSettings returns the default global settings for micro
+// Note that colorscheme is a global only option
+func DefaultCommonSettings() map[string]interface{} {
+	commonsettings := make(map[string]interface{})
 	for k, v := range defaultCommonSettings {
 		commonsettings[k] = v
 	}
 	return commonsettings
 }

-// DefaultAllSettings returns a map of all common buffer & global-only settings
-// and their default values
-func DefaultAllSettings() map[string]any {
-	allsettings := make(map[string]any)
+// a list of settings that should only be globally modified and their
+// default values
+var DefaultGlobalOnlySettings = map[string]interface{}{
+	"autosave":       float64(0),
+	"colorscheme":    "default",
+	"infobar":        true,
+	"keymenu":        false,
+	"mouse":          true,
+	"paste":          false,
+	"savehistory":    true,
+	"sucmd":          "sudo",
+	"pluginchannels": []string{"https://raw.githubusercontent.com/micro-editor/plugin-channel/master/channel.json"},
+	"pluginrepos":    []string{},
+	"xterm":          false,
+}
+
+// a list of settings that should never be globally modified
+var LocalSettings = []string{
+	"filetype",
+	"readonly",
+}
+
+// DefaultGlobalSettings returns the default global settings for micro
+// Note that colorscheme is a global only option
+func DefaultGlobalSettings() map[string]interface{} {
+	globalsettings := make(map[string]interface{})
+	for k, v := range defaultCommonSettings {
+		globalsettings[k] = v
+	}
+	for k, v := range DefaultGlobalOnlySettings {
+		globalsettings[k] = v
+	}
+	return globalsettings
+}
+
+// DefaultAllSettings returns a map of all settings and their
+// default values (both common and global settings)
+func DefaultAllSettings() map[string]interface{} {
+	allsettings := make(map[string]interface{})
 	for k, v := range defaultCommonSettings {
 		allsettings[k] = v
 	}
@@ -497,34 +292,35 @@ func DefaultAllSettings() map[string]any {
 }

 // GetNativeValue parses and validates a value for a given option
-func GetNativeValue(option, value string) (any, error) {
-	curVal := GetGlobalOption(option)
-	if curVal == nil {
-		return nil, ErrInvalidOption
-	}
-
-	switch kind := reflect.TypeOf(curVal).Kind(); kind {
-	case reflect.Bool:
+func GetNativeValue(option string, realValue interface{}, value string) (interface{}, error) {
+	var native interface{}
+	kind := reflect.TypeOf(realValue).Kind()
+	if kind == reflect.Bool {
 		b, err := util.ParseBool(value)
 		if err != nil {
 			return nil, ErrInvalidValue
 		}
-		return b, nil
-	case reflect.String:
-		return value, nil
-	case reflect.Float64:
-		f, err := strconv.ParseFloat(value, 64)
+		native = b
+	} else if kind == reflect.String {
+		native = value
+	} else if kind == reflect.Float64 {
+		i, err := strconv.Atoi(value)
 		if err != nil {
 			return nil, ErrInvalidValue
 		}
-		return f, nil
-	default:
+		native = float64(i)
+	} else {
 		return nil, ErrInvalidValue
 	}
+
+	if err := OptionIsValid(option, native); err != nil {
+		return nil, err
+	}
+	return native, nil
 }

 // OptionIsValid checks if a value is valid for a certain option
-func OptionIsValid(option string, value any) error {
+func OptionIsValid(option string, value interface{}) error {
 	if validator, ok := optionValidators[option]; ok {
 		return validator(option, value)
 	}
@@ -534,21 +330,21 @@ func OptionIsValid(option string, value any) error {

 // Option validators

-func validatePositiveValue(option string, value any) error {
-	nativeValue, ok := value.(float64)
+func validatePositiveValue(option string, value interface{}) error {
+	tabsize, ok := value.(float64)

 	if !ok {
 		return errors.New("Expected numeric type for " + option)
 	}

-	if nativeValue < 1 {
+	if tabsize < 1 {
 		return errors.New(option + " must be greater than 0")
 	}

 	return nil
 }

-func validateNonNegativeValue(option string, value any) error {
+func validateNonNegativeValue(option string, value interface{}) error {
 	nativeValue, ok := value.(float64)

 	if !ok {
@@ -562,27 +358,7 @@ func validateNonNegativeValue(option string, value any) error {
 	return nil
 }

-func validateChoice(option string, value any) error {
-	if choices, ok := OptionChoices[option]; ok {
-		val, ok := value.(string)
-		if !ok {
-			return errors.New("Expected string type for " + option)
-		}
-
-		for _, v := range choices {
-			if val == v {
-				return nil
-			}
-		}
-
-		choicesStr := strings.Join(choices, ", ")
-		return errors.New(option + " must be one of: " + choicesStr)
-	}
-
-	return errors.New("Option has no pre-defined choices")
-}
-
-func validateColorscheme(option string, value any) error {
+func validateColorscheme(option string, value interface{}) error {
 	colorscheme, ok := value.(string)

 	if !ok {
@@ -596,7 +372,21 @@ func validateColorscheme(option string, value any) error {
 	return nil
 }

-func validateEncoding(option string, value any) error {
+func validateLineEnding(option string, value interface{}) error {
+	endingType, ok := value.(string)
+
+	if !ok {
+		return errors.New("Expected string type for file format")
+	}
+
+	if endingType != "unix" && endingType != "dos" {
+		return errors.New("File format must be either 'unix' or 'dos'")
+	}
+
+	return nil
+}
+
+func validateEncoding(option string, value interface{}) error {
 	_, err := htmlindex.Get(value.(string))
 	return err
 }
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
--- a/internal/display/infowindow.go
+++ b/internal/display/infowindow.go
@@ -1,13 +1,15 @@
 package display

 import (
+	"unicode/utf8"
+
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/info"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/info"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/tcell"
 )

 type InfoWindow struct {
@@ -68,27 +70,10 @@ func (i *InfoWindow) IsActive() bool   { return true }
 func (i *InfoWindow) LocFromVisual(vloc buffer.Loc) buffer.Loc {
 	c := i.Buffer.GetActiveCursor()
 	l := i.Buffer.LineBytes(0)
-	n := util.CharacterCountInString(i.Msg)
+	n := utf8.RuneCountInString(i.Msg)
 	return buffer.Loc{c.GetCharPosInLine(l, vloc.X-n), 0}
 }

-func (i *InfoWindow) BufView() View {
-	return View{
-		X:         0,
-		Y:         i.Y,
-		Width:     i.Width,
-		Height:    1,
-		StartLine: SLoc{0, 0},
-		StartCol:  0,
-	}
-}
-
-func (i *InfoWindow) Scroll(s SLoc, n int) SLoc        { return s }
-func (i *InfoWindow) Diff(s1, s2 SLoc) int             { return 0 }
-func (i *InfoWindow) SLocFromLoc(loc buffer.Loc) SLoc  { return SLoc{0, 0} }
-func (i *InfoWindow) VLocFromLoc(loc buffer.Loc) VLoc  { return VLoc{SLoc{0, 0}, loc.X} }
-func (i *InfoWindow) LocFromVLoc(vloc VLoc) buffer.Loc { return buffer.Loc{vloc.VisualX, 0} }
-
 func (i *InfoWindow) Clear() {
 	for x := 0; x < i.Width; x++ {
 		screen.SetContent(x, i.Y, ' ', nil, i.defStyle())
@@ -101,13 +86,13 @@ func (i *InfoWindow) displayBuffer() {
 	activeC := b.GetActiveCursor()

 	blocX := 0
-	vlocX := util.CharacterCountInString(i.Msg)
+	vlocX := utf8.RuneCountInString(i.Msg)

 	tabsize := 4
 	line, nColsBeforeStart, bslice := util.SliceVisualEnd(line, blocX, tabsize)
 	blocX = bslice

-	draw := func(r rune, combc []rune, style tcell.Style) {
+	draw := func(r rune, style tcell.Style) {
 		if nColsBeforeStart <= 0 {
 			bloc := buffer.Loc{X: blocX, Y: 0}
 			if activeC.HasSelection() &&
@@ -122,8 +107,15 @@ func (i *InfoWindow) displayBuffer() {

 			}

-			screen.SetContent(vlocX, i.Y, r, combc, style)
-			vlocX += runewidth.RuneWidth(r)
+			rw := runewidth.RuneWidth(r)
+			for j := 0; j < rw; j++ {
+				c := r
+				if j > 0 {
+					c = ' '
+				}
+				screen.SetContent(vlocX, i.Y, c, nil, style)
+			}
+			vlocX++
 		}
 		nColsBeforeStart--
 	}
@@ -132,24 +124,31 @@ func (i *InfoWindow) displayBuffer() {
 	for len(line) > 0 {
 		curVX := vlocX
 		curBX := blocX
-		r, combc, size := util.DecodeCharacter(line)
+		r, size := utf8.DecodeRune(line)
+
+		draw(r, i.defStyle())

 		width := 0

+		char := ' '
 		switch r {
 		case '\t':
-			width = tabsize - (totalwidth % tabsize)
-			for j := 0; j < width; j++ {
-				draw(' ', nil, i.defStyle())
-			}
+			ts := tabsize - (totalwidth % tabsize)
+			width = ts
 		default:
 			width = runewidth.RuneWidth(r)
-			draw(r, combc, i.defStyle())
+			char = '@'
 		}

 		blocX++
 		line = line[size:]

+		// Draw any extra characters either spaces for tabs or @ for incomplete wide runes
+		if width > 1 {
+			for j := 1; j < width; j++ {
+				draw(char, i.defStyle())
+			}
+		}
 		if activeC.X == curBX {
 			screen.ShowCursor(curVX, i.Y)
 		}
@@ -192,7 +191,7 @@ func (i *InfoWindow) scrollToSuggestion() {
 	s := i.totalSize()

 	for j, n := range i.Suggestions {
-		c := util.CharacterCountInString(n)
+		c := utf8.RuneCountInString(n)
 		if j == i.CurSuggestion {
 			if x+c >= i.hscroll+i.Width {
 				i.hscroll = util.Clamp(x+c+1-i.Width, 0, s-i.Width)
@@ -210,13 +209,13 @@ func (i *InfoWindow) scrollToSuggestion() {
 }

 func (i *InfoWindow) Display() {
-	if i.HasPrompt || config.GlobalSettings["infobar"].(bool) {
-		i.Clear()
-		x := 0
-		if config.GetGlobalOption("keymenu").(bool) {
-			i.displayKeyMenu()
-		}
+	i.Clear()
+	x := 0
+	if config.GetGlobalOption("keymenu").(bool) {
+		i.displayKeyMenu()
+	}

+	if i.HasPrompt || config.GlobalSettings["infobar"].(bool) {
 		if !i.HasPrompt && !i.HasMessage && !i.HasError {
 			return
 		}
@@ -245,9 +244,7 @@ func (i *InfoWindow) Display() {
 		done := false

 		statusLineStyle := config.DefStyle.Reverse(true)
-		if style, ok := config.Colorscheme["statusline.suggestions"]; ok {
-			statusLineStyle = style
-		} else if style, ok := config.Colorscheme["statusline"]; ok {
+		if style, ok := config.Colorscheme["statusline"]; ok {
 			statusLineStyle = style
 		}
 		keymenuOffset := 0
--- a/internal/display/softwrap.go
+++ b/internal/display/softwrap.go
@@ -1,342 +0,0 @@
-package display
-
-import (
-	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/util"
-)
-
-// SLoc represents a vertical scrolling location, i.e. a location of a visual line
-// in the buffer. When softwrap is enabled, a buffer line may be displayed as
-// multiple visual lines (rows). So SLoc stores a number of a line in the buffer
-// and a number of a row within this line.
-type SLoc struct {
-	Line, Row int
-}
-
-// LessThan returns true if s is less b
-func (s SLoc) LessThan(b SLoc) bool {
-	if s.Line < b.Line {
-		return true
-	}
-	return s.Line == b.Line && s.Row < b.Row
-}
-
-// GreaterThan returns true if s is bigger than b
-func (s SLoc) GreaterThan(b SLoc) bool {
-	if s.Line > b.Line {
-		return true
-	}
-	return s.Line == b.Line && s.Row > b.Row
-}
-
-// LessEqual returns true if s is less than or equal to b
-func (s SLoc) LessEqual(b SLoc) bool {
-	if s.Line < b.Line {
-		return true
-	}
-	if s.Line == b.Line && s.Row < b.Row {
-		return true
-	}
-	return s == b
-}
-
-// GreaterEqual returns true if s is bigger than or equal to b
-func (s SLoc) GreaterEqual(b SLoc) bool {
-	if s.Line > b.Line {
-		return true
-	}
-	if s.Line == b.Line && s.Row > b.Row {
-		return true
-	}
-	return s == b
-}
-
-// VLoc represents a location in the buffer as a visual location in the
-// linewrapped buffer.
-type VLoc struct {
-	SLoc
-	VisualX int
-}
-
-type SoftWrap interface {
-	Scroll(s SLoc, n int) SLoc
-	Diff(s1, s2 SLoc) int
-	SLocFromLoc(loc buffer.Loc) SLoc
-	VLocFromLoc(loc buffer.Loc) VLoc
-	LocFromVLoc(vloc VLoc) buffer.Loc
-}
-
-func (w *BufWindow) getVLocFromLoc(loc buffer.Loc) VLoc {
-	vloc := VLoc{SLoc: SLoc{loc.Y, 0}, VisualX: 0}
-
-	if loc.X <= 0 {
-		return vloc
-	}
-
-	if w.bufWidth <= 0 {
-		return vloc
-	}
-
-	wordwrap := w.Buf.Settings["wordwrap"].(bool)
-	tabsize := util.IntOpt(w.Buf.Settings["tabsize"])
-
-	line := w.Buf.LineBytes(loc.Y)
-	x := 0
-	totalwidth := 0
-
-	wordwidth := 0
-	wordoffset := 0
-
-	for len(line) > 0 {
-		r, _, size := util.DecodeCharacter(line)
-		line = line[size:]
-
-		width := 0
-		switch r {
-		case '\t':
-			ts := tabsize - (totalwidth % tabsize)
-			width = util.Min(ts, w.bufWidth-vloc.VisualX)
-			totalwidth += ts
-		default:
-			width = runewidth.RuneWidth(r)
-			totalwidth += width
-		}
-
-		wordwidth += width
-
-		// Collect a complete word to know its width.
-		// If wordwrap is off, every single character is a complete "word".
-		if wordwrap {
-			if !util.IsWhitespace(r) && len(line) > 0 && wordwidth < w.bufWidth {
-				if x < loc.X {
-					wordoffset += width
-					x++
-				}
-				continue
-			}
-		}
-
-		// If a word (or just a wide rune) does not fit in the window
-		if vloc.VisualX+wordwidth > w.bufWidth && vloc.VisualX > 0 {
-			vloc.Row++
-			vloc.VisualX = 0
-		}
-
-		if x == loc.X {
-			vloc.VisualX += wordoffset
-			return vloc
-		}
-		x++
-
-		vloc.VisualX += wordwidth
-
-		wordwidth = 0
-		wordoffset = 0
-
-		if vloc.VisualX >= w.bufWidth {
-			vloc.Row++
-			vloc.VisualX = 0
-		}
-	}
-	return vloc
-}
-
-func (w *BufWindow) getLocFromVLoc(svloc VLoc) buffer.Loc {
-	loc := buffer.Loc{X: 0, Y: svloc.Line}
-
-	if w.bufWidth <= 0 {
-		return loc
-	}
-
-	wordwrap := w.Buf.Settings["wordwrap"].(bool)
-	tabsize := util.IntOpt(w.Buf.Settings["tabsize"])
-
-	line := w.Buf.LineBytes(svloc.Line)
-	vloc := VLoc{SLoc: SLoc{svloc.Line, 0}, VisualX: 0}
-
-	totalwidth := 0
-
-	var widths []int
-	if wordwrap {
-		widths = make([]int, 0, w.bufWidth)
-	} else {
-		widths = make([]int, 0, 1)
-	}
-	wordwidth := 0
-
-	for len(line) > 0 {
-		r, _, size := util.DecodeCharacter(line)
-		line = line[size:]
-
-		width := 0
-		switch r {
-		case '\t':
-			ts := tabsize - (totalwidth % tabsize)
-			width = util.Min(ts, w.bufWidth-vloc.VisualX)
-			totalwidth += ts
-		default:
-			width = runewidth.RuneWidth(r)
-			totalwidth += width
-		}
-
-		widths = append(widths, width)
-		wordwidth += width
-
-		// Collect a complete word to know its width.
-		// If wordwrap is off, every single character is a complete "word".
-		if wordwrap {
-			if !util.IsWhitespace(r) && len(line) > 0 && wordwidth < w.bufWidth {
-				continue
-			}
-		}
-
-		// If a word (or just a wide rune) does not fit in the window
-		if vloc.VisualX+wordwidth > w.bufWidth && vloc.VisualX > 0 {
-			if vloc.Row == svloc.Row {
-				if wordwrap {
-					// it's a word, not a wide rune
-					loc.X--
-				}
-				return loc
-			}
-			vloc.Row++
-			vloc.VisualX = 0
-		}
-
-		for i := range widths {
-			vloc.VisualX += widths[i]
-			if vloc.Row == svloc.Row && vloc.VisualX > svloc.VisualX {
-				return loc
-			}
-			loc.X++
-		}
-
-		widths = widths[:0]
-		wordwidth = 0
-
-		if vloc.VisualX >= w.bufWidth {
-			vloc.Row++
-			vloc.VisualX = 0
-		}
-	}
-	return loc
-}
-
-func (w *BufWindow) getRowCount(line int) int {
-	eol := buffer.Loc{X: util.CharacterCount(w.Buf.LineBytes(line)), Y: line}
-	return w.getVLocFromLoc(eol).Row + 1
-}
-
-func (w *BufWindow) scrollUp(s SLoc, n int) SLoc {
-	for n > 0 {
-		if n <= s.Row {
-			s.Row -= n
-			n = 0
-		} else if s.Line > 0 {
-			s.Line--
-			n -= s.Row + 1
-			s.Row = w.getRowCount(s.Line) - 1
-		} else {
-			s.Row = 0
-			break
-		}
-	}
-	return s
-}
-
-func (w *BufWindow) scrollDown(s SLoc, n int) SLoc {
-	for n > 0 {
-		rc := w.getRowCount(s.Line)
-		if n < rc-s.Row {
-			s.Row += n
-			n = 0
-		} else if s.Line < w.Buf.LinesNum()-1 {
-			s.Line++
-			n -= rc - s.Row
-			s.Row = 0
-		} else {
-			s.Row = rc - 1
-			break
-		}
-	}
-	return s
-}
-
-func (w *BufWindow) scroll(s SLoc, n int) SLoc {
-	if n < 0 {
-		return w.scrollUp(s, -n)
-	}
-	return w.scrollDown(s, n)
-}
-
-func (w *BufWindow) diff(s1, s2 SLoc) int {
-	n := 0
-	for s1.LessThan(s2) {
-		if s1.Line < s2.Line {
-			n += w.getRowCount(s1.Line) - s1.Row
-			s1.Line++
-			s1.Row = 0
-		} else {
-			n += s2.Row - s1.Row
-			s1.Row = s2.Row
-		}
-	}
-	return n
-}
-
-// Scroll returns the location which is n visual lines below the location s
-// i.e. the result of scrolling n lines down. n can be negative,
-// which means scrolling up. The returned location is guaranteed to be
-// within the buffer boundaries.
-func (w *BufWindow) Scroll(s SLoc, n int) SLoc {
-	if !w.Buf.Settings["softwrap"].(bool) {
-		s.Line = util.Clamp(s.Line+n, 0, w.Buf.LinesNum()-1)
-		return s
-	}
-	return w.scroll(s, n)
-}
-
-// Diff returns the difference (the vertical distance) between two SLocs.
-func (w *BufWindow) Diff(s1, s2 SLoc) int {
-	if !w.Buf.Settings["softwrap"].(bool) {
-		return s2.Line - s1.Line
-	}
-	if s1.GreaterThan(s2) {
-		return -w.diff(s2, s1)
-	}
-	return w.diff(s1, s2)
-}
-
-// SLocFromLoc takes a position in the buffer and returns the location
-// of the visual line containing this position.
-func (w *BufWindow) SLocFromLoc(loc buffer.Loc) SLoc {
-	if !w.Buf.Settings["softwrap"].(bool) {
-		return SLoc{loc.Y, 0}
-	}
-	return w.getVLocFromLoc(loc).SLoc
-}
-
-// VLocFromLoc takes a position in the buffer and returns the corresponding
-// visual location in the linewrapped buffer.
-func (w *BufWindow) VLocFromLoc(loc buffer.Loc) VLoc {
-	if !w.Buf.Settings["softwrap"].(bool) {
-		tabsize := util.IntOpt(w.Buf.Settings["tabsize"])
-
-		visualx := util.StringWidth(w.Buf.LineBytes(loc.Y), loc.X, tabsize)
-		return VLoc{SLoc{loc.Y, 0}, visualx}
-	}
-	return w.getVLocFromLoc(loc)
-}
-
-// LocFromVLoc takes a visual location in the linewrapped buffer and returns
-// the position in the buffer corresponding to this visual location.
-func (w *BufWindow) LocFromVLoc(vloc VLoc) buffer.Loc {
-	if !w.Buf.Settings["softwrap"].(bool) {
-		tabsize := util.IntOpt(w.Buf.Settings["tabsize"])
-
-		x := util.GetCharPosInLine(w.Buf.LineBytes(vloc.Line), vloc.VisualX, tabsize)
-		return buffer.Loc{x, vloc.Line}
-	}
-	return w.getLocFromVLoc(vloc)
-}
--- a/internal/display/statusline.go
+++ b/internal/display/statusline.go
@@ -3,19 +3,21 @@ package display
 import (
 	"bytes"
 	"fmt"
+	"path"
 	"regexp"
 	"strconv"
 	"strings"
+	"unicode/utf8"

 	luar "layeh.com/gopher-luar"

 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	ulua "github.com/micro-editor/micro/v2/internal/lua"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
 	lua "github.com/yuin/gopher-lua"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	ulua "github.com/zyedidia/micro/internal/lua"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
 )

 // StatusLine represents the information line at the bottom
@@ -30,6 +32,9 @@ type StatusLine struct {

 var statusInfo = map[string]func(*buffer.Buffer) string{
 	"filename": func(b *buffer.Buffer) string {
+		if b.Settings["basename"].(bool) {
+			return path.Base(b.GetName())
+		}
 		return b.GetName()
 	},
 	"line": func(b *buffer.Buffer) string {
@@ -47,18 +52,6 @@ var statusInfo = map[string]func(*buffer.Buffer) string{
 		}
 		return ""
 	},
-	"overwrite": func(b *buffer.Buffer) string {
-		if b.OverwriteMode && !b.Type.Readonly {
-			return "[ovwr] "
-		}
-		return ""
-	},
-	"lines": func(b *buffer.Buffer) string {
-		return strconv.Itoa(b.LinesNum())
-	},
-	"percentage": func(b *buffer.Buffer) string {
-		return strconv.Itoa((b.GetActiveCursor().Y + 1) * 100 / b.LinesNum())
-	},
 }

 func SetStatusInfoFnLua(fn string) {
@@ -72,7 +65,7 @@ func SetStatusInfoFnLua(fn string) {
 		return
 	}
 	statusInfo[fn] = func(b *buffer.Buffer) string {
-		if pl == nil || !pl.IsLoaded() {
+		if pl == nil || !pl.IsEnabled() {
 			return ""
 		}
 		val, err := pl.Call(plFn, luar.New(ulua.L, b))
@@ -96,7 +89,7 @@ func NewStatusLine(win *BufWindow) *StatusLine {
 }

 // FindOpt finds a given option in the current buffer's settings
-func (s *StatusLine) FindOpt(opt string) any {
+func (s *StatusLine) FindOpt(opt string) interface{} {
 	if val, ok := s.win.Buf.Settings[opt]; ok {
 		return val
 	}
@@ -110,17 +103,17 @@ func (s *StatusLine) Display() {
 	// We'll draw the line at the lowest line in the window
 	y := s.win.Height + s.win.Y - 1

-	winX := s.win.X
-
 	b := s.win.Buf
 	// autocomplete suggestions (for the buffer, not for the infowindow)
 	if b.HasSuggestions && len(b.Suggestions) > 1 {
 		statusLineStyle := config.DefStyle.Reverse(true)
-		if style, ok := config.Colorscheme["statusline.suggestions"]; ok {
-			statusLineStyle = style
-		} else if style, ok := config.Colorscheme["statusline"]; ok {
+		if style, ok := config.Colorscheme["statusline"]; ok {
 			statusLineStyle = style
 		}
+		keymenuOffset := 0
+		if config.GetGlobalOption("keymenu").(bool) {
+			keymenuOffset = len(keydisplay)
+		}
 		x := 0
 		for j, sug := range b.Suggestions {
 			style := statusLineStyle
@@ -128,13 +121,13 @@ func (s *StatusLine) Display() {
 				style = style.Reverse(true)
 			}
 			for _, r := range sug {
-				screen.SetContent(winX+x, y, r, nil, style)
+				screen.SetContent(x, y-keymenuOffset, r, nil, style)
 				x++
 				if x >= s.win.Width {
 					return
 				}
 			}
-			screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
+			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
 			x++
 			if x >= s.win.Width {
 				return
@@ -142,7 +135,7 @@ func (s *StatusLine) Display() {
 		}

 		for x < s.win.Width {
-			screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
+			screen.SetContent(x, y-keymenuOffset, ' ', nil, statusLineStyle)
 			x++
 		}
 		return
@@ -152,10 +145,10 @@ func (s *StatusLine) Display() {
 		name := match[2 : len(match)-1]
 		if bytes.HasPrefix(name, []byte("opt")) {
 			option := name[4:]
-			return fmt.Append(nil, s.FindOpt(string(option)))
+			return []byte(fmt.Sprint(s.FindOpt(string(option))))
 		} else if bytes.HasPrefix(name, []byte("bind")) {
 			binding := string(name[5:])
-			for k, v := range config.Bindings["buffer"] {
+			for k, v := range config.Bindings {
 				if v == binding {
 					return []byte(k)
 				}
@@ -175,47 +168,38 @@ func (s *StatusLine) Display() {
 	rightText = formatParser.ReplaceAllFunc(rightText, formatter)

 	statusLineStyle := config.DefStyle.Reverse(true)
-	if s.win.IsActive() {
-		if style, ok := config.Colorscheme["statusline"]; ok {
-			statusLineStyle = style
-		}
-	} else {
-		if style, ok := config.Colorscheme["statusline.inactive"]; ok {
-			statusLineStyle = style
-		} else if style, ok := config.Colorscheme["statusline"]; ok {
-			statusLineStyle = style
-		}
+	if style, ok := config.Colorscheme["statusline"]; ok {
+		statusLineStyle = style
 	}

-	leftLen := util.StringWidth(leftText, util.CharacterCount(leftText), 1)
-	rightLen := util.StringWidth(rightText, util.CharacterCount(rightText), 1)
+	leftLen := util.StringWidth(leftText, utf8.RuneCount(leftText), 1)
+	rightLen := util.StringWidth(rightText, utf8.RuneCount(rightText), 1)

+	winX := s.win.X
 	for x := 0; x < s.win.Width; x++ {
 		if x < leftLen {
-			r, combc, size := util.DecodeCharacter(leftText)
+			r, size := utf8.DecodeRune(leftText)
 			leftText = leftText[size:]
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
 				c := r
 				if j > 0 {
 					c = ' '
-					combc = nil
 					x++
 				}
-				screen.SetContent(winX+x, y, c, combc, statusLineStyle)
+				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
 			}
 		} else if x >= s.win.Width-rightLen && x < rightLen+s.win.Width-rightLen {
-			r, combc, size := util.DecodeCharacter(rightText)
+			r, size := utf8.DecodeRune(rightText)
 			rightText = rightText[size:]
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
 				c := r
 				if j > 0 {
 					c = ' '
-					combc = nil
 					x++
 				}
-				screen.SetContent(winX+x, y, c, combc, statusLineStyle)
+				screen.SetContent(winX+x, y, c, nil, statusLineStyle)
 			}
 		} else {
 			screen.SetContent(winX+x, y, ' ', nil, statusLineStyle)
--- a/internal/display/tabwindow.go
+++ b/internal/display/tabwindow.go
@@ -1,12 +1,13 @@
 package display

 import (
+	"unicode/utf8"
+
 	runewidth "github.com/mattn/go-runewidth"
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/util"
 )

 type TabWindow struct {
@@ -33,7 +34,7 @@ func (w *TabWindow) LocFromVisual(vloc buffer.Loc) int {

 	for i, n := range w.Names {
 		x++
-		s := util.CharacterCountInString(n)
+		s := utf8.RuneCountInString(n)
 		if vloc.Y == w.Y && vloc.X < x+s {
 			return i
 		}
@@ -74,7 +75,7 @@ func (w *TabWindow) SetActive(a int) {
 	s := w.TotalSize()

 	for i, n := range w.Names {
-		c := util.CharacterCountInString(n)
+		c := utf8.RuneCountInString(n)
 		if i == a {
 			if x+c >= w.hscroll+w.Width {
 				w.hscroll = util.Clamp(x+c+1-w.Width, 0, s-w.Width)
@@ -95,31 +96,7 @@ func (w *TabWindow) Display() {
 	x := -w.hscroll
 	done := false

-	globalTabReverse := config.GetGlobalOption("tabreverse").(bool)
-	globalTabHighlight := config.GetGlobalOption("tabhighlight").(bool)
-
-	// xor of reverse and tab highlight to get tab character (as in filename and surrounding characters) reverse state
-	tabCharHighlight := (globalTabReverse || globalTabHighlight) && !(globalTabReverse && globalTabHighlight)
-
-	reverseStyles := func(reverse bool) (tcell.Style, tcell.Style) {
-		tabBarStyle := config.DefStyle.Reverse(reverse)
-		if style, ok := config.Colorscheme["tabbar"]; ok {
-			tabBarStyle = style
-		}
-		tabBarActiveStyle := tabBarStyle
-		if style, ok := config.Colorscheme["tabbar.active"]; ok {
-			tabBarActiveStyle = style
-		}
-		return tabBarStyle, tabBarActiveStyle
-	}
-
-	draw := func(r rune, n int, active bool, reversed bool) {
-		tabBarStyle, tabBarActiveStyle := reverseStyles(reversed)
-
-		style := tabBarStyle
-		if active {
-			style = tabBarActiveStyle
-		}
+	draw := func(r rune, n int) {
 		for i := 0; i < n; i++ {
 			rw := runewidth.RuneWidth(r)
 			for j := 0; j < rw; j++ {
@@ -128,13 +105,13 @@ func (w *TabWindow) Display() {
 					c = ' '
 				}
 				if x == w.Width-1 && !done {
-					screen.SetContent(w.Width-1, w.Y, '>', nil, tabBarStyle)
+					screen.SetContent(w.Width-1, w.Y, '>', nil, config.DefStyle.Reverse(true))
 					x++
 					break
 				} else if x == 0 && w.hscroll > 0 {
-					screen.SetContent(0, w.Y, '<', nil, tabBarStyle)
+					screen.SetContent(0, w.Y, '<', nil, config.DefStyle.Reverse(true))
 				} else if x >= 0 && x < w.Width {
-					screen.SetContent(x, w.Y, c, nil, style)
+					screen.SetContent(x, w.Y, c, nil, config.DefStyle.Reverse(true))
 				}
 				x++
 			}
@@ -143,33 +120,28 @@ func (w *TabWindow) Display() {

 	for i, n := range w.Names {
 		if i == w.active {
-			draw('[', 1, true, tabCharHighlight)
+			draw('[', 1)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
+			draw(' ', 1)
 		}
-
 		for _, c := range n {
-			draw(c, 1, i == w.active, tabCharHighlight)
+			draw(c, 1)
 		}
-
 		if i == len(w.Names)-1 {
 			done = true
 		}
-
 		if i == w.active {
-			draw(']', 1, true, tabCharHighlight)
-			draw(' ', 2, true, globalTabReverse)
+			draw(']', 1)
+			draw(' ', 2)
 		} else {
-			draw(' ', 1, false, tabCharHighlight)
-			draw(' ', 2, false, globalTabReverse)
+			draw(' ', 3)
 		}
-
 		if x >= w.Width {
 			break
 		}
 	}

 	if x < w.Width {
-		draw(' ', w.Width-x, false, globalTabReverse)
+		draw(' ', w.Width-x)
 	}
 }
--- a/internal/display/termwindow.go
+++ b/internal/display/termwindow.go
@@ -1,13 +1,14 @@
 package display

 import (
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/shell"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
+	"unicode/utf8"
+
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/shell"
+	"github.com/zyedidia/tcell"
+	"github.com/zyedidia/terminal"
 )

 type TermWindow struct {
@@ -81,7 +82,7 @@ func (w *TermWindow) Display() {
 			if b == terminal.DefaultBG {
 				bg = int(tcell.ColorDefault)
 			}
-			st := tcell.StyleDefault.Foreground(config.GetColor256(fg)).Background(config.GetColor256(bg))
+			st := tcell.StyleDefault.Foreground(config.GetColor256(int(fg))).Background(config.GetColor256(int(bg)))

 			if l.LessThan(w.Selection[1]) && l.GreaterEqual(w.Selection[0]) || l.LessThan(w.Selection[0]) && l.GreaterEqual(w.Selection[1]) {
 				st = st.Reverse(true)
@@ -97,12 +98,12 @@ func (w *TermWindow) Display() {
 		}

 		text := []byte(w.Name())
-		textLen := util.CharacterCount(text)
+		textLen := utf8.RuneCount(text)
 		for x := 0; x < w.Width; x++ {
 			if x < textLen {
-				r, combc, size := util.DecodeCharacter(text)
+				r, size := utf8.DecodeRune(text)
 				text = text[size:]
-				screen.SetContent(w.X+x, w.Y+w.Height, r, combc, statusLineStyle)
+				screen.SetContent(w.X+x, w.Y+w.Height, r, nil, statusLineStyle)
 			} else {
 				screen.SetContent(w.X+x, w.Y+w.Height, ' ', nil, statusLineStyle)
 			}
@@ -110,8 +111,6 @@ func (w *TermWindow) Display() {
 	}
 	if w.State.CursorVisible() && w.active {
 		curx, cury := w.State.Cursor()
-		if curx < w.Width && cury < w.Height {
-			screen.ShowCursor(curx+w.X, cury+w.Y)
-		}
+		screen.ShowCursor(curx+w.X, cury+w.Y)
 	}
 }
--- a/internal/display/uiwindow.go
+++ b/internal/display/uiwindow.go
@@ -1,11 +1,10 @@
 package display

 import (
-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
-	"github.com/micro-editor/micro/v2/internal/views"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/micro/internal/views"
 )

 type UIWindow struct {
@@ -25,27 +24,16 @@ func (w *UIWindow) drawNode(n *views.Node) {
 		dividerStyle = style
 	}

-	divchars := config.GetGlobalOption("divchars").(string)
-	if util.CharacterCountInString(divchars) != 2 {
-		divchars = "|-"
-	}
-
-	divchar, combc, _ := util.DecodeCharacterInString(divchars)
-
-	divreverse := config.GetGlobalOption("divreverse").(bool)
-	if divreverse {
-		dividerStyle = dividerStyle.Reverse(true)
-	}
-
 	for i, c := range cs {
-		if c.Kind == views.STVert {
+		if c.IsLeaf() && c.Kind == views.STVert {
 			if i != len(cs)-1 {
 				for h := 0; h < c.H; h++ {
-					screen.SetContent(c.X+c.W, c.Y+h, divchar, combc, dividerStyle)
+					screen.SetContent(c.X+c.W, c.Y+h, '|', nil, dividerStyle.Reverse(true))
 				}
 			}
+		} else {
+			w.drawNode(c)
 		}
-		w.drawNode(c)
 	}
 }

@@ -53,32 +41,32 @@ func (w *UIWindow) Display() {
 	w.drawNode(w.root)
 }

-func (w *UIWindow) GetMouseSplitNode(vloc buffer.Loc) *views.Node {
-	var mouseLoc func(*views.Node) *views.Node
-	mouseLoc = func(n *views.Node) *views.Node {
+func (w *UIWindow) GetMouseSplitID(vloc buffer.Loc) uint64 {
+	var mouseLoc func(*views.Node) uint64
+	mouseLoc = func(n *views.Node) uint64 {
 		cs := n.Children()
 		for i, c := range cs {
 			if c.Kind == views.STVert {
 				if i != len(cs)-1 {
 					if vloc.X == c.X+c.W && vloc.Y >= c.Y && vloc.Y < c.Y+c.H {
-						return c
+						return c.ID()
 					}
 				}
 			} else if c.Kind == views.STHoriz {
 				if i != len(cs)-1 {
 					if vloc.Y == c.Y+c.H-1 && vloc.X >= c.X && vloc.X < c.X+c.W {
-						return c
+						return c.ID()
 					}
 				}
 			}
 		}
 		for _, c := range cs {
 			m := mouseLoc(c)
-			if m != nil {
+			if m != 0 {
 				return m
 			}
 		}
-		return nil
+		return 0
 	}
 	return mouseLoc(w.root)
 }
--- a/internal/display/window.go
+++ b/internal/display/window.go
@@ -1,20 +1,17 @@
 package display

 import (
-	"github.com/micro-editor/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/internal/buffer"
 )

 type View struct {
 	X, Y          int // X,Y location of the view
 	Width, Height int // Width and height of the view

-	// Start line of the view (for vertical scroll)
-	StartLine SLoc
-
-	// Start column of the view (for horizontal scroll)
+	// Start line and start column of the view (vertical/horizontal scroll)
 	// note that since the starting column of every line is different if the view
 	// is scrolled, StartCol is a visual index (will be the same for every line)
-	StartCol int
+	StartLine, StartCol int
 }

 type Window interface {
@@ -31,7 +28,5 @@ type Window interface {

 type BWindow interface {
 	Window
-	SoftWrap
 	SetBuffer(b *buffer.Buffer)
-	BufView() View
 }
--- a/internal/info/history.go
+++ b/internal/info/history.go
@@ -1,17 +1,11 @@
 package info

 import (
-	"bytes"
 	"encoding/gob"
-	"errors"
-	"io/fs"
 	"os"
 	"path/filepath"
-	"strings"

-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/config"
 )

 // LoadHistory attempts to load user history from configDir/buffers/history
@@ -20,24 +14,25 @@ import (
 func (i *InfoBuf) LoadHistory() {
 	if config.GetGlobalOption("savehistory").(bool) {
 		file, err := os.Open(filepath.Join(config.ConfigDir, "buffers", "history"))
-		var decodedMap map[string][]string
-		if err != nil {
-			if !errors.Is(err, fs.ErrNotExist) {
-				i.Error("Error loading history: ", err)
-			}
-			return
-		}
-
 		defer file.Close()
-		err = gob.NewDecoder(file).Decode(&decodedMap)
-		if err != nil {
-			i.Error("Error decoding history: ", err)
-			return
+		var decodedMap map[string][]string
+		if err == nil {
+			decoder := gob.NewDecoder(file)
+			err = decoder.Decode(&decodedMap)
+
+			if err != nil {
+				i.Error("Error loading history:", err)
+				return
+			}
 		}

 		if decodedMap != nil {
 			i.History = decodedMap
+		} else {
+			i.History = make(map[string][]string)
 		}
+	} else {
+		i.History = make(map[string][]string)
 	}
 }

@@ -52,41 +47,15 @@ func (i *InfoBuf) SaveHistory() {
 			}
 		}

-		var buf bytes.Buffer
-		err := gob.NewEncoder(&buf).Encode(i.History)
-		if err != nil {
-			screen.TermMessage("Error encoding history: ", err)
-			return
-		}
+		file, err := os.Create(filepath.Join(config.ConfigDir, "buffers", "history"))
+		defer file.Close()
+		if err == nil {
+			encoder := gob.NewEncoder(file)

-		filename := filepath.Join(config.ConfigDir, "buffers", "history")
-		err = util.SafeWrite(filename, buf.Bytes(), true)
-		if err != nil {
-			screen.TermMessage("Error saving history: ", err)
-			return
-		}
-	}
-}
-
-// AddToHistory adds a new item to the history for the prompt type `ptype`.
-// This function is not used by micro itself. It is useful for plugins
-// which add their own items to the history, bypassing the infobar command line.
-func (i *InfoBuf) AddToHistory(ptype string, item string) {
-	if i.HasPrompt && i.PromptType == ptype {
-		return
-	}
-
-	if _, ok := i.History[ptype]; !ok {
-		i.History[ptype] = []string{item}
-	} else {
-		i.History[ptype] = append(i.History[ptype], item)
-
-		// avoid duplicates
-		h := i.History[ptype]
-		for j := len(h) - 2; j >= 0; j-- {
-			if h[j] == h[len(h)-1] {
-				i.History[ptype] = append(h[:j], h[j+1:]...)
-				break
+			err = encoder.Encode(i.History)
+			if err != nil {
+				i.Error("Error saving history:", err)
+				return
 			}
 		}
 	}
@@ -109,51 +78,3 @@ func (i *InfoBuf) DownHistory(history []string) {
 		i.Buffer.GetActiveCursor().GotoLoc(i.End())
 	}
 }
-
-// SearchUpHistory fetches the previous item in the history
-// beginning with the text in the infobuffer before cursor
-func (i *InfoBuf) SearchUpHistory(history []string) {
-	if i.HistoryNum > 0 && i.HasPrompt && !i.HasYN {
-		i.searchHistory(history, false)
-	}
-}
-
-// SearchDownHistory fetches the next item in the history
-// beginning with the text in the infobuffer before cursor
-func (i *InfoBuf) SearchDownHistory(history []string) {
-	if i.HistoryNum < len(history)-1 && i.HasPrompt && !i.HasYN {
-		i.searchHistory(history, true)
-	}
-}
-
-func (i *InfoBuf) searchHistory(history []string, down bool) {
-	line := string(i.LineBytes(0))
-	c := i.Buffer.GetActiveCursor()
-
-	if !i.HistorySearch || !strings.HasPrefix(line, i.HistorySearchPrefix) {
-		i.HistorySearch = true
-		i.HistorySearchPrefix = util.SliceStartStr(line, c.X)
-	}
-
-	found := -1
-	if down {
-		for j := i.HistoryNum + 1; j < len(history); j++ {
-			if strings.HasPrefix(history[j], i.HistorySearchPrefix) {
-				found = j
-				break
-			}
-		}
-	} else {
-		for j := i.HistoryNum - 1; j >= 0; j-- {
-			if strings.HasPrefix(history[j], i.HistorySearchPrefix) {
-				found = j
-				break
-			}
-		}
-	}
-	if found != -1 {
-		i.HistoryNum = found
-		i.Replace(i.Start(), i.End(), history[found])
-		c.GotoLoc(i.End())
-	}
-}
--- a/internal/info/infobuffer.go
+++ b/internal/info/infobuffer.go
@@ -3,11 +3,11 @@ package info
 import (
 	"fmt"

-	"github.com/micro-editor/micro/v2/internal/buffer"
+	"github.com/zyedidia/micro/internal/buffer"
 )

 // The InfoBuf displays messages and other info at the bottom of the screen.
-// It is represented as a buffer and a message with a style.
+// It is respresented as a buffer and a message with a style.
 type InfoBuf struct {
 	*buffer.Buffer

@@ -25,10 +25,6 @@ type InfoBuf struct {
 	// It's a map of history type -> history array
 	History    map[string][]string
 	HistoryNum int
-	// HistorySearch indicates whether we are searching for history items
-	// beginning with HistorySearchPrefix
-	HistorySearch       bool
-	HistorySearchPrefix string

 	// Is the current message a message from the gutter
 	HasGutter bool
@@ -55,10 +51,10 @@ func (i *InfoBuf) Close() {
 }

 // Message sends a message to the user
-func (i *InfoBuf) Message(msg ...any) {
+func (i *InfoBuf) Message(msg ...interface{}) {
 	// only display a new message if there isn't an active prompt
 	// this is to prevent overwriting an existing prompt to the user
-	if !i.HasPrompt {
+	if i.HasPrompt == false {
 		displayMessage := fmt.Sprint(msg...)
 		// if there is no active prompt then style and display the message as normal
 		i.Msg = displayMessage
@@ -67,7 +63,7 @@ func (i *InfoBuf) Message(msg ...any) {
 }

 // GutterMessage displays a message and marks it as a gutter message
-func (i *InfoBuf) GutterMessage(msg ...any) {
+func (i *InfoBuf) GutterMessage(msg ...interface{}) {
 	i.Message(msg...)
 	i.HasGutter = true
 }
@@ -79,10 +75,10 @@ func (i *InfoBuf) ClearGutter() {
 }

 // Error sends an error message to the user
-func (i *InfoBuf) Error(msg ...any) {
+func (i *InfoBuf) Error(msg ...interface{}) {
 	// only display a new message if there isn't an active prompt
 	// this is to prevent overwriting an existing prompt to the user
-	if !i.HasPrompt {
+	if i.HasPrompt == false {
 		// if there is no active prompt then style and display the message as normal
 		i.Msg = fmt.Sprint(msg...)
 		i.HasMessage, i.HasError = false, true
@@ -106,7 +102,6 @@ func (i *InfoBuf) Prompt(prompt string, msg string, ptype string, eventcb func(s
 		i.History[ptype] = append(i.History[ptype], "")
 	}
 	i.HistoryNum = len(i.History[ptype]) - 1
-	i.HistorySearch = false

 	i.PromptType = ptype
 	i.Msg = prompt
@@ -142,28 +137,18 @@ func (i *InfoBuf) DonePrompt(canceled bool) {
 	if !hadYN {
 		if i.PromptCallback != nil {
 			if canceled {
-				i.Replace(i.Start(), i.End(), "")
+				i.PromptCallback("", true)
 				h := i.History[i.PromptType]
 				i.History[i.PromptType] = h[:len(h)-1]
-				i.PromptCallback("", true)
 			} else {
 				resp := string(i.LineBytes(0))
-				i.Replace(i.Start(), i.End(), "")
+				i.PromptCallback(resp, false)
 				h := i.History[i.PromptType]
 				h[len(h)-1] = resp
-
-				// avoid duplicates
-				for j := len(h) - 2; j >= 0; j-- {
-					if h[j] == h[len(h)-1] {
-						i.History[i.PromptType] = append(h[:j], h[j+1:]...)
-						break
-					}
-				}
-
-				i.PromptCallback(resp, false)
 			}
-			// i.PromptCallback = nil
+			i.PromptCallback = nil
 		}
+		i.Replace(i.Start(), i.End(), "")
 	}
 	if i.YNCallback != nil && hadYN {
 		i.YNCallback(i.YNResp, canceled)
--- a/internal/lua/lua.go
+++ b/internal/lua/lua.go
@@ -1,7 +1,6 @@
 package lua

 import (
-	"archive/zip"
 	"bytes"
 	"errors"
 	"fmt"
@@ -10,7 +9,6 @@ import (
 	"math"
 	"math/rand"
 	"net"
-	"net/http"
 	"os"
 	"path"
 	"path/filepath"
@@ -20,7 +18,6 @@ import (
 	"time"
 	"unicode/utf8"

-	humanize "github.com/dustin/go-humanize"
 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"
 )
@@ -72,12 +69,6 @@ func Import(pkg string) *lua.LTable {
 		return importTime()
 	case "unicode/utf8", "utf8":
 		return importUtf8()
-	case "humanize":
-		return importHumanize()
-	case "net/http", "http":
-		return importHTTP()
-	case "archive/zip":
-		return importArchiveZip()
 	default:
 		return nil
 	}
@@ -125,7 +116,6 @@ func importIo() *lua.LTable {
 	L.SetField(pkg, "MultiWriter", luar.New(L, io.MultiWriter))
 	L.SetField(pkg, "NewSectionReader", luar.New(L, io.NewSectionReader))
 	L.SetField(pkg, "Pipe", luar.New(L, io.Pipe))
-	L.SetField(pkg, "ReadAll", luar.New(L, io.ReadAll))
 	L.SetField(pkg, "ReadAtLeast", luar.New(L, io.ReadAtLeast))
 	L.SetField(pkg, "ReadFull", luar.New(L, io.ReadFull))
 	L.SetField(pkg, "TeeReader", luar.New(L, io.TeeReader))
@@ -371,15 +361,13 @@ func importOs() *lua.LTable {
 	L.SetField(pkg, "PathListSeparator", luar.New(L, os.PathListSeparator))
 	L.SetField(pkg, "PathSeparator", luar.New(L, os.PathSeparator))
 	L.SetField(pkg, "Pipe", luar.New(L, os.Pipe))
-	L.SetField(pkg, "ReadDir", luar.New(L, os.ReadDir))
-	L.SetField(pkg, "ReadFile", luar.New(L, os.ReadFile))
 	L.SetField(pkg, "Readlink", luar.New(L, os.Readlink))
 	L.SetField(pkg, "Remove", luar.New(L, os.Remove))
 	L.SetField(pkg, "RemoveAll", luar.New(L, os.RemoveAll))
 	L.SetField(pkg, "Rename", luar.New(L, os.Rename))
-	L.SetField(pkg, "SEEK_CUR", luar.New(L, io.SeekCurrent))
-	L.SetField(pkg, "SEEK_END", luar.New(L, io.SeekEnd))
-	L.SetField(pkg, "SEEK_SET", luar.New(L, io.SeekStart))
+	L.SetField(pkg, "SEEK_CUR", luar.New(L, os.SEEK_CUR))
+	L.SetField(pkg, "SEEK_END", luar.New(L, os.SEEK_END))
+	L.SetField(pkg, "SEEK_SET", luar.New(L, os.SEEK_SET))
 	L.SetField(pkg, "SameFile", luar.New(L, os.SameFile))
 	L.SetField(pkg, "Setenv", luar.New(L, os.Setenv))
 	L.SetField(pkg, "StartProcess", luar.New(L, os.StartProcess))
@@ -390,8 +378,6 @@ func importOs() *lua.LTable {
 	L.SetField(pkg, "Symlink", luar.New(L, os.Symlink))
 	L.SetField(pkg, "TempDir", luar.New(L, os.TempDir))
 	L.SetField(pkg, "Truncate", luar.New(L, os.Truncate))
-	L.SetField(pkg, "UserHomeDir", luar.New(L, os.UserHomeDir))
-	L.SetField(pkg, "WriteFile", luar.New(L, os.WriteFile))

 	return pkg
 }
@@ -427,6 +413,7 @@ func importPath() *lua.LTable {
 func importFilePath() *lua.LTable {
 	pkg := L.NewTable()

+	L.SetField(pkg, "Join", luar.New(L, filepath.Join))
 	L.SetField(pkg, "Abs", luar.New(L, filepath.Abs))
 	L.SetField(pkg, "Base", luar.New(L, filepath.Base))
 	L.SetField(pkg, "Clean", luar.New(L, filepath.Clean))
@@ -524,16 +511,21 @@ func importErrors() *lua.LTable {
 func importTime() *lua.LTable {
 	pkg := L.NewTable()

+	L.SetField(pkg, "After", luar.New(L, time.After))
 	L.SetField(pkg, "Sleep", luar.New(L, time.Sleep))
+	L.SetField(pkg, "Tick", luar.New(L, time.Tick))
 	L.SetField(pkg, "Since", luar.New(L, time.Since))
 	L.SetField(pkg, "FixedZone", luar.New(L, time.FixedZone))
 	L.SetField(pkg, "LoadLocation", luar.New(L, time.LoadLocation))
+	L.SetField(pkg, "NewTicker", luar.New(L, time.NewTicker))
 	L.SetField(pkg, "Date", luar.New(L, time.Date))
 	L.SetField(pkg, "Now", luar.New(L, time.Now))
 	L.SetField(pkg, "Parse", luar.New(L, time.Parse))
 	L.SetField(pkg, "ParseDuration", luar.New(L, time.ParseDuration))
 	L.SetField(pkg, "ParseInLocation", luar.New(L, time.ParseInLocation))
 	L.SetField(pkg, "Unix", luar.New(L, time.Unix))
+	L.SetField(pkg, "AfterFunc", luar.New(L, time.AfterFunc))
+	L.SetField(pkg, "NewTimer", luar.New(L, time.NewTimer))
 	L.SetField(pkg, "Nanosecond", luar.New(L, time.Nanosecond))
 	L.SetField(pkg, "Microsecond", luar.New(L, time.Microsecond))
 	L.SetField(pkg, "Millisecond", luar.New(L, time.Millisecond))
@@ -541,15 +533,6 @@ func importTime() *lua.LTable {
 	L.SetField(pkg, "Minute", luar.New(L, time.Minute))
 	L.SetField(pkg, "Hour", luar.New(L, time.Hour))

-	// TODO: these raw Go timer APIs don't provide any synchronization
-	// with micro. Stop exposing them to lua once plugins switch to using
-	// the safer micro.After() interface instead. See issue #3209
-	L.SetField(pkg, "After", luar.New(L, time.After))
-	L.SetField(pkg, "AfterFunc", luar.New(L, time.AfterFunc))
-	L.SetField(pkg, "NewTicker", luar.New(L, time.NewTicker))
-	L.SetField(pkg, "NewTimer", luar.New(L, time.NewTimer))
-	L.SetField(pkg, "Tick", luar.New(L, time.Tick))
-
 	return pkg
 }

@@ -573,31 +556,3 @@ func importUtf8() *lua.LTable {

 	return pkg
 }
-
-func importHumanize() *lua.LTable {
-	pkg := L.NewTable()
-
-	L.SetField(pkg, "Bytes", luar.New(L, humanize.Bytes))
-	L.SetField(pkg, "Ordinal", luar.New(L, humanize.Ordinal))
-
-	return pkg
-}
-
-func importHTTP() *lua.LTable {
-	pkg := L.NewTable()
-
-	L.SetField(pkg, "Get", luar.New(L, http.Get))
-	L.SetField(pkg, "Post", luar.New(L, http.Post))
-
-	return pkg
-}
-
-func importArchiveZip() *lua.LTable {
-	pkg := L.NewTable()
-
-	L.SetField(pkg, "OpenReader", luar.New(L, zip.OpenReader))
-	L.SetField(pkg, "NewReader", luar.New(L, zip.NewReader))
-	L.SetField(pkg, "NewWriter", luar.New(L, zip.NewWriter))
-
-	return pkg
-}
--- a/internal/screen/message.go
+++ b/internal/screen/message.go
@@ -14,7 +14,7 @@ import (
 // The function must be called when the Screen is not initialized
 // This will write the message, and wait for the user
 // to press and key to continue
-func TermMessage(msg ...any) {
+func TermMessage(msg ...interface{}) {
 	screenb := TempFini()

 	fmt.Println(msg...)
--- a/internal/screen/screen.go
+++ b/internal/screen/screen.go
@@ -1,13 +1,13 @@
 package screen

 import (
-	"errors"
-	"log"
+	"fmt"
 	"os"
 	"sync"

-	"github.com/micro-editor/micro/v2/internal/config"
-	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/internal/config"
+	"github.com/zyedidia/micro/internal/util"
+	"github.com/zyedidia/tcell"
 )

 // Screen is the tcell screen we use to draw to the terminal
@@ -18,13 +18,6 @@ import (
 // same time too.
 var Screen tcell.Screen

-// Events is the channel of tcell events
-var Events chan (tcell.Event)
-
-// RestartCallback is called when the screen is restarted after it was
-// temporarily shut down
-var RestartCallback func()
-
 // The lock is necessary since the screen is polled on a separate thread
 var lock sync.Mutex

@@ -32,12 +25,6 @@ var lock sync.Mutex
 // written to even if no event user event has occurred
 var drawChan chan bool

-// rawSeq is the list of raw escape sequences that are bound to some actions
-// via keybindings and thus should be parsed by tcell. We need to register
-// them in tcell every time we reinitialize the screen, so we need to remember
-// them in a list
-var rawSeq = make([]string, 0)
-
 // Lock locks the screen lock
 func Lock() {
 	lock.Lock()
@@ -88,10 +75,6 @@ func ShowFakeCursor(x, y int) {
 	lastCursor.style = style
 }

-func UseFake() bool {
-	return config.GetGlobalOption("fakecursor").(bool)
-}
-
 // ShowFakeCursorMulti is the same as ShowFakeCursor except it does not
 // reset previous locations of the cursor
 // Fake cursors are also necessary to display multiple cursors
@@ -104,7 +87,7 @@ func ShowFakeCursorMulti(x, y int) {
 // if enabled or using the terminal cursor otherwise
 // By default only the windows console will use a fake cursor
 func ShowCursor(x, y int) {
-	if UseFake() {
+	if util.FakeCursor {
 		ShowFakeCursor(x, y)
 	} else {
 		Screen.ShowCursor(x, y)
@@ -114,46 +97,14 @@ func ShowCursor(x, y int) {
 // SetContent sets a cell at a point on the screen and makes sure that it is
 // synced with the last cursor location
 func SetContent(x, y int, mainc rune, combc []rune, style tcell.Style) {
-	if !Screen.CanDisplay(mainc, true) {
-		mainc = '<27>'
-	}
-
 	Screen.SetContent(x, y, mainc, combc, style)
-	if UseFake() && lastCursor.x == x && lastCursor.y == y {
+	if util.FakeCursor && lastCursor.x == x && lastCursor.y == y {
 		lastCursor.r = mainc
 		lastCursor.style = style
 		lastCursor.combc = combc
 	}
 }

-// RegisterRawSeq registers a raw escape sequence that should be parsed by tcell
-func RegisterRawSeq(r string) {
-	for _, seq := range rawSeq {
-		if seq == r {
-			return
-		}
-	}
-	rawSeq = append(rawSeq, r)
-
-	if Screen != nil {
-		Screen.RegisterRawSeq(r)
-	}
-}
-
-// UnregisterRawSeq unregisters a raw escape sequence that should be parsed by tcell
-func UnregisterRawSeq(r string) {
-	for i, seq := range rawSeq {
-		if seq == r {
-			rawSeq[i] = rawSeq[len(rawSeq)-1]
-			rawSeq = rawSeq[:len(rawSeq)-1]
-		}
-	}
-
-	if Screen != nil {
-		Screen.UnregisterRawSeq(r)
-	}
-}
-
 // TempFini shuts the screen down temporarily
 func TempFini() bool {
 	screenWasNil := Screen == nil
@@ -171,93 +122,45 @@ func TempStart(screenWasNil bool) {
 	if !screenWasNil {
 		Init()
 		Unlock()
-
-		if RestartCallback != nil {
-			RestartCallback()
-		}
 	}
 }

 // Init creates and initializes the tcell screen
-func Init() error {
-	drawChan = make(chan bool, 8)
+func Init() {
+	drawChan = make(chan bool)

 	// Should we enable true color?
-	truecolor := config.GetGlobalOption("truecolor").(string)
-	if truecolor == "on" || (truecolor == "auto" && os.Getenv("MICRO_TRUECOLOR") == "1") {
-		os.Setenv("TCELL_TRUECOLOR", "enable")
-	} else if truecolor == "off" {
+	truecolor := os.Getenv("MICRO_TRUECOLOR") == "1"
+
+	if !truecolor {
 		os.Setenv("TCELL_TRUECOLOR", "disable")
-	} else {
-		// For "auto", tcell already autodetects truecolor by default
 	}

 	var oldTerm string
-	modifiedTerm := false
-	setXterm := func() {
+	if config.GetGlobalOption("xterm").(bool) {
 		oldTerm = os.Getenv("TERM")
 		os.Setenv("TERM", "xterm-256color")
-		modifiedTerm = true
-	}
-
-	if config.GetGlobalOption("xterm").(bool) {
-		setXterm()
 	}

 	// Initilize tcell
 	var err error
 	Screen, err = tcell.NewScreen()
 	if err != nil {
-		log.Println("Warning: during screen initialization:", err)
-		log.Println("Falling back to TERM=xterm-256color")
-		setXterm()
-		Screen, err = tcell.NewScreen()
-		if err != nil {
-			return err
-		}
+		fmt.Println(err)
+		fmt.Println("Fatal: Micro could not initialize a Screen.")
+		os.Exit(1)
 	}
 	if err = Screen.Init(); err != nil {
-		return err
+		fmt.Println(err)
+		os.Exit(1)
 	}

-	Screen.SetPaste(config.GetGlobalOption("paste").(bool))
-
 	// restore TERM
-	if modifiedTerm {
+	if config.GetGlobalOption("xterm").(bool) {
 		os.Setenv("TERM", oldTerm)
 	}

 	if config.GetGlobalOption("mouse").(bool) {
 		Screen.EnableMouse()
 	}
-
-	for _, r := range rawSeq {
-		Screen.RegisterRawSeq(r)
-	}
-
-	return nil
-}
-
-// InitSimScreen initializes a simulation screen for testing purposes
-func InitSimScreen() (tcell.SimulationScreen, error) {
-	drawChan = make(chan bool, 8)
-
-	// Initilize tcell
-	var err error
-	s := tcell.NewSimulationScreen("")
-	if s == nil {
-		return nil, errors.New("Failed to get a simulation screen")
-	}
-	if err = s.Init(); err != nil {
-		return nil, err
-	}
-
-	s.SetSize(80, 24)
-	Screen = s
-
-	if config.GetGlobalOption("mouse").(bool) {
-		Screen.EnableMouse()
-	}
-
-	return s, nil
 }
--- a/internal/shell/job.go
+++ b/internal/shell/job.go
@@ -24,23 +24,17 @@ func init() {
 // JobFunction is a representation of a job (this data structure is what is loaded
 // into the jobs channel)
 type JobFunction struct {
-	Function func(string, []any)
+	Function func(string, []interface{})
 	Output   string
-	Args     []any
+	Args     []interface{}
 }

 // A CallbackFile is the data structure that makes it possible to catch stderr and stdout write events
 type CallbackFile struct {
 	io.Writer

-	callback func(string, []any)
-	args     []any
-}
-
-// Job stores the executing command for the job, and the stdin pipe
-type Job struct {
-	*exec.Cmd
-	Stdin io.WriteCloser
+	callback func(string, []interface{})
+	args     []interface{}
 }

 func (f *CallbackFile) Write(data []byte) (int, error) {
@@ -53,13 +47,13 @@ func (f *CallbackFile) Write(data []byte) (int, error) {

 // JobStart starts a shell command in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobStart(cmd string, onStdout, onStderr, onExit func(string, []any), userargs ...any) *Job {
+func JobStart(cmd string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
 	return JobSpawn("sh", []string{"-c", cmd}, onStdout, onStderr, onExit, userargs...)
 }

 // JobSpawn starts a process with args in the background with the given callbacks
 // It returns an *exec.Cmd as the job id
-func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []any), userargs ...any) *Job {
+func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(string, []interface{}), userargs ...interface{}) *exec.Cmd {
 	// Set up everything correctly if the functions have been provided
 	proc := exec.Command(cmdName, cmdArgs...)
 	var outbuf bytes.Buffer
@@ -73,26 +67,28 @@ func JobSpawn(cmdName string, cmdArgs []string, onStdout, onStderr, onExit func(
 	} else {
 		proc.Stderr = &outbuf
 	}
-	stdin, _ := proc.StdinPipe()

 	go func() {
 		// Run the process in the background and create the onExit callback
 		proc.Run()
-		if onExit != nil {
-			jobFunc := JobFunction{onExit, outbuf.String(), userargs}
-			Jobs <- jobFunc
-		}
+		jobFunc := JobFunction{onExit, string(outbuf.Bytes()), userargs}
+		Jobs <- jobFunc
 	}()

-	return &Job{proc, stdin}
+	return proc
 }

 // JobStop kills a job
-func JobStop(j *Job) {
-	j.Process.Kill()
+func JobStop(cmd *exec.Cmd) {
+	cmd.Process.Kill()
 }

 // JobSend sends the given data into the job's stdin stream
-func JobSend(j *Job, data string) {
-	j.Stdin.Write([]byte(data))
+func JobSend(cmd *exec.Cmd, data string) {
+	stdin, err := cmd.StdinPipe()
+	if err != nil {
+		return
+	}
+
+	stdin.Write([]byte(data))
 }
--- a/internal/shell/shell.go
+++ b/internal/shell/shell.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"strings"

 	shellquote "github.com/kballard/go-shellquote"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/micro/v2/internal/util"
+	"github.com/zyedidia/micro/internal/screen"
 )

 // ExecCommand executes a command using exec
@@ -59,10 +59,15 @@ func RunBackgroundShell(input string) (func() string, error) {
 	inputCmd := args[0]
 	return func() string {
 		output, err := RunCommand(input)
+		totalLines := strings.Split(output, "\n")

 		str := output
-		if err != nil {
-			str = fmt.Sprint(inputCmd, " exited with error: ", err, ": ", output)
+		if len(totalLines) < 3 {
+			if err == nil {
+				str = fmt.Sprint(inputCmd, " exited without error")
+			} else {
+				str = fmt.Sprint(inputCmd, " exited with error: ", err, ": ", output)
+			}
 		}
 		return str
 	}, nil
@@ -96,30 +101,28 @@ func RunInteractiveShell(input string, wait bool, getOutput bool) (string, error
 	cmd.Stderr = os.Stderr

 	// This is a trap for Ctrl-C so that it doesn't kill micro
-	// micro is killed if the signal is ignored only on Windows, so it is
-	// received
+	// Instead we trap Ctrl-C to kill the program we're running
 	c := make(chan os.Signal, 1)
-	signal.Reset(os.Interrupt)
 	signal.Notify(c, os.Interrupt)
-	err = cmd.Start()
-	if err == nil {
-		err = cmd.Wait()
-		if wait {
-			// This is just so we don't return right away and let the user press enter to return
-			screen.TermMessage("")
+	go func() {
+		for range c {
+			cmd.Process.Kill()
 		}
-	} else {
-		screen.TermMessage(err)
-	}
+	}()
+
+	cmd.Start()
+	err = cmd.Wait()

 	output := outputBytes.String()

+	if wait {
+		// This is just so we don't return right away and let the user press enter to return
+		screen.TermMessage("")
+	}
+
 	// Start the screen back up
 	screen.TempStart(screenb)

-	signal.Notify(util.Sigterm, os.Interrupt)
-	signal.Stop(c)
-
 	return output, err
 }

--- a/internal/shell/terminal.go
+++ b/internal/shell/terminal.go
@@ -5,9 +5,9 @@ import (
 	"os/exec"
 	"strconv"

-	"github.com/micro-editor/micro/v2/internal/buffer"
-	"github.com/micro-editor/micro/v2/internal/screen"
-	"github.com/micro-editor/terminal"
+	"github.com/zyedidia/micro/internal/buffer"
+	"github.com/zyedidia/micro/internal/screen"
+	"github.com/zyedidia/terminal"
 )

 type TermType int
@@ -69,7 +69,7 @@ func (t *Terminal) GetSelection(width int) string {
 }

 // Start begins a new command in this terminal with a given view
-func (t *Terminal) Start(execCmd []string, getOutput bool, wait bool, callback func(out string, userargs []any), userargs []any) error {
+func (t *Terminal) Start(execCmd []string, getOutput bool, wait bool, callback func(out string, userargs []interface{}), userargs []interface{}) error {
 	if len(execCmd) <= 0 {
 		return nil
 	}
@@ -78,9 +78,8 @@ func (t *Terminal) Start(execCmd []string, getOutput bool, wait bool, callback f
 	t.output = nil
 	if getOutput {
 		t.output = bytes.NewBuffer([]byte{})
-		cmd.Stdout = t.output
 	}
-	Term, _, err := terminal.Start(&t.State, cmd)
+	Term, _, err := terminal.Start(&t.State, cmd, t.output)
 	if err != nil {
 		return err
 	}
@@ -129,13 +128,7 @@ func (t *Terminal) Close() {
 	// call the lua function that the user has given as a callback
 	if t.getOutput {
 		if t.callback != nil {
-			Jobs <- JobFunction{
-				Function: func(out string, args []any) {
-					t.callback(out)
-				},
-				Output: t.output.String(),
-				Args:   nil,
-			}
+			t.callback(t.output.String())
 		}
 	}
 }
--- a/internal/util/lua.go
+++ b/internal/util/lua.go
@@ -1,11 +1,15 @@
 package util

+import (
+	"unicode/utf8"
+)
+
 // LuaRuneAt is a helper function for lua plugins to return the rune
 // at an index within a string
 func LuaRuneAt(str string, runeidx int) string {
 	i := 0
 	for len(str) > 0 {
-		r, _, size := DecodeCharacterInString(str)
+		r, size := utf8.DecodeRuneInString(str)

 		str = str[size:]

@@ -22,7 +26,7 @@ func LuaRuneAt(str string, runeidx int) string {
 func LuaGetLeadingWhitespace(s string) string {
 	ws := []byte{}
 	for len(s) > 0 {
-		r, _, size := DecodeCharacterInString(s)
+		r, size := utf8.DecodeRuneInString(s)
 		if r == ' ' || r == '\t' {
 			ws = append(ws, byte(r))
 		} else {
@@ -36,6 +40,6 @@ func LuaGetLeadingWhitespace(s string) string {

 // LuaIsWordChar returns true if the first rune in a string is a word character
 func LuaIsWordChar(s string) bool {
-	r, _, _ := DecodeCharacterInString(s)
+	r, _ := utf8.DecodeRuneInString(s)
 	return IsWordChar(r)
 }
--- a/internal/util/unicode.go
+++ b/internal/util/unicode.go
@@ -1,96 +0,0 @@
-package util
-
-import (
-	"unicode"
-	"unicode/utf8"
-)
-
-// Unicode is annoying. A "code point" (rune in Go-speak) may need up to
-// 4 bytes to represent it. In general, a code point will represent a
-// complete character, but this is not always the case. A character with
-// accents may be made up of multiple code points (the code point for the
-// original character, and additional code points for each accent/marking).
-// The functions below are meant to help deal with these additional "combining"
-// code points. In underlying operations (search, replace, etc...), micro will
-// treat a character with combining code points as just the original code point.
-// For rendering, micro will display the combining characters. It's not perfect
-// but it's pretty good.
-
-var minMark = rune(unicode.Mark.R16[0].Lo)
-
-func isMark(r rune) bool {
-	// Fast path
-	if r < minMark {
-		return false
-	}
-	return unicode.In(r, unicode.Mark)
-}
-
-// DecodeCharacter returns the next character from an array of bytes
-// A character is a rune along with any accompanying combining runes
-func DecodeCharacter(b []byte) (rune, []rune, int) {
-	r, size := utf8.DecodeRune(b)
-	b = b[size:]
-	c, s := utf8.DecodeRune(b)
-
-	var combc []rune
-	for isMark(c) {
-		combc = append(combc, c)
-		size += s
-
-		b = b[s:]
-		c, s = utf8.DecodeRune(b)
-	}
-
-	return r, combc, size
-}
-
-// DecodeCharacterInString returns the next character from a string
-// A character is a rune along with any accompanying combining runes
-func DecodeCharacterInString(str string) (rune, []rune, int) {
-	r, size := utf8.DecodeRuneInString(str)
-	str = str[size:]
-	c, s := utf8.DecodeRuneInString(str)
-
-	var combc []rune
-	for isMark(c) {
-		combc = append(combc, c)
-		size += s
-
-		str = str[s:]
-		c, s = utf8.DecodeRuneInString(str)
-	}
-
-	return r, combc, size
-}
-
-// CharacterCount returns the number of characters in a byte array
-// Similar to utf8.RuneCount but for unicode characters
-func CharacterCount(b []byte) int {
-	s := 0
-
-	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
-		if !isMark(r) {
-			s++
-		}
-
-		b = b[size:]
-	}
-
-	return s
-}
-
-// CharacterCount returns the number of characters in a string
-// Similar to utf8.RuneCountInString but for unicode characters
-func CharacterCountInString(str string) int {
-	s := 0
-
-	for _, r := range str {
-		if !isMark(r) {
-			s++
-		}
-	}
-
-	return s
-}
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -1,15 +1,8 @@
 package util

 import (
-	"archive/zip"
-	"bytes"
-	"crypto/md5"
 	"errors"
 	"fmt"
-	"io"
-	"io/fs"
-	"net/http"
-	"net/url"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -30,59 +23,19 @@ var (

 	// Version is the version number or commit hash
 	Version = "0.0.0-unknown"
-	// SemVersion is the Semantic version
+	// Semantic version
 	SemVersion semver.Version
 	// CommitHash is the commit this version was built on
 	CommitHash = "Unknown"
 	// CompileDate is the date this binary was compiled on
 	CompileDate = "Unknown"
 	// Debug logging
-	Debug = "OFF"
-
-	// Stdout is a buffer that is written to stdout when micro closes
-	Stdout *bytes.Buffer
-	// Sigterm is a channel where micro exits when written
-	Sigterm chan os.Signal
-
-	// To be used for fails on (over-)write with safe writes
-	ErrOverwrite = OverwriteError{}
+	Debug = "ON"
+	// FakeCursor is used to disable the terminal cursor and have micro
+	// draw its own (enabled for windows consoles where the cursor is slow)
+	FakeCursor = false
 )

-// To be used for file writes before umask is applied
-const FileMode os.FileMode = 0666
-
-const BackupSuffix = ".micro-backup"
-
-const OverwriteFailMsg = `An error occurred while writing to the file:
-
-%s
-
-The file may be corrupted now. The good news is that it has been
-successfully backed up. Next time you open this file with Micro,
-Micro will ask if you want to recover it from the backup.
-
-The backup path is:
-
-%s`
-
-// OverwriteError is a custom error to add additional information
-type OverwriteError struct {
-	What       error
-	BackupName string
-}
-
-func (e OverwriteError) Error() string {
-	return fmt.Sprintf(OverwriteFailMsg, e.What, e.BackupName)
-}
-
-func (e OverwriteError) Is(target error) bool {
-	return target == ErrOverwrite
-}
-
-func (e OverwriteError) Unwrap() error {
-	return e.What
-}
-
 func init() {
 	var err error
 	SemVersion, err = semver.Make(Version)
@@ -90,7 +43,9 @@ func init() {
 		fmt.Println("Invalid version: ", Version, err)
 	}

-	Stdout = new(bytes.Buffer)
+	if runtime.GOOS == "windows" {
+		FakeCursor = true
+	}
 }

 // SliceEnd returns a byte slice where the index is a rune index
@@ -104,7 +59,7 @@ func SliceEnd(slc []byte, index int) []byte {
 			return slc[totalSize:]
 		}

-		_, _, size := DecodeCharacter(slc[totalSize:])
+		_, size := utf8.DecodeRune(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -122,7 +77,7 @@ func SliceEndStr(str string, index int) string {
 			return str[totalSize:]
 		}

-		_, _, size := DecodeCharacterInString(str[totalSize:])
+		_, size := utf8.DecodeRuneInString(str[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -141,7 +96,7 @@ func SliceStart(slc []byte, index int) []byte {
 			return slc[:totalSize]
 		}

-		_, _, size := DecodeCharacter(slc[totalSize:])
+		_, size := utf8.DecodeRune(slc[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -159,7 +114,7 @@ func SliceStartStr(str string, index int) string {
 			return str[:totalSize]
 		}

-		_, _, size := DecodeCharacterInString(str[totalSize:])
+		_, size := utf8.DecodeRuneInString(str[totalSize:])
 		totalSize += size
 		i++
 	}
@@ -175,7 +130,7 @@ func SliceVisualEnd(b []byte, n, tabsize int) ([]byte, int, int) {
 	width := 0
 	i := 0
 	for len(b) > 0 {
-		r, _, size := DecodeCharacter(b)
+		r, size := utf8.DecodeRune(b)

 		w := 0
 		switch r {
@@ -212,7 +167,7 @@ func StringWidth(b []byte, n, tabsize int) int {
 	i := 0
 	width := 0
 	for len(b) > 0 {
-		r, _, size := DecodeCharacter(b)
+		r, size := utf8.DecodeRune(b)
 		b = b[size:]

 		switch r {
@@ -254,56 +209,10 @@ func FSize(f *os.File) int64 {
 	return fi.Size()
 }

-// IsWordChar returns whether or not a rune is a 'word character'
-// Word characters are defined as numbers, letters or sub-word delimiters
+// IsWordChar returns whether or not the string is a 'word character'
+// Word characters are defined as numbers, letters, or '_'
 func IsWordChar(r rune) bool {
-	return IsAlphanumeric(r) || IsSubwordDelimiter(r)
-}
-
-// IsNonWordChar returns whether or not a rune is not a 'word character'
-// Non word characters are defined as all characters not being numbers, letters or sub-word delimiters
-// See IsWordChar()
-func IsNonWordChar(r rune) bool {
-	return !IsWordChar(r)
-}
-
-// IsSubwordDelimiter returns whether or not a rune is a 'sub-word delimiter character'
-// i.e. is considered a part of the word and is used as a delimiter between sub-words of the word.
-// For now the only sub-word delimiter character is '_'.
-func IsSubwordDelimiter(r rune) bool {
-	return r == '_'
-}
-
-// IsAlphanumeric returns whether or not a rune is an 'alphanumeric character'
-// Alphanumeric characters are defined as numbers or letters
-func IsAlphanumeric(r rune) bool {
-	return unicode.IsLetter(r) || unicode.IsNumber(r)
-}
-
-// IsUpperAlphanumeric returns whether or not a rune is an 'upper alphanumeric character'
-// Upper alphanumeric characters are defined as numbers or upper-case letters
-func IsUpperAlphanumeric(r rune) bool {
-	return IsUpperLetter(r) || unicode.IsNumber(r)
-}
-
-// IsLowerAlphanumeric returns whether or not a rune is a 'lower alphanumeric character'
-// Lower alphanumeric characters are defined as numbers or lower-case letters
-func IsLowerAlphanumeric(r rune) bool {
-	return IsLowerLetter(r) || unicode.IsNumber(r)
-}
-
-// IsUpperLetter returns whether or not a rune is an 'upper letter character'
-// Upper letter characters are defined as upper-case letters
-func IsUpperLetter(r rune) bool {
-	// unicode.IsUpper() returns true for letters only
-	return unicode.IsUpper(r)
-}
-
-// IsLowerLetter returns whether or not a rune is a 'lower letter character'
-// Lower letter characters are defined as lower-case letters
-func IsLowerLetter(r rune) bool {
-	// unicode.IsLower() returns true for letters only
-	return unicode.IsLower(r)
+	return unicode.IsLetter(r) || unicode.IsNumber(r) || r == '_'
 }

 // Spaces returns a string with n spaces
@@ -351,29 +260,7 @@ func IsBytesWhitespace(b []byte) bool {
 // RunePos returns the rune index of a given byte index
 // Make sure the byte index is not between code points
 func RunePos(b []byte, i int) int {
-	return CharacterCount(b[:i])
-}
-
-// IndexAnyUnquoted returns the first position in s of a character from chars.
-// Escaped (with backslash) and quoted (with single or double quotes) characters
-// are ignored. Returns -1 if not successful
-func IndexAnyUnquoted(s, chars string) int {
-	var e bool
-	var q rune
-	for i, r := range s {
-		if e {
-			e = false
-		} else if (q == 0 || q == '"') && r == '\\' {
-			e = true
-		} else if r == q {
-			q = 0
-		} else if q == 0 && (r == '\'' || r == '"') {
-			q = r
-		} else if q == 0 && strings.IndexRune(chars, r) >= 0 {
-			return i
-		}
-	}
-	return -1
+	return utf8.RuneCount(b[:i])
 }

 // MakeRelative will attempt to make a relative path between path and base
@@ -420,7 +307,7 @@ func ReplaceHome(path string) (string, error) {
 // This is used for opening files like util.go:10:5 to specify a line and column
 // Special cases like Windows Absolute path (C:\myfile.txt:10:5) are handled correctly.
 func GetPathAndCursorPosition(path string) (string, []string) {
-	re := regexp.MustCompile(`([\s\S]+?)(?::(\d+))(?::(\d+))?$`)
+	re := regexp.MustCompile(`([\s\S]+?)(?::(\d+))(?::(\d+))?`)
 	match := re.FindStringSubmatch(path)
 	// no lines/columns were specified in the path, return just the path with no cursor location
 	if len(match) == 0 {
@@ -442,58 +329,17 @@ func GetModTime(path string) (time.Time, error) {
 	return info.ModTime(), nil
 }

-func HashStringMd5(str string) string {
-	return fmt.Sprintf("%x", md5.Sum([]byte(str)))
-}
-
-// EscapePathUrl encodes the path in URL query form
-func EscapePathUrl(path string) string {
-	return url.QueryEscape(filepath.ToSlash(path))
-}
-
-// EscapePathLegacy replaces every path separator in a given path with a %
-func EscapePathLegacy(path string) string {
+// EscapePath replaces every path separator in a given path with a %
+func EscapePath(path string) string {
 	path = filepath.ToSlash(path)
-	if runtime.GOOS == "windows" {
-		// ':' is not valid in a path name on Windows but is ok on Unix
-		path = strings.ReplaceAll(path, ":", "%")
-	}
-	return strings.ReplaceAll(path, "/", "%")
-}
-
-// DetermineEscapePath escapes a path, determining whether it should be escaped
-// using URL encoding (preferred, since it encodes unambiguously) or
-// legacy encoding with '%' (for backward compatibility, if the legacy-escaped
-// path exists in the given directory).
-// In case the length of the escaped path (plus the backup extension) exceeds
-// the filename length limit, a hash of the path is returned instead. In such
-// case the second return value is the name of a file the original path should
-// be saved to (since the original path cannot be derived from its hash).
-// Otherwise the second return value is an empty string.
-func DetermineEscapePath(dir string, path string) (string, string) {
-	url := filepath.Join(dir, EscapePathUrl(path))
-	if _, err := os.Stat(url); err == nil {
-		return url, ""
-	}
-
-	legacy := filepath.Join(dir, EscapePathLegacy(path))
-	if _, err := os.Stat(legacy); err == nil {
-		return legacy, ""
-	}
-
-	if len(url)+len(BackupSuffix) > 255 {
-		hash := HashStringMd5(path)
-		return filepath.Join(dir, hash), filepath.Join(dir, hash+".path")
-	}
-
-	return url, ""
+	return strings.Replace(path, "/", "%", -1)
 }

 // GetLeadingWhitespace returns the leading whitespace of the given byte array
 func GetLeadingWhitespace(b []byte) []byte {
 	ws := []byte{}
 	for len(b) > 0 {
-		r, _, size := DecodeCharacter(b)
+		r, size := utf8.DecodeRune(b)
 		if r == ' ' || r == '\t' {
 			ws = append(ws, byte(r))
 		} else {
@@ -505,30 +351,8 @@ func GetLeadingWhitespace(b []byte) []byte {
 	return ws
 }

-// GetTrailingWhitespace returns the trailing whitespace of the given byte array
-func GetTrailingWhitespace(b []byte) []byte {
-	ws := []byte{}
-	for len(b) > 0 {
-		r, size := utf8.DecodeLastRune(b)
-		if IsWhitespace(r) {
-			ws = append([]byte(string(r)), ws...)
-		} else {
-			break
-		}
-
-		b = b[:len(b)-size]
-	}
-	return ws
-}
-
-// HasTrailingWhitespace returns true if the given byte array ends with a whitespace
-func HasTrailingWhitespace(b []byte) bool {
-	r, _ := utf8.DecodeLastRune(b)
-	return IsWhitespace(r)
-}
-
 // IntOpt turns a float64 setting to an int
-func IntOpt(opt any) int {
+func IntOpt(opt interface{}) int {
 	return int(opt.(float64))
 }

@@ -541,7 +365,7 @@ func GetCharPosInLine(b []byte, visualPos int, tabsize int) int {
 	i := 0     // char pos
 	width := 0 // string visual width
 	for len(b) > 0 {
-		r, _, size := DecodeCharacter(b)
+		r, size := utf8.DecodeRune(b)
 		b = b[size:]

 		switch r {
@@ -586,152 +410,15 @@ func Clamp(val, min, max int) int {
 	return val
 }

-// IsAutocomplete returns whether a character should begin an autocompletion.
-func IsAutocomplete(c rune) bool {
-	return c == '.' || IsWordChar(c)
+func IsNonAlphaNumeric(c rune) bool {
+	return !unicode.IsLetter(c) && !unicode.IsNumber(c)
+}
+
+func ParseSpecial(s string) string {
+	return strings.Replace(s, "\\t", "\t", -1)
 }

 // String converts a byte array to a string (for lua plugins)
 func String(s []byte) string {
 	return string(s)
 }
-
-// Unzip unzips a file to given folder
-func Unzip(src, dest string) error {
-	r, err := zip.OpenReader(src)
-	if err != nil {
-		return err
-	}
-	defer r.Close()
-
-	os.MkdirAll(dest, 0755)
-
-	// Closure to address file descriptors issue with all the deferred .Close() methods
-	extractAndWriteFile := func(f *zip.File) error {
-		rc, err := f.Open()
-		if err != nil {
-			return err
-		}
-		defer rc.Close()
-
-		path := filepath.Join(dest, f.Name)
-
-		// Check for ZipSlip (Directory traversal)
-		if !strings.HasPrefix(path, filepath.Clean(dest)+string(os.PathSeparator)) {
-			return fmt.Errorf("illegal file path: %s", path)
-		}
-
-		if f.FileInfo().IsDir() {
-			os.MkdirAll(path, f.Mode())
-		} else {
-			os.MkdirAll(filepath.Dir(path), f.Mode())
-			f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-
-			_, err = io.Copy(f, rc)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	for _, f := range r.File {
-		err := extractAndWriteFile(f)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// HttpRequest returns a new http.Client for making custom requests (for lua plugins)
-func HttpRequest(method string, url string, headers []string) (resp *http.Response, err error) {
-	client := http.Client{}
-	req, err := http.NewRequest(method, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	for i := 0; i < len(headers); i += 2 {
-		req.Header.Add(headers[i], headers[i+1])
-	}
-	return client.Do(req)
-}
-
-// SafeWrite writes bytes to a file in a "safe" way, preventing loss of the
-// contents of the file if it fails to write the new contents.
-// This means that the file is not overwritten directly but by writing to a
-// temporary file first.
-//
-// If rename is true, write is performed atomically, by renaming the temporary
-// file to the target file after the data is successfully written to the
-// temporary file. This guarantees that the file will not remain in a corrupted
-// state, but it also has limitations, e.g. the file should not be a symlink
-// (otherwise SafeWrite silently replaces this symlink with a regular file),
-// the file creation date in Linux is not preserved (since the file inode
-// changes) etc. Use SafeWrite with rename=true for files that are only created
-// and used by micro for its own needs and are not supposed to be used directly
-// by the user.
-//
-// If rename is false, write is performed by overwriting the target file after
-// the data is successfully written to the temporary file.
-// This means that the target file may remain corrupted if overwrite fails,
-// but in such case the temporary file is preserved as a backup so the file
-// can be recovered later. So it is less convenient than atomic write but more
-// universal. Use SafeWrite with rename=false for files that may be managed
-// directly by the user, like settings.json and bindings.json.
-func SafeWrite(path string, bytes []byte, rename bool) error {
-	var err error
-	if _, err = os.Stat(path); err != nil {
-		if !errors.Is(err, fs.ErrNotExist) {
-			return err
-		}
-		// Force rename for new files!
-		rename = true
-	}
-
-	var file *os.File
-	if !rename {
-		file, err = os.OpenFile(path, os.O_WRONLY|os.O_CREATE, FileMode)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-	}
-
-	tmp := path + BackupSuffix
-	err = os.WriteFile(tmp, bytes, FileMode)
-	if err != nil {
-		os.Remove(tmp)
-		return err
-	}
-
-	if rename {
-		err = os.Rename(tmp, path)
-	} else {
-		err = file.Truncate(0)
-		if err == nil {
-			_, err = file.Write(bytes)
-		}
-		if err == nil {
-			err = file.Sync()
-		}
-	}
-	if err != nil {
-		if rename {
-			os.Remove(tmp)
-		} else {
-			err = OverwriteError{err, tmp}
-		}
-		return err
-	}
-
-	if !rename {
-		os.Remove(tmp)
-	}
-	return nil
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zachary Yedidia	bc974e13f0	Cross compile binaries in release scripts	2020-02-16 00:40:51 +00:00
Zachary Yedidia	11534a2aeb	Use hub for creating releases	2020-02-15 19:33:49 -05:00