diff --git a/PyTeX b/PyTeX
index c8deda5..75a2b13 160000
--- a/PyTeX
+++ b/PyTeX
@@ -1 +1 @@
-Subproject commit c8deda5af851b3072a9e235fc5fe317e70cf50e3
+Subproject commit 75a2b137ec3acdd611593b82802fcb14c73e3090
diff --git a/src/math/math.pysty b/src/math/math.pysty
index e6d0f58..cb28eaa 100644
--- a/src/math/math.pysty
+++ b/src/math/math.pysty
@@ -11,7 +11,7 @@ __LANGUAGE_OPTIONS_X__
 __END_OPTIONS_X__
 
 %%%% Import the other custom math packages
-\RequirePackage{mkessler-mathfont} % Load this first to ensure untouched fonts
+\RequirePackage{__AUTHOR_ACRONYM__-mathfont} % Load this first to ensure untouched fonts
 
 \RequirePackage{amsmath}
 \RequirePackage{mathtools}
@@ -29,11 +29,12 @@ __END_OPTIONS_X__
 
 
 %%% Importing other custom packages
-\RequirePackage{mkessler-faktor}
-\RequirePackage{mkessler-mathsymb}
-\RequirePackage[basic]{mkessler-mathalias}
-% mkessler-mathfont has already been imported
-\RequirePackage[__IF__(english) english\else german\fi]{mkessler-mathop}
-\RequirePackage{mkessler-mathfig}
-\RequirePackage{mkessler-unicodechar}
-\RequirePackage{mkessler-mathfixes} % Load this last since it renews behaviour
+\RequirePackage{__AUTHOR_ACRONYM__-faktor}
+\RequirePackage{__AUTHOR_ACRONYM__-mathsymb}
+\RequirePackage[basic]{__AUTHOR_ACRONYM__-mathalias}
+% __AUTHOR_ACRONYM__-mathfont has already been imported
+\RequirePackage[__IF__(english) english\else german\fi]{__AUTHOR_ACRONYM__-mathop}
+\RequirePackage{__AUTHOR_ACRONYM__-categories}
+\RequirePackage{__AUTHOR_ACRONYM__-mathfig}
+\RequirePackage{__AUTHOR_ACRONYM__-unicodechar}
+\RequirePackage{__AUTHOR_ACRONYM__-mathfixes} % Load this last since it renews behaviour
diff --git a/src/math/mathop.pysty b/src/math/mathop.pysty
index 06c0b12..f15d21a 100644
--- a/src/math/mathop.pysty
+++ b/src/math/mathop.pysty
@@ -25,13 +25,6 @@ __END_OPTIONS_X__
 %Easily declare new distributions
 \newcommand\DeclareDistribution[1]{\expandafter\def\csname #1\endcsname{__PACKAGE_MACRO__(distribution){#1}}}
 
-%%%For categories
-%Introduce synonym for \operatorname
-\newcommand__PACKAGE_MACRO__(category)[1]{\operatorname{\textbf{#1}}}
-%Easily declare new categories
-\newcommand\DeclareCategory[1]{\expandafter\def\csname #1\endcsname{__PACKAGE_MACRO__(category){#1}}}
-
-
 %%%%%%%%%%% Operators
 %Basic commands
 \DeclareSimpleMathOperator{id}
@@ -136,26 +129,6 @@ __END_OPTIONS_X__
 \DeclareSimpleMathOperator{End}
 \DeclareSimpleMathOperator{colim}
 
-%Categories
-\DeclareCategory{Top}
-\DeclareCategory{hTop}
-\DeclareCategory{Set}
-\DeclareCategory{CHaus}
-\DeclareCategory{Grp}
-\DeclareCategory{Ab}
-\DeclareCategory{CRing}
-\DeclareCategory{Ring}
-\DeclareCategory{Vect}
-\DeclareCategory{Fin}
-\DeclareCategory{Ab}
-\DeclareCategory{Cat}
-\DeclareCategory{Mod}
-\DeclareCategory{AffVar}
-\DeclareCategory{Alg}
-\DeclareCategory{Field}
-\DeclareCategory{GrAb}
-\DeclareCategory{Sch}
-
 %Set theory
 \DeclareSimpleMathOperator{card}
 \DeclareSimpleMathOperator{Cd}