Improved
Modified to use Fcitx