diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d0c2d03
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2011-2021 lilydjwg <lilydjwg@gmail.com>, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README b/README
deleted file mode 100644
index 9ec9912..0000000
--- a/README
+++ /dev/null
@@ -1,23 +0,0 @@
-This is a mirror of http://www.vim.org/scripts/script.php?script_id=3764
-
-Keep and restore fcitx state for each buffer separately when leaving/re-entering insert mode. Like always typing English in normal mode, but Chinese in insert mode.
-
-Requires: fcitx 3.6 or later, 4.0 or later will be better.
-
-Developing: It's a part of https://github.com/lilydjwg/dotvim
-
-A mirror repo: https://github.com/vim-scripts/fcitx.vim
-
-Warning:
-1, It will be faster and better with Python (3 or 2) enabled Vim. But some old version Vim enabled both Python 2 & 3 may have some issues.
-2, If you use Vim in terminal, to avoid the Esc delay, please set 'ttimeoutlen' to 100 or some other value. And check screen's 'maptimeout' or tmux's 'escape-time' option if you use it too.
-
-在离开或重新进入插入模式时自动记录和恢复每个缓冲区各自的输入法状态，以便在普通模式下始终是英文输入模式，切换回插入模式时恢复离开前的输入法输入模式。
-
-要求: fcitx 版本 3.6 以上，建议 fcitx 4.0 以上。
-
-注意事项:
-1. Vim 如有 Python 3或2 支持可以获得更快更好的效果。但对于较旧的 Vim 版本，如果同时编译了 Python 2 & 3 支持，因为此 Vim 不能同时运行两个版本的 Python，而本脚本首先检查 Python 3，所以会导致出错或者 Python 2 不可用。
-2. 终端下请设置 Vim 'ttimeoutlen' 选项为较小值（如100），否则退出插入模式时会有较严重的延迟。同样会造成延迟的还有 screen 的 maptimeout 选项以及 tmux 的 escape-time 选项。
-
-如果你需要跨主机使用 fcitx.vim，请参考此文： http://lilydjwg.is-programmer.com/2012/7/27/using-fcitx-remote-interface-remotely-via-socat.34729.html
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6ce27b8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,72 @@
+Keep and restore fcitx state for each buffer separately when leaving/re-entering insert mode or search mode. Like always typing English in normal mode, but Chinese in insert mode.
+
+D-Bus only works with the same user so this won't work with `sudo vim`. See the `fcitx5-server` branch for an experimental implementation that supports `sudo vim`.
+
+By default, it use python3 and D-Bus to toggle IME state.
+If you set `g:fcitx5_remote` to the executable path of `fcitx5-remote` **BEFORE** loading the plugin, it will use `fcitx5-remote` instead of python and D-Bus. In this case, python3 support is optional.
+
+Usually `fcitx5-remote` mode is way faster to start up since Python script need quite some time for the initial load if you don't use any other plugins that load Python. The Python version will be faster while switching.
+
+Base requirements:
+
+* fcitx 5
+
+Requirements for Python mode (`g:fcitx5_remote` is not set):
+
+* Vim with Python 3 compiled in
+* The python-dbus package
+
+Requirements for `fcitx5-remote` mode (`g:fcitx5_remote` is set):
+
+* fcitx5-remote
+
+If you are using `fcitx5-rime` (which has its own state), `let g:fcitx5_rime = 1` in your `.vimrc`.
+
+The `FcitxCurrentIM()` function can be used to get current IM's name.
+
+Links:
+
+* [git repo](https://github.com/lilydjwg/fcitx.vim)
+* [www.vim.org](https://www.vim.org/scripts/script.php?script_id=3764)
+
+Warning:
+
+1. If you use Vim in terminal, to avoid the Esc delay, please set `'ttimeoutlen'` to 100 or some other value. And check screen's `maptimeout` or tmux's `escape-time` option if you use it too.
+
+----
+
+在离开或重新进入插入模式或搜索模式时自动记录和恢复每个缓冲区各自的输入法状态，以便在普通模式下始终是英文输入模式，切换回插入模式时恢复离开前的输入法输入模式。
+
+D-Bus 只在同一用户时有效，所以使用 `sudo vim` 时本代码就失效了。在 `fcitx5-server` 分支有一个实验性的版本支持 `sudo vim` 的用法。
+
+本插件默认会使用 Python 3 并通过 D-Bus 来切换输入法状态。
+但如果你在加载插件**之前**设置了 `g:fcitx5_remote` 为你已安装的 `fcitx5-remote` 可执行文件的路径，那么本插件会使用它来切换输入法状态；此模式下本插件并不需要 Python。
+
+如果你没有其他使用 Python 的 Vim 插件，本插件的 Python 模式初始化可能会显著拖慢启动时间；而 `fcitx5-remote` 模式则没有这个问题。Python 模式会在切换时更快。
+
+基本要求：
+
+* fcitx 5
+
+使用 Python 模式的要求（未设置 `g:fcitx5_remote`）：
+
+* 带有 Python 3 支持的 Vim
+* python-dbus 包
+
+使用 `fcitx5-remote` 模式的要求（需设置 `g:fcitx5_remote`）：
+
+* fcitx5-remote
+
+如果使用 `fcitx5-rime`（它自己有输入状态），在 `.vimrc` 中设置 `let g:fcitx5_rime = 1`。
+
+`FcitxCurrentIM()` 函数可以用于获取当前输入法的名字。
+
+链接：
+
+* [git 仓库](https://github.com/lilydjwg/fcitx.vim)
+* [www.vim.org](https://www.vim.org/scripts/script.php?script_id=3764)
+
+注意事项:
+
+1. 终端下请设置 Vim `'ttimeoutlen'` 选项为较小值（如100），否则退出插入模式时会有较严重的延迟。同样会造成延迟的还有 screen 的 `maptimeout` 选项以及 tmux 的 `escape-time` 选项。
+2. 请在 fcitx5-configtool 中确认英语是第一个输入法，中文是第二个输入法，rime 用户可能需要设置 `g:fcitx5_rime = 1`。
diff --git a/plugin/fcitx.py b/plugin/fcitx.py
index 5de12bb..3cbd642 100644
--- a/plugin/fcitx.py
+++ b/plugin/fcitx.py
@@ -1,44 +1,103 @@
-# vim:fileencoding=utf-8
-
-import os
 import vim
-import socket
-import struct
-FCITX_STATUS = struct.pack('i', 0)
-FCITX_OPEN   = struct.pack('i', 1 | (1 << 16))
-FCITX_CLOSE  = struct.pack('i', 1)
-INT_SIZE     = struct.calcsize('i')
-fcitxsocketfile = vim.eval('s:fcitxsocketfile')
+import functools
 
-def fcitxtalk(command=None):
-  sock = socket.socket(socket.AF_UNIX)
-  try:
-    sock.connect(fcitxsocketfile)
-  except socket.error:
-    vim.command('echohl WarningMsg | echo "fcitx.vim: socket connection error" | echohl NONE')
-    return
-  try:
-    if not command:
-      sock.send(FCITX_STATUS)
-      return struct.unpack('i', sock.recv(INT_SIZE))[0]
-    elif command == 'c':
-      sock.send(FCITX_CLOSE)
-    elif command == 'o':
-      sock.send(FCITX_OPEN)
+import dbus
+
+class FcitxComm:
+  def __init__(self):
+    self.bus = bus = dbus.SessionBus()
+    obj = bus.get_object('org.fcitx.Fcitx5', '/controller')
+    self.fcitx = dbus.Interface(obj, dbus_interface='org.fcitx.Fcitx.Controller1')
+    self._rime = None
+
+  def status(self):
+    return self.fcitx.State() == 2
+
+  def activate(self):
+    self.fcitx.Activate()
+
+  def deactivate(self):
+    self.fcitx.Deactivate()
+
+  def current(self):
+    im = self.fcitx.CurrentInputMethod()
+    if im == 'rime':
+      return self._get_rime().GetCurrentSchema()
     else:
-      raise ValueError('unknown fcitx command')
-  finally:
-    sock.close()
+      return im
 
+  def current_and_rime(self):
+    im = self.fcitx.CurrentInputMethod()
+    if im == 'rime':
+      return 'rime:' + self._get_rime().GetCurrentSchema()
+    else:
+      return im
+
+  def _get_rime(self):
+    if self._rime is None:
+      obj = self.bus.get_object('org.fcitx.Fcitx5', '/rime')
+      self._rime = dbus.Interface(obj, dbus_interface='org.fcitx.Fcitx.Rime1')
+    return self._rime
+
+class FcitxRimeComm:
+  def __init__(self):
+    bus = dbus.SessionBus()
+    obj = bus.get_object('org.fcitx.Fcitx5', '/rime')
+    self.fcitx = dbus.Interface(obj, dbus_interface='org.fcitx.Fcitx.Rime1')
+
+  def status(self):
+    return self.fcitx.IsAsciiMode()
+
+  def activate(self):
+    self.fcitx.SetAsciiMode(False)
+
+  def deactivate(self):
+    self.fcitx.SetAsciiMode(True)
+
+  def current(self):
+    return self.fcitx.GetCurrentSchema()
+
+try:
+  if vim.eval('get(g:, "fcitx5_rime")') == '1':
+    FcitxComm = FcitxRimeComm
+  Fcitx = FcitxComm()
+  fcitx_loaded = True
+except dbus.exceptions.DBusException as e:
+  if not vim.vars.get('silent_unsupported'):
+    vim.command('echohl WarningMsg | echom "fcitx.vim not loaded: %s" | echohl NONE' % e)
+  fcitx_loaded = False
+
+def may_reconnect(func):
+  @functools.wraps(func)
+  def wrapped():
+    global Fcitx
+    for _ in range(2):
+      try:
+        return func()
+      except Exception as e:
+        vim.command('echohl WarningMsg | echom "fcitx.vim: %s: %s" | echohl NONE' % (type(e).__name__, e))
+        Fcitx = FcitxComm()
+  return wrapped
+
+@may_reconnect
 def fcitx2en():
-  if fcitxtalk() == 2:
+  if Fcitx.status():
     vim.command('let b:inputtoggle = 1')
-    fcitxtalk('c')
+    Fcitx.deactivate()
 
+@may_reconnect
 def fcitx2zh():
   if vim.eval('exists("b:inputtoggle")') == '1':
     if vim.eval('b:inputtoggle') == '1':
-      fcitxtalk('o')
+      Fcitx.activate()
       vim.command('let b:inputtoggle = 0')
   else:
     vim.command('let b:inputtoggle = 0')
+
+@may_reconnect
+def fcitx_current_im():
+  return Fcitx.current()
+
+@may_reconnect
+def fcitx_current_im_and_rime():
+  return Fcitx.current_and_rime()
diff --git a/plugin/fcitx.vim b/plugin/fcitx.vim
index 295ede2..ee85606 100644
--- a/plugin/fcitx.vim
+++ b/plugin/fcitx.vim
@@ -1,58 +1,85 @@
 scriptencoding utf-8
 " fcitx.vim	remember fcitx's input state for each buffer
 " Author:       lilydjwg
-" Version:	1.2
-" URL:		http://www.vim.org/scripts/script.php?script_id=3764
+" Version:	2.0a
+" URL:		https://www.vim.org/scripts/script.php?script_id=3764
 " ---------------------------------------------------------------------
 " Load Once:
-if &cp || exists("g:loaded_fcitx") || !exists('$DISPLAY') || exists('$SSH_TTY') || has('gui_macvim')
-  finish
-endif
-if has("python3")
-  let python3 = 1
-elseif has("python")
-  let python3 = 0
-else
-  runtime so/fcitx.vim
+if &cp || exists("g:loaded_fcitx") || (!exists('$DISPLAY') && !exists('$WAYLAND_DISPLAY'))
   finish
 endif
 let s:keepcpo = &cpo
 set cpo&vim
-" this is quicker than expand()
-if exists('$FCITX_SOCKET')
-  let s:fcitxsocketfile = $FCITX_SOCKET
-else
-  let s:fcitxsocketfile = '/tmp/fcitx-socket-' . $DISPLAY
-  if !filewritable(s:fcitxsocketfile) "try again
-    if strridx(s:fcitxsocketfile, '.') > 0
-      let s:fcitxsocketfile = strpart(s:fcitxsocketfile, 0,
-            \ strridx(s:fcitxsocketfile, '.'))
-    else
-      let s:fcitxsocketfile = s:fcitxsocketfile . '.0'
-      if !filewritable(s:fcitxsocketfile)
-        echohl WarningMsg
-        echomsg "socket file of fcitx not found, fcitx.vim not loaded."
-        echohl None
-        finish
-      endif
+
+function s:setup_cmd()
+  function Fcitx2en()
+    let inputstatus = trim(system(g:fcitx5_remote))
+    if inputstatus == '2'
+      let b:inputtoggle = 1
+      call system(g:fcitx5_remote . ' -c')
     endif
+  endfunction
+  function Fcitx2zh()
+    try
+      if b:inputtoggle == 1
+        call system(g:fcitx5_remote . ' -o')
+        let b:inputtoggle = 0
+      endif
+    catch /inputtoggle/
+      let b:inputtoggle = 0
+    endtry
+  endfunction
+
+  let g:loaded_fcitx = 1
+endfunction
+
+" If g:fcitx5_remote is set (to the path to `fcitx5-remove`), use it to toggle IME state.
+if exists("g:fcitx5_remote")
+  call s:setup_cmd()
+
+" Otherwise, if python3 is available, use python and dbus to toggle IME state.
+elseif has('python3')
+  try " abort on fail
+    exe 'py3file' expand('<sfile>:r') . '.py'
+    if py3eval('fcitx_loaded')
+      function Fcitx2en()
+        py3 fcitx2en()
+      endfunction
+      function Fcitx2zh()
+        py3 fcitx2zh()
+      endfunction
+      function FcitxCurrentIM()
+        return py3eval('fcitx_current_im()')
+      endfunction
+      function FcitxCurrentIMwithRime()
+        return py3eval('fcitx_current_im_and_rime()')
+      endfunction
+
+      let g:loaded_fcitx = 1
+    endif
+  catch
+    if executable('fcitx5-remote')
+      let g:fcitx5_remote = 'fcitx5-remote'
+      call s:setup_cmd()
+    endif
+  endtry
+endif
+
+" Register autocmd if successfully loaded.
+if exists("g:loaded_fcitx")
+  if exists('##InsertLeavePre')
+    au InsertLeavePre * if reg_executing() == "" | call Fcitx2en() | endif
+  else
+    au InsertLeave * if reg_executing() == "" | call Fcitx2en() | endif
   endif
+  au InsertEnter * if reg_executing() == "" | call Fcitx2zh() | endif
+  au CmdlineEnter [/\?] if reg_executing() == "" | call Fcitx2zh() | endif
+  au CmdlineLeave [/\?] if reg_executing() == "" | call Fcitx2en() | endif
 endif
-let g:loaded_fcitx = 1
-let pyfile = expand('<sfile>:r') . '.py'
-if python3
-  exe 'py3file' pyfile
-  au InsertLeave * py3 fcitx2en()
-  au InsertEnter * py3 fcitx2zh()
-else
-  exe 'pyfile' pyfile
-  au InsertLeave * py fcitx2en()
-  au InsertEnter * py fcitx2zh()
-endif
+
 " ---------------------------------------------------------------------
 "  Restoration And Modelines:
-unlet python3
-unlet pyfile
 let &cpo=s:keepcpo
 unlet s:keepcpo
-" vim:fdm=expr:fde=getline(v\:lnum-1)=~'\\v"\\s*-{20,}'?'>1'\:1
+
+" vim: sw=2 :
diff --git a/so/fcitx.vim b/so/fcitx.vim
deleted file mode 100644
index 507fb4a..0000000
--- a/so/fcitx.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-" fcitx.vim  记住插入模式小企鹅输入法的状态
-" Author:       lilydjwg
-" Maintainer:   lilydjwg
-" Last Change:  2010-11-18
-" Note:         另有使用 Python3 接口的新版本
-" ---------------------------------------------------------------------
-" Load Once:
-if (has("win32") || has("win95") || has("win64") || has("win16"))
-  " Windows 下不要载入
-  finish
-endif
-if !exists('$DISPLAY')
-  " 没有 X，不要载入
-  finish
-endif
-if &cp || exists("g:loaded_fcitx") || !executable("fcitx-remote")
-  finish
-endif
-let s:keepcpo = &cpo
-let g:loaded_fcitx = 1
-set cpo&vim
-" ---------------------------------------------------------------------
-" Functions:
-function Fcitx2en()
-  let inputstatus = system("fcitx-remote")
-  if inputstatus == 2
-    let b:inputtoggle = 1
-    call system("fcitx-remote -c")
-  endif
-endfunction
-function Fcitx2zh()
-  try
-    if b:inputtoggle == 1
-      call system("fcitx-remote -o")
-      let b:inputtoggle = 0
-    endif
-  catch /inputtoggle/
-    let b:inputtoggle = 0
-  endtry
-endfunction
-" ---------------------------------------------------------------------
-" Autocmds:
-au InsertLeave * call Fcitx2en()
-au InsertEnter * call Fcitx2zh()
-" ---------------------------------------------------------------------
-"  Restoration And Modelines:
-let &cpo=s:keepcpo
-unlet s:keepcpo
-" vim:fdm=expr:fde=getline(v\:lnum-1)=~'\\v"\\s*-{20,}'?'>1'\:1