diff --git a/misc/clifm/Makefile b/misc/clifm/Makefile
index 56279fd03a19..72dd1a386514 100644
--- a/misc/clifm/Makefile
+++ b/misc/clifm/Makefile
@@ -1,38 +1,31 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	clifm
 PORTVERSION=	1.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Non-curses, KISS file manager for the terminal
 
 LICENSE=	GPLv2+
 
 RUN_DEPENDS=	gfind:misc/findutils guniq:sysutils/coreutils
 
 USES=		desktop-file-utils gettext-runtime python:run \
 		readline shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	leo-arch
+GH_PROJECT=	${PORTNAME}-colors:cfmc
+GH_TAGNAME=	e9ee1c4:cfmc
 ALL_TARGET=	build
 SHEBANG_FILES=	misc/tools/manpages_comp_gen.py
 
-OPTIONS_DEFINE=	COLORS
-OPTIONS_DEFAULT=	COLORS
-OPTIONS_SUB=	yes
-
-COLORS_DESC=	Install extra color themes
-COLORS_GH_PROJECT=	clifm-colors:cfmc
-COLORS_GH_TAGNAME=	v0.1.0:cfmc
-
-post-install-COLORS-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/colors
+post-install:
 	${INSTALL_DATA} ${WRKSRC_cfmc}/colors/*.cfm \
 		${STAGEDIR}${DATADIR}/colors
 
 post-stage:
 	@${RM} ${STAGEDIR}${DATADIR}/plugins/*.orig
 
 .include <bsd.port.mk>
diff --git a/misc/clifm/distinfo b/misc/clifm/distinfo
index 0cde014a4cba..2ab15c6dd2c9 100644
--- a/misc/clifm/distinfo
+++ b/misc/clifm/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1656397054
 SHA256 (leo-arch-clifm-v1.6_GH0.tar.gz) = 303f0ee2c6b19d3612de623c3ae0ee3ac110dcacfc348ec0f1d80015fc5f26e1
 SIZE (leo-arch-clifm-v1.6_GH0.tar.gz) = 1268633
-SHA256 (leo-arch-clifm-colors-v0.1.0_GH0.tar.gz) = 147573aa1e83c286488fdf45c3673e6b417957fb3c5a7f70eba0021cc1f3aa70
-SIZE (leo-arch-clifm-colors-v0.1.0_GH0.tar.gz) = 875324
+SHA256 (leo-arch-clifm-colors-e9ee1c4_GH0.tar.gz) = 697e1af046d55cb819ae76034a2c648705b1061525832d80384ac3d5e4530137
+SIZE (leo-arch-clifm-colors-e9ee1c4_GH0.tar.gz) = 993233
diff --git a/misc/clifm/pkg-plist b/misc/clifm/pkg-plist
index 9c9eedb3d961..62eb0cbc5cfe 100644
--- a/misc/clifm/pkg-plist
+++ b/misc/clifm/pkg-plist
@@ -1,74 +1,73 @@
 bin/clifm
 man/man1/clifm.1.gz
 share/applications/clifm.desktop
 share/bash-completion/completions/clifm
 %%DATADIR%%/actions.cfm
 %%DATADIR%%/clifmrc
-%%COLORS%%%%DATADIR%%/colors/amber-256.cfm
-%%COLORS%%%%DATADIR%%/colors/aqua.cfm
-%%COLORS%%%%DATADIR%%/colors/base16.cfm
-%%COLORS%%%%DATADIR%%/colors/cga.cfm
-%%COLORS%%%%DATADIR%%/colors/cold.cfm
-%%COLORS%%%%DATADIR%%/colors/default.cfm
-%%COLORS%%%%DATADIR%%/colors/dracula-vivid.cfm
-%%COLORS%%%%DATADIR%%/colors/dracula.cfm
-%%COLORS%%%%DATADIR%%/colors/forest.cfm
-%%COLORS%%%%DATADIR%%/colors/green-256.cfm
-%%COLORS%%%%DATADIR%%/colors/gruvbox.cfm
-%%COLORS%%%%DATADIR%%/colors/jellybeans-vivid.cfm
-%%COLORS%%%%DATADIR%%/colors/light.cfm
-%%COLORS%%%%DATADIR%%/colors/molokai.cfm
-%%COLORS%%%%DATADIR%%/colors/nocolor.cfm
-%%COLORS%%%%DATADIR%%/colors/nord.cfm
-%%COLORS%%%%DATADIR%%/colors/one-dark.cfm
-%%COLORS%%%%DATADIR%%/colors/snow.cfm
-%%COLORS%%%%DATADIR%%/colors/solarized.cfm
-%%COLORS%%%%DATADIR%%/colors/sunset.cfm
-%%COLORS%%%%DATADIR%%/colors/white-256.cfm
-%%COLORS%%%%DATADIR%%/colors/white.cfm
-%%COLORS%%%%DATADIR%%/colors/zenburn.cfm
+%%DATADIR%%/colors/amber-256.cfm
+%%DATADIR%%/colors/aqua.cfm
+%%DATADIR%%/colors/base16.cfm
+%%DATADIR%%/colors/c64.cfm
+%%DATADIR%%/colors/cga.cfm
+%%DATADIR%%/colors/cold.cfm
+%%DATADIR%%/colors/default.cfm
+%%DATADIR%%/colors/dracula-vivid.cfm
+%%DATADIR%%/colors/dracula.cfm
+%%DATADIR%%/colors/gameboy.cfm
+%%DATADIR%%/colors/green-256.cfm
+%%DATADIR%%/colors/gruvbox.cfm
+%%DATADIR%%/colors/jellybeans-vivid.cfm
+%%DATADIR%%/colors/light.cfm
+%%DATADIR%%/colors/molokai.cfm
+%%DATADIR%%/colors/nocolor.cfm
+%%DATADIR%%/colors/nord.cfm
+%%DATADIR%%/colors/one-dark.cfm
+%%DATADIR%%/colors/solarized.cfm
+%%DATADIR%%/colors/white-256.cfm
+%%DATADIR%%/colors/white.cfm
+%%DATADIR%%/colors/zenburn.cfm
 %%DATADIR%%/functions/cd_on_quit.sh
 %%DATADIR%%/functions/file_picker.sh
 %%DATADIR%%/functions/subshell_notice.sh
 %%DATADIR%%/keybindings.cfm
 %%DATADIR%%/mimelist.cfm
 %%DATADIR%%/nets.cfm
 %%DATADIR%%/plugins/BFG.cfg
 %%DATADIR%%/plugins/BFG.sh
 %%DATADIR%%/plugins/batch_copy.sh
 %%DATADIR%%/plugins/batch_create.sh
 %%DATADIR%%/plugins/bm_import.sh
 %%DATADIR%%/plugins/clip.sh
 %%DATADIR%%/plugins/colors.sh
 %%DATADIR%%/plugins/cprm.sh
 %%DATADIR%%/plugins/disk_analyzer.sh
 %%DATADIR%%/plugins/dragondrop.sh
 %%DATADIR%%/plugins/fdups.sh
 %%DATADIR%%/plugins/finder.sh
 %%DATADIR%%/plugins/fzcd.sh
 %%DATADIR%%/plugins/fzfdesel.sh
 %%DATADIR%%/plugins/fzfdirhist.sh
 %%DATADIR%%/plugins/fzfhist.sh
 %%DATADIR%%/plugins/fzfnav.sh
 %%DATADIR%%/plugins/fzfsel.sh
 %%DATADIR%%/plugins/git_status.sh
 %%DATADIR%%/plugins/ihelp.sh
 %%DATADIR%%/plugins/img_viewer.sh
 %%DATADIR%%/plugins/jumper.sh
 %%DATADIR%%/plugins/kbgen.c
 %%DATADIR%%/plugins/mime_list.sh
 %%DATADIR%%/plugins/music_player.sh
 %%DATADIR%%/plugins/pager.sh
 %%DATADIR%%/plugins/pdf_viewer.sh
 %%DATADIR%%/plugins/plugins-helper
 %%DATADIR%%/plugins/recur_rm.sh
 %%DATADIR%%/plugins/rgfind.sh
 %%DATADIR%%/plugins/update.sh
 %%DATADIR%%/plugins/vid_viewer.sh
 %%DATADIR%%/plugins/wallpaper_setter.sh
 %%DATADIR%%/prompts.cfm
 %%DATADIR%%/readline.cfm
 %%DATADIR%%/tools/deroff.py
 %%DATADIR%%/tools/manpages_comp_gen.py
 share/icons/hicolor/scalable/apps/clifm.svg
 share/zsh/site-functions/_clifm