diff --git a/tex/tudabeamer.cls b/tex/tudabeamer.cls
index 25a6aec..dba229f 100644
--- a/tex/tudabeamer.cls
+++ b/tex/tudabeamer.cls
@@ -14,8 +14,8 @@
 \str_new:N \g_ptxcd_department_str
 \keys_define:nn {ptxcd/beamer} {
 	accentcolor .code:n = \PassOptionsToPackage{accentcolor=#1}{tudacolors},
-	colorframetitle .code:n = \PassOptionsToPackage{\l_keys_key_tl=#1}{beamercolorthemeTUDa}
-	\PassOptionsToPackage{\l_keys_key_tl=#1}{beamerouterthemeTUDa},
+	colorframetitle .code:n = \exp_args:Nx \PassOptionsToPackage{\l_keys_key_tl=#1}{beamercolorthemeTUDa}
+	\exp_args:Nx \PassOptionsToPackage{\l_keys_key_tl=#1}{beamerouterthemeTUDa},
 	colorframetitle .default:n = true,
 	logo .code:n = \PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa},
 	pdfa .bool_gset:N = \g_ptxcd_pdfa_bool,
diff --git a/tex/tudaexercise.cls b/tex/tudaexercise.cls
index ed108da..bf91f54 100644
--- a/tex/tudaexercise.cls
+++ b/tex/tudaexercise.cls
@@ -122,9 +122,9 @@
 	titlepage .code:n = {\msg_warning:nnn {tudapub} {titlepage-option-disabled} {#1}},
 	paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{
 		\int_gset_eq:NN \g_ptxcd_paper_int  \l_keys_choice_int
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
-		\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
+		\exp_args:Nx \PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
 	},
 	paper .initial:n = a4,
 	logofile .tl_gset:N = \g_ptxcd_logofile_tl,
diff --git a/tex/tudaposter.cls b/tex/tudaposter.cls
index 789efde..a0ddf1c 100644
--- a/tex/tudaposter.cls
+++ b/tex/tudaposter.cls
@@ -29,7 +29,7 @@
 	footheight .dim_gset:N = \g_ptxcd_footheight_dim,
 	paper .choices:nn = {a0,a1,a2,a3,a4}{
 		\int_gset_eq:NN \g_ptxcd_paper_int  \l_keys_choice_int
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
 		\tl_gset_eq:NN \g_ptxcd_paper_tl \l_keys_choice_tl
 	},
 	fontsize .choice:,
diff --git a/tex/tudapub.cls b/tex/tudapub.cls
index 63d2c99..501b745 100644
--- a/tex/tudapub.cls
+++ b/tex/tudapub.cls
@@ -120,9 +120,9 @@
 	logo .initial:n = {body},
 	paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{
 		\int_gset_eq:NN \g_ptxcd_paper_int  \l_keys_choice_int
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
-		\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{typearea}
+		\exp_args:Nx \PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
 	},
 	paper .initial:n = a4,
 	IMRAD .bool_gset:N = \g_ptxcd_IMRAD_bool,
diff --git a/tex/tudasciposter.cls b/tex/tudasciposter.cls
index 17bff9f..a1ae910 100644
--- a/tex/tudasciposter.cls
+++ b/tex/tudasciposter.cls
@@ -32,8 +32,8 @@
 	unknown .code:n = {\prop_gput:NVn \g_ptxcd_clsopts_prop \l_keys_key_tl {#1}},
 	paper .choices:nn = {a0,a1,a2,a3}{
 		\int_gset_eq:NN \g_ptxcd_paper_int  \l_keys_choice_int
-		\PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
-		\PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
+		\exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules}
+		\exp_args:Nx \PassOptionsToPackage{\l_keys_choice_tl paper}{geometry}
 	},
 	paper .initial:n = a0,
 	fontsize .tl_gset:N = \g_ptxcd_fontsize_tl,