diff --git a/bin/scripts/lib/i_seti.sh b/bin/scripts/lib/i_seti.sh
index 86b3aabbb9..3b93e257df 100644
--- a/bin/scripts/lib/i_seti.sh
+++ b/bin/scripts/lib/i_seti.sh
@@ -66,4 +66,6 @@ i='' i_custom_electron=$i
 i='' i_custom_crystal=$i
 i='' i_custom_purescript=$i
 i='' i_custom_puppet=$i
+i='' i_custom_emacs=$i
+i='' i_custom_orgmode=$i
 unset i
diff --git a/font-patcher b/font-patcher
index 7d063ab247..442273defc 100755
--- a/font-patcher
+++ b/font-patcher
@@ -588,7 +588,7 @@ class font_patcher:
         # Define the character ranges
         # Symbol font ranges
         self.patch_set = [
-            {'Enabled': True,                           'Name': "Seti-UI + Custom",        'Filename': "original-source.otf",                            'Exact': False,                               'SymStart': 0xE4FA, 'SymEnd': 0xE531, 'SrcStart': 0xE5FA, 'SrcEnd': 0xE631, 'ScaleGlyph': None,             'Attributes': SYM_ATTR_DEFAULT},
+            {'Enabled': True,                           'Name': "Seti-UI + Custom",        'Filename': "original-source.otf",                            'Exact': False,                               'SymStart': 0xE4FA, 'SymEnd': 0xE533, 'SrcStart': 0xE5FA, 'SrcEnd': 0xE633, 'ScaleGlyph': None,             'Attributes': SYM_ATTR_DEFAULT},
             {'Enabled': True,                           'Name': "Devicons",                'Filename': "devicons.ttf",                                   'Exact': False,                               'SymStart': 0xE600, 'SymEnd': 0xE6C5, 'SrcStart': 0xE700, 'SrcEnd': 0xE7C5, 'ScaleGlyph': DEVI_SCALE_LIST,  'Attributes': SYM_ATTR_DEFAULT},
             {'Enabled': self.args.powerline,            'Name': "Powerline Symbols",       'Filename': "powerline-symbols/PowerlineSymbols.otf",         'Exact': True,                                'SymStart': 0xE0A0, 'SymEnd': 0xE0A2, 'SrcStart': None,   'SrcEnd': None,   'ScaleGlyph': None,             'Attributes': SYM_ATTR_POWERLINE},
             {'Enabled': self.args.powerline,            'Name': "Powerline Symbols",       'Filename': "powerline-symbols/PowerlineSymbols.otf",         'Exact': True,                                'SymStart': 0xE0B0, 'SymEnd': 0xE0B3, 'SrcStart': None,   'SrcEnd': None,   'ScaleGlyph': None,             'Attributes': SYM_ATTR_POWERLINE},
diff --git a/src/glyphs/original-source.otf b/src/glyphs/original-source.otf
index 92b0b96753..980114f37a 100644
Binary files a/src/glyphs/original-source.otf and b/src/glyphs/original-source.otf differ
diff --git a/src/svgs/emacs.svg b/src/svgs/emacs.svg
new file mode 100644
index 0000000000..ec59b2219b
--- /dev/null
+++ b/src/svgs/emacs.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generated by IcoMoon.io -->
+
+<svg
+   version="1.1"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   id="svg1286"
+   sodipodi:docname="glyphassvg.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs1290" />
+  <sodipodi:namedview
+     id="namedview1288"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="19.576956"
+     inkscape:cx="16.013726"
+     inkscape:cy="16.013726"
+     inkscape:window-width="1362"
+     inkscape:window-height="724"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1286" />
+  <title
+     id="title1281">ll</title>
+  <path
+     fill="#000000"
+     d="m 11.524355,25.123976 c 3.7383,0.0869 7.4807,-0.58665 10.99838,-1.8139 1.26978,-0.54712 0.73653,-2.11615 -0.61087,-1.84559 -3.15453,-0.50306 -6.52758,0.27038 -9.51785,-1.10909 -1.22306,-1.46956 1.01274,-2.77309 2.26693,-3.14193 1.75296,-0.70565 3.63199,-1.00221 5.45111,-1.48768 -1.24878,-0.98362 -2.8554,-1.3499 -4.21565,-2.1515 -0.90874,-0.38553 -2.91908,-0.99918 -1.98818,-2.26721 2.00362,-0.8414 4.23718,-0.75153 6.35914,-0.8654 1.59822,-0.29003 2.05156,-2.5584003 0.68491,-3.4158403 -1.49584,-1.112309 -3.43446,-0.351404 -5.03627,0.0785 -0.53894,0.0581 -2.4379,0.63319 -0.79603,0.57591 1.18287,0.0285 2.62193,-0.44744 3.56818,0.48153 -0.30613,1.10706 -2.56943,0.70303 -3.6964,1.01684 -1.59009,0.13853 -3.25249,0.0333 -4.75108,0.66953 -1.2614096,1.3398103 0.62696,2.8388003 1.76524,3.4730503 1.29106,0.83369 2.72515,1.42922 4.19496,1.87706 -3.01984,-0.15022 -6.3740796,0.50044 -8.4598196,2.8364 -0.922437,1.37234 0.37034,2.9569 1.70228,3.43158 2.3652096,1.20419 5.0854796,1.71003 7.7288796,1.38369 0.57322,0.0236 2.17465,-0.234 2.03853,0.16984 -1.3459,0.85028 -3.03103,0.86247 -4.51405,1.3815 -1.05544,0.25081 -2.11372,0.48762 -3.17284,0.72271 z m 17.47249,-9.1201 c 0.14909,6.2782 -5.00533,12.21294 -11.34825,12.89188 -5.26255,0.69321 -10.8092266,-2.12556 -13.1780016,-6.84805 -2.505963,-4.72614 -1.782027,-10.96141 1.963776,-14.8579903 3.376806,-3.679808 9.0024156,-5.203648 13.7578456,-3.484402 4.74889,1.606465 8.35822,6.080862 8.74535,11.0471323 0.0398,0.41559 0.0597,0.83321 0.0593,1.25087 z"
+     id="path1284"
+     style="stroke-width:0.0312499;fill:#444444;fill-opacity:1" />
+  <metadata
+     id="metadata1292">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>ll</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/src/svgs/orgmode.svg b/src/svgs/orgmode.svg
new file mode 100644
index 0000000000..cf11eb9da2
--- /dev/null
+++ b/src/svgs/orgmode.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg"><g style="stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;fill:#444;fill-opacity:1"><g style="stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;fill:#444;fill-opacity:1"><path style="color:#000;display:inline;fill:#444;fill-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" d="M17.6 6.1c-1.4.3-.5 2.5-2.2 2.2-.8.4-.8-2.3-1.8-1.1-.5.8-1 2.6-1 3 0-.7.4-1.8-.3-.7-1.2 1.5-3.3 1.7-5 2-2.3.7-4 2.6-5 4.7-1 2-.4 4.3.3 6.4A5.2 5.2 0 0 0 5 25.5c1.3 2.3 4 3.8 6.6 3.4 1.8-.2 3.5-1 5.4-.9 3.1 0 6.1 1.5 8.3 3.7.3-.7-.6-1.8-.9-2.6a17.2 17.2 0 0 0-6.6-6.9c-1.3-.8-1.4-2.6-.8-3.9.3-.5.2-1.8 1-.8 1.6.8 3-.6 4-1.2 1.5.1 3-.2 4.5.3 1 0 3-.4 2.4-1.9.4-.5 2-1.6.9-2.6-.4-1.6-2.1-.4-3.2-.9-1.6.1-3.2-.1-4.5-1 0-1.2-2-.8-2.8-1.4-1.1-.3-1.5-1.6-1.6-2.6l-.2-.1Zm0 .1c.3 1 .6 2.6 2 2.7 1 .6 2.5.5 2.7 1.5 1.3.8 2.9 1 4.4 1 1 .2 2-.2 2.8.1.7 1 1 2.4-.5 2.8-.6.3.7 1.7-.6 1.9-1.1.4-2.3.2-3.4 0-1.1.1-2.6-.3-3.5.2-.9 1.3-2.8 1.5-4 .6-.5 1.4-1.4 3.2-.4 4.6 1.1 1.2 2.8 1.8 3.9 3 1.9 2 3.6 4.3 4.4 6.9a14 14 0 0 0-4.6-3c-2.6-1-5.4-.7-8 .1-2.3.6-5 0-6.6-1.8l-1-1.3c0-.2-.7-1.6-.2-2.4.1.7 1 1.4.6.2.4.1.8 1.8 1.7 2-.4-.7-1-2.8-.6-2.9.5 1 1.2 1.9 2 2.6-.7-.9-1.6-3.1-1.3-3.6.3.5 1.7 1.7 1 .5-.3-.6-.3-1.4.3-.6.5.5 2.2 1.2 2.1 1-.7-.5-2.3-1.9-2-2.3.7.3 2.2.5 1-.3-.5-.6-.8-1.8 0-.7.8.7 1.7 1.3 2.6 1.7-.8-.7-2.2-2.4-2.1-3.1.7.3 1.4.3.6-.5-.3-.5-.6-1.6 0-.6.3.5 1.4 1.3.8.2-.3-.8 0-2.5.9-1 .3.3.8 1.8.6.5-.1-.8-.7-2.1.4-1 .4.6 1.2 2.2.7.6-.2-.6-1-2.1-.2-.8.3.5 1.2 2.4.8.8-.6-1.7-2.3-3-2.3-5 0-1.2.5-2.4 1-3.6 1.4-.8.9 2.3 2 2 0 .7.1 1.3.4.4 0-1 1.3 1.3 1-.2-.2-.7 1.4 1.2 1-.1.4.2.9 1 .6 0-.2-1-1-1.6-2-1.2 0-.8.2-1.7 1-1.9Z"/><path style="color:#000;fill:#444;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" d="m16.1 5.9-.6.3c-.3.3-.6.8-.6 1.6v.1l-1.3.2c0-.5-.3-1-.7-1.3h-.7c-.2.1-.4.4-.5.7l-.3 1.1-.2.1c-.3.2-.5.6-.8 1a4 4 0 0 1-1.7 1c-.7.2-1.5.4-2.6.5-1 0-2.4 1-3.6 2.2A8 8 0 0 0 0 18c0 .8 0 2.8.7 4.5a6 6 0 0 0 .3.6c.4.8.9 1.5 1.6 2l.8.5 1 1.4c1.5 1.6 4 2.8 7.6 1.7h.1a11 11 0 0 1 8.2.6 11.6 11.6 0 0 1 2.3 1.5l.6.6.4.4h.2l.2.1a.3.3 0 0 0 .1-.3.5.5 0 0 0 0-.1c0-.2 0-.4-.2-.7a17 17 0 0 0-7-8.4 3 3 0 0 1-1.3-1.3c-.2-.5-.3-1-.2-1.5 0-.5.2-1 .4-1.4 0-.3.2-.6.3-.8.2.1.5.4 1.2.4.9.1 2-.2 3-1.4.7.2 1.4.1 2 0a4 4 0 0 1 1.8.2l1 .2c.5 0 1 0 1.5-.2.4-.2.8-.4 1-.8.2-.3 0-.7-.1-1.1l.7-.4.6-.8c.1-.6 0-1-.1-1.3l-.4-.4c0-.3-.2-.6-.5-.8-.2 0-.6 0-.9.2-1.4-.2-2.9-.1-3.5-.2-.6 0-1-.2-1.5-.4l-.5-.2a16 16 0 0 1-.6-.3l-.1-.5c-.2-.3-.6-.4-1.2-.4-.6-.2-1.3-.6-2-.7h-.2V8h-.2l-.4-.5a2.6 2.6 0 0 1-.2-1.2.5.5 0 0 0-.1-.3l-.2-.1Zm0 .5c0 .6.1 1 .3 1.4l.1.2c-.2-.1-.6-.2-1.2-.1v-.1c0-.6.3-1 .6-1.3h.2zm-3.6.8a.3.3 0 0 1 .1 0c.2.2.5.6.5 1l.2.3v.3a8.5 8.5 0 0 1 .5.7h.2v.5l.3.3a.9.9 0 0 0 .4-.4v-.2c.2 0 .5.2.6.4l.2.6.2-.6V10l-.1-.4c.3 0 .5.2.7.4l.3.3V9.7c.2 0 .3.1.4.3l.4.4V10s0-.9-.5-1.3v-.1.2c.2.2.4.3.8.3l.8.3c.3 0 .6.2 1 .4.6 0 .8.1 1 .2v.2l-.2.2.2.2s1.3.8 3 1c.7 0 2 0 3.5.2h.2c.2-.2.4-.2.5-.2.2 0 .2.2.3.4v.1c.1.2.3.3.3.5.1.1.2.4.1.8l-.4.6-.8.4-.2.2.1.2c.3.4.3.7.2.9-.1.2-.4.4-.8.5a4.4 4.4 0 0 1-1.2.2l-1-.2c-.7-.2-1.3-.2-2-.1h-2l-.2-.1v.1c-1 1.3-1.9 1.4-2.6 1.3-.8 0-1.3-.4-1.3-.4l-.4-.3v.4l-.4 1-.4 1.6c-.1 1 .2 2.4 1.8 3.2a16.6 16.6 0 0 1 6.7 8.1 15 15 0 0 0-.5-.4 12.1 12.1 0 0 0-2.4-1.6c-2-1-4.8-1.7-8.5-.7-3.6 1.1-5.8 0-7.2-1.5l-.5-.7h.1l-.4-.5c-.4-.6-.5-1.2-.4-1.9 0 .2.2.4.3.5l.2.2.4.1-.2-.4V24a4 4 0 0 0 1.4 1.6l.6.3-.4-.6c-.3-.7-.4-1.4-.5-2.1l1.6 2 .3-.2c-.6-1-1-2-1.2-3l.8.7v.1l.3-.3c-.2-.3-.2-.7-.3-1 .8.6 1.7 1 2.5 1.2l.2-.3a7.7 7.7 0 0 1-2.2-2.1c.5.1 1 .3 1.4.2h.7L9 20c-.5-.2-.7-.6-.9-1 .9.7 1.8 1.4 2.7 1.9l.3-.3a9 9 0 0 1-2-2.8l.8.2h.4l-.3-.3-.4-.9.8.8.5.2-.3-.5c-.3-.7-.3-1.3-.1-1.9.3.3.7.7 1 1.5l.3.5.1-.5v-.2l-.2-1.3c.3.2.6.4 1.1 1.4l.4-.1v-.1c0-.3-.2-.5-.3-.7l.4.6v.2a.7.7 0 0 0 .1 0H13.8V16.3v.1c0-.7-.3-1.5-1.4-3a3.9 3.9 0 0 1-.6-1.2c-.2-.4-.4-.8-.4-1.3v-.7c.2-.7.2-1 .9-2.6 0-.3.2-.5.3-.5zm-.4.5zm3 .6h1.3l.1.1a.6.6 0 0 0 0 .2c0 .1 0 .2.2.3l.1.4-.3-.2-.4-.1.2.3v.2c-.3-.2-.5-.4-.9-.5H15l.3.4v.3c-.2-.2-.3-.5-.6-.6h-.3V9h-.2l-.1.1-.3-.6a14.7 14.7 0 0 1 1.3-.2zm1.9 0zm-6 1.3-.1.6V11c0 .6.2 1 .4 1.4.1.4.3.9.6 1.3l.4.5-.3.2.4 1.3c-.3-.3-.6-.9-.9-1v-.2H11l.2.3.2 1.3c-.3-.5-.6-1-1-1.3l-.1-.1-.1.2a3 3 0 0 0-.1 1.8c-.3-.2-.6-.3-1-.9l-.3.2.7 1.5c-.2 0-.5 0-.8-.2l-.4-.2.1.5c.3.8 1 1.5 1.7 2.3l-2.2-1.6-.5-.5.1.6c.1.6.4 1.1.8 1.5l-1.1-.1-.5-.3.2.5c.4.7 1 1.3 1.6 1.9-.6-.3-1.1-.6-1.6-1.2l-.4-.3v.4c0 .4.2.7.3 1l-.8-.7-.4-.6v.7c0 .7.2 1.3.4 2l-.7-1h-.4v.1c0 .9.3 1.7.6 2.5-.3-.3-.7-.8-1-1.7l-.2-.4-.2.3V23.6c-.2-.2-.3-.2-.4-.5l-.2-.7-.2.7c-.2.8 0 1.4.2 2l-.5-.3a4.5 4.5 0 0 1-1.6-2 5.6 5.6 0 0 1-.1-.3v-.1C.5 20.7.4 18.7.4 18c.1-1.5 1-3.1 2.2-4.3 1.2-1.2 2.6-2 3.5-2.1l2.6-.5c1-.4 1.5-.8 1.9-1.2l.3-.3zm16 1.7zm-6.7 5z" transform="translate(1.5)"/></g><path fill="#000" d="M25.8 12.2c.5 0 1.3 0 1.1.7.5-.8-.6-1-1-.7zM14 7.5c-.4 1.1-.4 2.5.3 3.5.3-.5.1-1.5 1-1.4-.7-.6-.5-1.5-1-2.2H14Zm12.9 5.3c0 .4-1 .5-.3.1 0-.7-1.5.1-.7-.5.3-.1 1 0 1 .4zm-.6 2.3c-.3-.4-1.2 0-1.2-.2.7-.3 1.7-.5 2.4 0 .6.5 1.5-1 1.3.2-.5.7-1.6.8-2.2.2a3 3 0 0 1-.3-.2Zm-6.5-3.9c.6-.2-.8 0-1 0l-1.5-.2c.6.2 1 1 1.8.8.4 0 .6-.2.7-.6zM22.7.3c-.5.4-1 1.1-1.1 1.7-.3.5-1 .9-.8 1.5-.6.4-.7 1-.9 1.6-.5.3-.4 1-.5 1.3-.6.2-.6.7-.6 1-.6.4-.7 1.1-.5 1.7.3.9 1.5.2 1.8-.2-.2-.6.7-1 .3-1.6.9-.1 0-1.3.8-1.6.2-.5-.2-1 .4-1.1.3-.5 0-1.1.5-1.4.1-.6.2-1 .5-1.6 0-.4.4-1 .1-1.3Zm-.9 1.4c-.3.5 1 .3.1.5-.4 0-.2-.4 0-.5ZM21 2.9c-.3.6 1.2.5.3.6-.4 0-.5-.3-.3-.6Zm-.7 1.3c-.2.6 1.2.6.3.7-.5 0-.4-.5-.3-.7Zm-.6 1.4c-.2.7 1.5.3.5.7-.5.1-.8-.3-.5-.7Zm-.6 1.2c0 .6 1.7.5.6.7-.5.2-1-.3-.6-.7zM18.5 8c0 .7 1.8.2 1 .6-.4.1-1.5.2-1-.6Z" style="fill:#444;fill-opacity:1;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"/></g></svg>
\ No newline at end of file