diff --git a/extras/aerc/tokyonight_day.ini b/extras/aerc/tokyonight_day.ini
new file mode 100644
index 00000000..43b13cc9
--- /dev/null
+++ b/extras/aerc/tokyonight_day.ini
@@ -0,0 +1,97 @@
+# vim: ft=dosini
+#
+# aerc TokyoNight styleset
+# set styleset-name=tokyonight-xxx.ini in 'aerc.conf' to load the style
+#
+
+*.default=true
+*.normal=true
+
+border.fg=#a8aecb
+border.bg=#e1e2e7
+
+title.fg=#b4b5b9
+title.bg=#2e7de9
+title.bold=true
+
+header.fg=#f52a65
+#header.bg=#e1e2e7
+header.bold=true
+
+tab.fg=#a8aecb
+tab.bg=#d0d5e3
+tab.selected.fg=#b4b5b9
+tab.selected.bg=#2e7de9
+
+statusline_default.fg=#3760bf
+statusline_default.bg=#d0d5e3
+statusline_error.fg=#c64343
+statusline_success.fg=#387068
+
+*error.bold=true
+*error.fg=#c64343
+*warning.fg=#8c6c3e
+*success.fg=#387068
+
+dirlist_*.bg=#e1e2e7
+dirlist_*.fg=#3760bf
+dirlist_*.selected.bg=#b7c1e3
+dirlist_*.selected.fg=#3760bf
+
+msglist_*.bg=#e1e2e7
+msglist_*.fg=#3760bf
+msglist_*.selected.bg=#b7c1e3
+#msglist_*.selected.fg=#3760bf
+msglist_unread.bold=true
+msglist_unread.fg=#2e7de9
+msglist_marked.fg=#b15c00
+msglist_thread_folded.italic=true
+msglist_thread_folded.underline=true
+msglist_gutter.bg=#c4c8da
+msglist_pill.bg=#a8aecb
+msglist_pill.reverse=false
+
+part_*.fg=#3760bf
+part_*.bg=#d0d5e3
+part_*.selected.fg=#3760bf
+part_*.selected.bg=#a8aecb
+
+completion_default.bg=#d0d5e3
+completion_default.fg=#3760bf
+completion_default.selected.bg=#a8aecb
+completion_default.selected.fg=#3760bf
+completion_gutter.bg=#c4c8da
+completion_pill.bg=#a8aecb
+completion_pill.reverse=false
+
+spinner.bg=#e1e2e7
+spinner.fg=#3760bf
+
+selector_focused.bold=false
+selector_focused.bg=#b7c1e3
+selector_focused.fg=#3760bf
+selector_chooser.bold=false
+selector_chooser.bg=#b7c1e3
+selector_chooser.fg=#3760bf
+default.selected.bold=false
+default.selected.fg=#3760bf
+default.selected.bg=#b7c1e3
+
+[viewer]
+url.underline=true
+url.fg=#68709a
+header.fg=#7847bd
+signature.fg=#9854f1
+diff_add.fg=#c8d6dc
+diff_del.fg=#ddcace
+diff_meta.bold=true
+diff_chunk.dim=true
+quote_1.fg=#8c6c3e
+quote_2.fg=#587539
+quote_3.fg=#118c74
+quote_3.dim=true
+quote_4.fg=#2e7de9
+quote_4.dim=true
+quote_x.fg=#848cb5
+quote_x.dim=true
+
diff --git a/extras/aerc/tokyonight_moon.ini b/extras/aerc/tokyonight_moon.ini
new file mode 100644
index 00000000..1a6fc809
--- /dev/null
+++ b/extras/aerc/tokyonight_moon.ini
@@ -0,0 +1,97 @@
+# vim: ft=dosini
+#
+# aerc TokyoNight styleset
+# set styleset-name=tokyonight-xxx.ini in 'aerc.conf' to load the style
+#
+
+*.default=true
+*.normal=true
+
+border.fg=#3b4261
+border.bg=#222436
+
+title.fg=#1b1d2b
+title.bg=#82aaff
+title.bold=true
+
+header.fg=#ff757f
+#header.bg=#222436
+header.bold=true
+
+tab.fg=#3b4261
+tab.bg=#1e2030
+tab.selected.fg=#1b1d2b
+tab.selected.bg=#82aaff
+
+statusline_default.fg=#c8d3f5
+statusline_default.bg=#1e2030
+statusline_error.fg=#c53b53
+statusline_success.fg=#4fd6be
+
+*error.bold=true
+*error.fg=#c53b53
+*warning.fg=#ffc777
+*success.fg=#4fd6be
+
+dirlist_*.bg=#222436
+dirlist_*.fg=#c8d3f5
+dirlist_*.selected.bg=#2d3f76
+dirlist_*.selected.fg=#c8d3f5
+
+msglist_*.bg=#222436
+msglist_*.fg=#c8d3f5
+msglist_*.selected.bg=#2d3f76
+#msglist_*.selected.fg=#c8d3f5
+msglist_unread.bold=true
+msglist_unread.fg=#82aaff
+msglist_marked.fg=#ff966c
+msglist_thread_folded.italic=true
+msglist_thread_folded.underline=true
+msglist_gutter.bg=#2f334d
+msglist_pill.bg=#3b4261
+msglist_pill.reverse=false
+
+part_*.fg=#c8d3f5
+part_*.bg=#1e2030
+part_*.selected.fg=#c8d3f5
+part_*.selected.bg=#3b4261
+
+completion_default.bg=#1e2030
+completion_default.fg=#c8d3f5
+completion_default.selected.bg=#3b4261
+completion_default.selected.fg=#c8d3f5
+completion_gutter.bg=#2f334d
+completion_pill.bg=#3b4261
+completion_pill.reverse=false
+
+spinner.bg=#222436
+spinner.fg=#c8d3f5
+
+selector_focused.bold=false
+selector_focused.bg=#2d3f76
+selector_focused.fg=#c8d3f5
+selector_chooser.bold=false
+selector_chooser.bg=#2d3f76
+selector_chooser.fg=#c8d3f5
+default.selected.bold=false
+default.selected.fg=#c8d3f5
+default.selected.bg=#2d3f76
+
+[viewer]
+url.underline=true
+url.fg=#737aa2
+header.fg=#fca7ea
+signature.fg=#c099ff
+diff_add.fg=#273849
+diff_del.fg=#3a273a
+diff_meta.bold=true
+diff_chunk.dim=true
+quote_1.fg=#ffc777
+quote_2.fg=#c3e88d
+quote_3.fg=#4fd6be
+quote_3.dim=true
+quote_4.fg=#82aaff
+quote_4.dim=true
+quote_x.fg=#636da6
+quote_x.dim=true
+
diff --git a/extras/aerc/tokyonight_night.ini b/extras/aerc/tokyonight_night.ini
new file mode 100644
index 00000000..f1841687
--- /dev/null
+++ b/extras/aerc/tokyonight_night.ini
@@ -0,0 +1,97 @@
+# vim: ft=dosini
+#
+# aerc TokyoNight styleset
+# set styleset-name=tokyonight-xxx.ini in 'aerc.conf' to load the style
+#
+
+*.default=true
+*.normal=true
+
+border.fg=#3b4261
+border.bg=#1a1b26
+
+title.fg=#15161e
+title.bg=#7aa2f7
+title.bold=true
+
+header.fg=#f7768e
+#header.bg=#1a1b26
+header.bold=true
+
+tab.fg=#3b4261
+tab.bg=#16161e
+tab.selected.fg=#15161e
+tab.selected.bg=#7aa2f7
+
+statusline_default.fg=#c0caf5
+statusline_default.bg=#16161e
+statusline_error.fg=#db4b4b
+statusline_success.fg=#73daca
+
+*error.bold=true
+*error.fg=#db4b4b
+*warning.fg=#e0af68
+*success.fg=#73daca
+
+dirlist_*.bg=#1a1b26
+dirlist_*.fg=#c0caf5
+dirlist_*.selected.bg=#283457
+dirlist_*.selected.fg=#c0caf5
+
+msglist_*.bg=#1a1b26
+msglist_*.fg=#c0caf5
+msglist_*.selected.bg=#283457
+#msglist_*.selected.fg=#c0caf5
+msglist_unread.bold=true
+msglist_unread.fg=#7aa2f7
+msglist_marked.fg=#ff9e64
+msglist_thread_folded.italic=true
+msglist_thread_folded.underline=true
+msglist_gutter.bg=#292e42
+msglist_pill.bg=#3b4261
+msglist_pill.reverse=false
+
+part_*.fg=#c0caf5
+part_*.bg=#16161e
+part_*.selected.fg=#c0caf5
+part_*.selected.bg=#3b4261
+
+completion_default.bg=#16161e
+completion_default.fg=#c0caf5
+completion_default.selected.bg=#3b4261
+completion_default.selected.fg=#c0caf5
+completion_gutter.bg=#292e42
+completion_pill.bg=#3b4261
+completion_pill.reverse=false
+
+spinner.bg=#1a1b26
+spinner.fg=#c0caf5
+
+selector_focused.bold=false
+selector_focused.bg=#283457
+selector_focused.fg=#c0caf5
+selector_chooser.bold=false
+selector_chooser.bg=#283457
+selector_chooser.fg=#c0caf5
+default.selected.bold=false
+default.selected.fg=#c0caf5
+default.selected.bg=#283457
+
+[viewer]
+url.underline=true
+url.fg=#737aa2
+header.fg=#9d7cd8
+signature.fg=#bb9af7
+diff_add.fg=#20303b
+diff_del.fg=#37222c
+diff_meta.bold=true
+diff_chunk.dim=true
+quote_1.fg=#e0af68
+quote_2.fg=#9ece6a
+quote_3.fg=#1abc9c
+quote_3.dim=true
+quote_4.fg=#7aa2f7
+quote_4.dim=true
+quote_x.fg=#565f89
+quote_x.dim=true
+
diff --git a/extras/aerc/tokyonight_storm.ini b/extras/aerc/tokyonight_storm.ini
new file mode 100644
index 00000000..ae2984eb
--- /dev/null
+++ b/extras/aerc/tokyonight_storm.ini
@@ -0,0 +1,97 @@
+# vim: ft=dosini
+#
+# aerc TokyoNight styleset
+# set styleset-name=tokyonight-xxx.ini in 'aerc.conf' to load the style
+#
+
+*.default=true
+*.normal=true
+
+border.fg=#3b4261
+border.bg=#24283b
+
+title.fg=#1d202f
+title.bg=#7aa2f7
+title.bold=true
+
+header.fg=#f7768e
+#header.bg=#24283b
+header.bold=true
+
+tab.fg=#3b4261
+tab.bg=#1f2335
+tab.selected.fg=#1d202f
+tab.selected.bg=#7aa2f7
+
+statusline_default.fg=#c0caf5
+statusline_default.bg=#1f2335
+statusline_error.fg=#db4b4b
+statusline_success.fg=#73daca
+
+*error.bold=true
+*error.fg=#db4b4b
+*warning.fg=#e0af68
+*success.fg=#73daca
+
+dirlist_*.bg=#24283b
+dirlist_*.fg=#c0caf5
+dirlist_*.selected.bg=#2e3c64
+dirlist_*.selected.fg=#c0caf5
+
+msglist_*.bg=#24283b
+msglist_*.fg=#c0caf5
+msglist_*.selected.bg=#2e3c64
+#msglist_*.selected.fg=#c0caf5
+msglist_unread.bold=true
+msglist_unread.fg=#7aa2f7
+msglist_marked.fg=#ff9e64
+msglist_thread_folded.italic=true
+msglist_thread_folded.underline=true
+msglist_gutter.bg=#292e42
+msglist_pill.bg=#3b4261
+msglist_pill.reverse=false
+
+part_*.fg=#c0caf5
+part_*.bg=#1f2335
+part_*.selected.fg=#c0caf5
+part_*.selected.bg=#3b4261
+
+completion_default.bg=#1f2335
+completion_default.fg=#c0caf5
+completion_default.selected.bg=#3b4261
+completion_default.selected.fg=#c0caf5
+completion_gutter.bg=#292e42
+completion_pill.bg=#3b4261
+completion_pill.reverse=false
+
+spinner.bg=#24283b
+spinner.fg=#c0caf5
+
+selector_focused.bold=false
+selector_focused.bg=#2e3c64
+selector_focused.fg=#c0caf5
+selector_chooser.bold=false
+selector_chooser.bg=#2e3c64
+selector_chooser.fg=#c0caf5
+default.selected.bold=false
+default.selected.fg=#c0caf5
+default.selected.bg=#2e3c64
+
+[viewer]
+url.underline=true
+url.fg=#737aa2
+header.fg=#9d7cd8
+signature.fg=#bb9af7
+diff_add.fg=#283b4d
+diff_del.fg=#3f2d3d
+diff_meta.bold=true
+diff_chunk.dim=true
+quote_1.fg=#e0af68
+quote_2.fg=#9ece6a
+quote_3.fg=#1abc9c
+quote_3.dim=true
+quote_4.fg=#7aa2f7
+quote_4.dim=true
+quote_x.fg=#565f89
+quote_x.dim=true
+
diff --git a/lua/tokyonight/extra/aerc.lua b/lua/tokyonight/extra/aerc.lua
new file mode 100644
index 00000000..79a5fc1e
--- /dev/null
+++ b/lua/tokyonight/extra/aerc.lua
@@ -0,0 +1,113 @@
+local util = require("tokyonight.util")
+
+local M = {}
+
+--- @param colors ColorScheme
+function M.generate(colors)
+  local aerc = util.template(
+    [[
+# vim: ft=dosini
+#
+# aerc TokyoNight styleset
+# set styleset-name=tokyonight-xxx.ini in 'aerc.conf' to load the style
+#
+
+*.default=true
+*.normal=true
+
+border.fg=${fg_gutter}
+border.bg=${bg}
+
+title.fg=${black}
+title.bg=${blue}
+title.bold=true
+
+header.fg=${red}
+#header.bg=${bg}
+header.bold=true
+
+tab.fg=${fg_gutter}
+tab.bg=${bg_statusline}
+tab.selected.fg=${black}
+tab.selected.bg=${blue}
+
+statusline_default.fg=${fg}
+statusline_default.bg=${bg_dark}
+statusline_error.fg=${error}
+statusline_success.fg=${green1}
+
+*error.bold=true
+*error.fg=${error}
+*warning.fg=${warning}
+*success.fg=${green1}
+
+dirlist_*.bg=${bg}
+dirlist_*.fg=${fg}
+dirlist_*.selected.bg=${bg_visual}
+dirlist_*.selected.fg=${fg}
+
+msglist_*.bg=${bg}
+msglist_*.fg=${fg}
+msglist_*.selected.bg=${bg_visual}
+#msglist_*.selected.fg=${fg}
+msglist_unread.bold=true
+msglist_unread.fg=${blue}
+msglist_marked.fg=${orange}
+msglist_thread_folded.italic=true
+msglist_thread_folded.underline=true
+msglist_gutter.bg=${bg_highlight}
+msglist_pill.bg=${fg_gutter}
+msglist_pill.reverse=false
+
+part_*.fg=${fg}
+part_*.bg=${bg_popup}
+part_*.selected.fg=${fg}
+part_*.selected.bg=${fg_gutter}
+
+completion_default.bg=${bg_popup}
+completion_default.fg=${fg}
+completion_default.selected.bg=${fg_gutter}
+completion_default.selected.fg=${fg}
+completion_gutter.bg=${bg_highlight}
+completion_pill.bg=${fg_gutter}
+completion_pill.reverse=false
+
+spinner.bg=${bg}
+spinner.fg=${fg}
+
+selector_focused.bold=false
+selector_focused.bg=${bg_visual}
+selector_focused.fg=${fg}
+selector_chooser.bold=false
+selector_chooser.bg=${bg_visual}
+selector_chooser.fg=${fg}
+default.selected.bold=false
+default.selected.fg=${fg}
+default.selected.bg=${bg_visual}
+
+[viewer]
+url.underline=true
+url.fg=${dark5}
+header.fg=${purple}
+signature.fg=${magenta}
+diff_add.fg=${diff.add}
+diff_del.fg=${diff.delete}
+diff_meta.bold=true
+diff_chunk.dim=true
+quote_1.fg=${yellow}
+quote_2.fg=${green}
+quote_3.fg=${teal}
+quote_3.dim=true
+quote_4.fg=${blue}
+quote_4.dim=true
+quote_x.fg=${comment}
+quote_x.dim=true
+
+]],
+    colors
+  )
+
+  return aerc
+end
+
+return M
diff --git a/lua/tokyonight/extra/init.lua b/lua/tokyonight/extra/init.lua
index 200abba8..07ef94e6 100644
--- a/lua/tokyonight/extra/init.lua
+++ b/lua/tokyonight/extra/init.lua
@@ -6,6 +6,7 @@ local M = {}
 --- @type table<string, {ext:string, url:string, label:string, subdir?: string, sep?:string}>
 -- stylua: ignore
 M.extras = {
+  aerc             = { ext = "ini", url = "https://git.sr.ht/~rjarry/aerc/", label = "Aerc"},
   alacritty        = { ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty" },
   delta            = { ext = "gitconfig", url = "https://github.com/dandavison/delta", label = "Delta" },
   dunst            = { ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst" },