diff --git a/rc/modules/fzf-project.kak b/rc/modules/fzf-project.kak
index d2316f3..970785e 100644
--- a/rc/modules/fzf-project.kak
+++ b/rc/modules/fzf-project.kak
@@ -16,20 +16,21 @@ map global fzf -docstring "project menu" '<a-p>' '<esc>: enter-user-mode fzf-pro
 map global fzf-project -docstring "save current path as project" 's' '<esc>: fzf-save-path-as-project<ret>'
 map global fzf-project -docstring "update project" 'u' '<esc>: fzf-update-project-path<ret>'
 map global fzf-project -docstring "delete project from project list" 'd' '<esc>: fzf-delete-project<ret>'
+map global fzf-project -docstring "rename project" 'r' '<esc>: fzf-rename-project<ret>'
 
 declare-option -docstring "file where saved projects are stored" str fzf_project_file "%val{config}/.fzf-projects"
-declare-option -docstring %sh{ printf "%s\n" "use ~/ instead of $HOME" } bool fzf_project_use_tilda false
+declare-option -docstring %sh{ printf "%s\n" "use '~/' instead of '$HOME'" } bool fzf_project_use_tilda false
 
 define-command -hidden fzf-project %{ evaluate-commands %sh{
     if [ -s $kak_opt_fzf_project_file ]; then
         printf '%s\n' "info -title %{fzf open project} %{Change the server's working directory to selected project}"
-        printf "%s\n" "fzf -kak-cmd change-directory -items-cmd %{cat $kak_opt_fzf_project_file} -preview-cmd %{$preview} -fzf-args %{--reverse} -post-action fzf-file -filter %{sed 's/.*:  //'}"
+        printf "%s\n" "fzf -kak-cmd change-directory -items-cmd %{cat $kak_opt_fzf_project_file} -fzf-args %{--reverse} -post-action fzf-file -filter %{sed 's/.*:  //'}"
     else
         printf "%s\n" "echo -markup %{{Information}No project defined in '$kak_opt_fzf_project_file'}"
     fi
 }}
 
-define-command -hidden fzf-save-path-as-project %{ prompt "Project's name: " %{ evaluate-commands %sh{
+define-command -hidden fzf-save-path-as-project %{ prompt -shell-script-candidates %{printf "%s\n" "${PWD##*/}"} "Project's name: " %{ evaluate-commands %sh{
     mkdir -p "${kak_opt_fzf_project_file%/*}"
     tmp=$(mktemp "${TMPDIR:-/tmp}/fzf-project.XXXXXXX")
     project=$(grep "$kak_text:  " $kak_opt_fzf_project_file)
@@ -39,26 +40,32 @@ define-command -hidden fzf-save-path-as-project %{ prompt "Project's name: " %{
         printf "%s\n" "echo -markup %{{Information}saved '$(pwd)' project as '$kak_text'}"
     else
         project="$kak_text"
-        printf "%s\n" "prompt -shell-script-candidates %{printf '%s\n%s\n' 'y' 'n'} %{Project '$project' exists. Update? (y/N): } %{ evaluate-commands %sh{
-            if [ \"\$kak_text\" = 'y' ] || [ \"\$kak_text\" = 'Y' ] || [ \"\$kak_text\" = 'yes' ] || [ \"\$kak_text\" = 'Yes' ] || [ \"\$kak_text\" = 'YEs' ] || [ \"\$kak_text\" = 'YES' ]; then
-                printf \"%s\n\" \"fzf-update-project-path-impl %{$project}\"
-                printf \"%s\n\" \"echo -markup %{{Information}'$project' project updated}\"
-            else
-                printf \"%s\n\" \"echo -markup %{{Information}'$project' project kept}\"
-            fi
-        }}"
+        printf "%s\n" "fzf-project-confirm-impl %{fzf-update-project-path-impl} %{$project} %{Project '$project' updated} %{Project '$project' kept}"
     fi
     rm -rf ${tmp}
 }}}
 
+define-command -hidden fzf-project-confirm-impl -params 2..4 %{
+    prompt -shell-script-candidates %{printf "%s\n%s\n" "y" "n"} "Project '%arg{2}' exists. Update? (y/N): " %{ evaluate-commands %sh{
+        function_to_call=$1;  project=$2;  success_message=$3;  fail_message=$4
+        choice=$(printf "%s" "$kak_text" | perl -pe "s/y(es)?.*//i") # case isensetive lookup for yes answer
+        if [ -z "$choice" ]; then
+            printf "%s\n" "$function_to_call %{$project}"
+            [ -n "$success_message" ] && printf "%s\n" "echo -markup %{{Information}$success_message}"
+        else
+            [ -n "$fail_message" ] && printf "%s\n" "echo -markup %{{Information}$fail_message '$choice'}"
+        fi
+    }}
+}
+
 define-command -hidden fzf-update-project-path %{
-    prompt -shell-script-candidates %{ perl -n -e '/^([^:]+)/ && print "$1\n"' $kak_opt_fzf_project_file } "Project to update: " %{
+    prompt -shell-script-candidates %{ perl -ne '/^([^:]+)/ && print "$1\n"' $kak_opt_fzf_project_file } "Project to update: " %{
         fzf-update-project-path-impl %val{text}
         echo -markup "{Information}'%val{text}' project updated"
     }
 }
 
-define-command fzf-update-project-path-impl -params 1 %{ nop %sh{
+define-command -hidden fzf-update-project-path-impl -params 1 %{ nop %sh{
     tmp=$(mktemp "${TMPDIR:-/tmp}/fzf-project.XXXXXXX")
     [ "${kak_opt_fzf_project_use_tilda}" = "false" ] && project_path=$(pwd) || project_path=$(pwd | perl -pe "s($HOME)(~)")
     perl -pe "s(\Q$1:  \E.*)($1:  ${project_path})" "${kak_opt_fzf_project_file}" > ${tmp} && cat ${tmp} > "${kak_opt_fzf_project_file}"
@@ -66,10 +73,23 @@ define-command fzf-update-project-path-impl -params 1 %{ nop %sh{
 }}
 
 define-command -hidden fzf-delete-project %{
-    prompt -shell-script-candidates %{ perl -n -e '/^([^:]+)/ && print "$1\n"' $kak_opt_fzf_project_file } "Project to delete: " %{ nop %sh{
+    prompt -shell-script-candidates %{ perl -ne '/^([^:]+)/ && print "$1\n"' $kak_opt_fzf_project_file } "Project to delete: " %{ nop %sh{
         tmp=$(mktemp "${TMPDIR:-/tmp}/fzf-project.XXXXXXX")
         perl -pe "s(\Q$kak_text:  \E.*\n)()" "${kak_opt_fzf_project_file}" > ${tmp} && cat ${tmp} > "${kak_opt_fzf_project_file}"
         rm -rf ${tmp}
     }}
 }
 
+define-command -hidden fzf-rename-project %{
+    prompt -shell-script-candidates %{ perl -ne '/^([^:]+)/ && print "$1\n"' $kak_opt_fzf_project_file } "Project to rename: " %{ evaluate-commands %sh{
+        tmp=$(mktemp "${TMPDIR:-/tmp}/fzf-project.XXXXXXX")
+        project_name=${kak_text}
+        printf "%s\n" "prompt %{New name: } %{ evaluate-commands %sh{
+            perl -pe \"s($project_name:)(\$kak_text:)\" \"${kak_opt_fzf_project_file}\" > ${tmp} && cat ${tmp} > "${kak_opt_fzf_project_file}"
+            printf \"%s\n\" \"echo -markup %{{Information}'$project_name' renamed to '\$kak_text'}\"
+            printf \"%s\n\" \"fzf-project\"
+        }}"
+        rm -rf ${tmp}
+    }}
+}
+