diff --git a/class-formatting.sty b/class-formatting.sty
index 64cf19c..ec4b3c9 100644
--- a/class-formatting.sty
+++ b/class-formatting.sty
@@ -1,3 +1,5 @@
+\RequirePackage{titlesec}
+
 % Default font
 \setmainfont[
 Path = ./fonts/mentor/, % path to the folder containing your OTF files
diff --git a/dnd4e.sty b/dnd4e.sty
index 2374d74..17361bc 100644
--- a/dnd4e.sty
+++ b/dnd4e.sty
@@ -11,11 +11,11 @@
 \RequirePackage{tabularx}
 \RequirePackage{colortbl}
 \RequirePackage{tcolorbox}
-\RequirePackage{titlesec}
 \RequirePackage{pifont}
 \RequirePackage{fontspec}
 \RequirePackage{enumitem}
 \RequirePackage{xspace}
+\RequirePackage{expl3}
 
 
 \tcbuselibrary{skins,breakable}
@@ -46,7 +46,7 @@
 % ======================================================
 
 \newfontfamily\FontMentor[
-Path = ./fonts/mentor/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/mentor/, % path to the folder containing your OTF files
 UprightFont = *-Regular.otf,
 BoldFont = *-Bold.otf,
 ItalicFont = *-Italic.otf,
@@ -54,7 +54,7 @@ BoldItalicFont = *-Bold-Italic.otf
 ]{Mentor-Std}
 
 \newfontfamily\FontMentorSans[
-Path = ./fonts/mentor-sans/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/mentor-sans/, % path to the folder containing your OTF files
 UprightFont = *-Regular.otf,
 BoldFont = *-Bold.otf,
 ItalicFont = *-Italic.otf,
@@ -62,14 +62,14 @@ BoldItalicFont = *-Bold-Italic.otf
 ]{Mentor-Sans-Std}
 
 \newfontfamily\FontMentorSansLight[
-Path = ./fonts/mentor-sans/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/mentor-sans/, % path to the folder containing your OTF files
 UprightFont = *-Light.otf,
 BoldFont = *-Bold.otf,
 ItalicFont = *-Light-Italic.otf
 ]{Mentor-Sans-Std}
 
 \newfontfamily\FontMentorSansBlack[
-Path = ./fonts/mentor-sans/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/mentor-sans/, % path to the folder containing your OTF files
 UprightFont = *-Black.otf,
 BoldFont = *-Black.otf,
 ItalicFont = *-Black-Italic.otf
@@ -77,7 +77,7 @@ ItalicFont = *-Black-Italic.otf
 
 
 \newfontfamily\FontVecna[
-Path = ./fonts/vecna/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/vecna/, % path to the folder containing your OTF files
 UprightFont = *-Regular.otf,
 BoldFont = *-Bold.otf,
 ItalicFont = *-Italic.otf,
@@ -85,12 +85,12 @@ BoldItalicFont = *-Bold-Italic.otf
 ]{Vecna}
 
 \newfontfamily\FontLolth[
-Path = ./fonts/lolth/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/lolth/, % path to the folder containing your OTF files
 UprightFont = *-Regular.otf,
 ]{Lolth}
 
 \newfontfamily\FontIcons[
-Path = ./fonts/icons/, % path to the folder containing your OTF files
+Path = \CurrentFilePath/fonts/icons/, % path to the folder containing your OTF files
 UprightFont = *.ttf,
 ]{icons}
 
@@ -523,11 +523,6 @@ UprightFont = *.ttf,
 % ==================== TABLES ==========================
 % ======================================================
 
-
-\newcommand{\rowstyle}[1]{\gdef\currentrowstyle{#1}%
-	#1\ignorespaces
-}
-
 \newenvironment{dndtable}[2][] % optional options + column spec
 {%
 	\global\let\currentrowstyle\relax