diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 323d3ea..dd2608f 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -468,10 +468,10 @@ color mappings.
     \fBbg                  \fRBackground
       \fBpreview-bg        \fRPreview window background
     \fBhl                  \fRHighlighted substrings
-    \fBfg+                 \fRText (current line)
-    \fBbg+                 \fRBackground (current line)
+    \fBcurrent-fg (fg+)    \fRText (current line)
+    \fBcurrent-bg (bg+)    \fRBackground (current line)
       \fBgutter            \fRGutter on the left
-    \fBhl+                 \fRHighlighted substrings (current line)
+    \fBcurrent-hl (hl+)    \fRHighlighted substrings (current line)
     \fBquery               \fRQuery string
       \fBdisabled          \fRQuery string when search is disabled (\fB--disabled\fR)
     \fBinfo                \fRInfo line (match counters)
diff --git a/src/options.go b/src/options.go
index 9abecc3..d7f2b47 100644
--- a/src/options.go
+++ b/src/options.go
@@ -980,15 +980,15 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, erro
 				mergeAttr(&theme.PreviewFg)
 			case "preview-bg":
 				mergeAttr(&theme.PreviewBg)
-			case "fg+":
+			case "current-fg", "fg+":
 				mergeAttr(&theme.Current)
-			case "bg+":
+			case "current-bg", "bg+":
 				mergeAttr(&theme.DarkBg)
 			case "gutter":
 				mergeAttr(&theme.Gutter)
 			case "hl":
 				mergeAttr(&theme.Match)
-			case "hl+":
+			case "current-hl", "hl+":
 				mergeAttr(&theme.CurrentMatch)
 			case "border":
 				mergeAttr(&theme.Border)