diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el
index 84f14680..919dba67 100644
--- a/bundle/bundle--org.el
+++ b/bundle/bundle--org.el
@@ -170,26 +170,7 @@
                '("koma-general"
                  "\\documentclass[a4paper,10pt,captions=tableheading,twoside=false]{scrartcl}
 \\linespread{1.25}
-\\setkomafont{section}{\\Large\\bfseries\\sffamily}
-\\setkomafont{subsection}{\\large\\bfseries\\sffamily}
-\\setkomafont{subsubsection}{\\normalsize\\bfseries\\sffamily}
-\\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.5\\baselineskip]{section}
-\\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.25\\baselineskip]{subsection}
-\\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.1\\baselineskip]{subsubsection}
-\\usepackage{fontspec}
-\\defaultfontfeatures{Ligatures=TeX, RawFeature={+zero, +liga}}
-\\setmainfont{Noto Serif Regular}[BoldFont={Noto Serif Bold},ItalicFont={Noto Serif Italic}]
-\\setsansfont{Noto Sans Regular}[BoldFont={Noto Sans Bold},ItalicFont={Noto Sans Italic}]
-\\setmonofont{Noto Sans Mono}[BoldFont={Noto Sans Mono Bold},Scale=0.8]
-\\usepackage{geometry}
-\\geometry{a4paper,left=2cm,right=2cm,top=1.6cm,bottom=1.6cm}
-\\usepackage{scrlayer-scrpage}
-\\pagestyle{scrheadings}
-\\clearpairofpagestyles
-\\automark{section}
-\\ihead{\\headmark}  % Inner header
-\\ohead{\\thepage}   % Outer header
-"
+\\usepackage{komageneral}"
                  ("\\section{%s}" . "\\section*{%s}")
                  ("\\subsection{%s}" . "\\subsection*{%s}")
                  ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
diff --git a/texmf/tex/latex/mycustomstyles/auto/komageneral.el b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
new file mode 100644
index 00000000..6a1d0aa9
--- /dev/null
+++ b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
@@ -0,0 +1,11 @@
+(TeX-add-style-hook
+ "komageneral"
+ (lambda ()
+   (setq TeX-command-extra-options
+         "-shell-escape")
+   (TeX-run-style-hooks
+    "fontspec"
+    "geometry"
+    "scrlayer-scrpage"))
+ :latex)
+
diff --git a/texmf/tex/latex/mycustomstyles/komageneral.sty b/texmf/tex/latex/mycustomstyles/komageneral.sty
new file mode 100644
index 00000000..4802ff21
--- /dev/null
+++ b/texmf/tex/latex/mycustomstyles/komageneral.sty
@@ -0,0 +1,24 @@
+\ProvidesPackage{komageneral}
+% Font settings
+\usepackage{fontspec}
+\defaultfontfeatures{Ligatures=TeX, RawFeature={+zero, +liga}}
+\setmainfont{Noto Serif Regular}[BoldFont={Noto Serif Bold},ItalicFont={Noto Serif Italic}]
+\setsansfont{Noto Sans Regular}[BoldFont={Noto Sans Bold},ItalicFont={Noto Sans Italic}]
+\setmonofont{Noto Sans Mono}[BoldFont={Noto Sans Mono Bold},Scale=0.8]
+% Geometry settings
+\usepackage{geometry}
+\geometry{a4paper,left=2cm,right=2cm,top=1.6cm,bottom=1.6cm}
+% Header and section settings
+\usepackage{scrlayer-scrpage}
+\pagestyle{scrheadings}
+\clearpairofpagestyles
+\automark{section}
+\ihead{\headmark}
+\ohead{\thepage}
+% Section command redeclarations
+\setkomafont{section}{\Large\bfseries\sffamily}
+\setkomafont{subsection}{\large\bfseries\sffamily}
+\setkomafont{subsubsection}{\normalsize\bfseries\sffamily}
+\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.5\baselineskip]{section}
+\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.25\baselineskip]{subsection}
+\RedeclareSectionCommand[beforeskip=-1sp,afterskip=0.1\baselineskip]{subsubsection}