diff --git a/.theme_imgs/TUHH_logo-wortmarke_de_rgb.pdf b/.theme_imgs/TUHH_logo-wortmarke_de_rgb.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e6c81391b41f6a6499b79bab195a652855d623e3
Binary files /dev/null and b/.theme_imgs/TUHH_logo-wortmarke_de_rgb.pdf differ
diff --git a/.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf b/.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf
index 6085be25a3d4db139e96bfc3717947590a740b09..af37fc0d7d625199ad36edfd20fbfc039696adcb 100644
Binary files a/.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf and b/.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf differ
diff --git a/beamerinnerthemetuhh.sty b/beamerinnerthemetuhh.sty
index 3d00e16e1937fb4b7d79badc20ee11a2664d8dc0..c26a42dd3e9978bbbcb082c75e823cf88a1019fb 100644
--- a/beamerinnerthemetuhh.sty
+++ b/beamerinnerthemetuhh.sty
@@ -139,9 +139,8 @@
   \setbeamertemplate{background}{
     \begin{tikzpicture}
       % TUHH Logo
-      \node[outer sep=0, inner sep=0] (tuhh_logo) at (19.07mm+25.875mm, \the\paperheight-109.93mm-18.923mm) {\includegraphics[width=73.75mm]{.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf}};
-      % TUHH Building A
-      \node[outer sep=0, inner sep=0pt] at (178.816mm+72.75mm, \the\paperheight-104.902mm-23.177mm) {\includegraphics[width=148.59mm]{.theme_imgs/TUHH_building-a.pdf}};
+      \node[outer sep=0, inner sep=0, anchor=west] (tuhh_logo) at (21.30mm, \the\paperheight-109.93mm-18.923mm) {\includegraphics[height=32.925mm]{\tuhhwordmark}};      
+      \node[outer sep=0, inner sep=0pt] at (178.816mm+72.75mm, \the\paperheight-104.902mm-23.177mm) {\includegraphics[width=148.59mm]{.theme_imgs/TUHH_building-a.pdf}}; % TUHH Building A
 
       \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
       \begin{beamercolorbox}{tuhh teal}
@@ -190,7 +189,7 @@
       \begin{beamercolorbox}{tuhh teal}
         \node[outer sep=0, inner sep=0, anchor=west] (website) at (21.08mm, \the\paperheight-188.78mm) {\usebeamerfont{tuhh website}tuhh.de};
         \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-        \node[outer sep=0, inner sep=0, anchor=west, text width=8cm] (signature) at (19.08mm, \the\paperheight-117.5mm){\usebeamerfont{signature} Hamburg University of Technology (TUHH)};
+        \node[outer sep=0, inner sep=0, anchor=west, text width=8cm] (signature) at (19.08mm, \the\paperheight-117.5mm){\usebeamerfont{signature} \insertuniversity};
         \node[outer sep=0, inner sep=0, anchor=west, text width=8cm] (signature) at (19.08mm, \the\paperheight-121.5mm){\usebeamerfont{signature} \insertshortauthor};
         \node[outer sep=0, inner sep=0, anchor=west, text width=8cm] (signature) at (19.08mm, \the\paperheight-125.5mm){\usebeamerfont{signature} \insertinstitute};
         \node[outer sep=0, inner sep=0, anchor=west, text width=8cm] (signature) at (19.08mm, \the\paperheight-129.5mm){\usebeamerfont{signature} \insertstreet};
@@ -202,7 +201,7 @@
         \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
         \node[outer sep=0, inner sep=0, anchor=west] (thank you) at (18.08mm, \the\paperheight-10.99mm-44.22mm) {\usebeamerfont{thank you} \insertclosingstatement};
         \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
-        \node[outer sep=0, inner sep=0] (tuhh_logo) at (250.83mm, \the\paperheight-72.48mm) {\includegraphics[width=210.53mm]{.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf}};
+        \node[outer sep=0, inner sep=0, anchor=east] (tuhh_logo) at (\the\paperwidth-5.34mm-9.535mm, \the\paperheight-72.48mm) {\includegraphics[width=136.53mm]{\tuhhwordmark}};
         \useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
 
         \node[rectangle,
diff --git a/beamerthemetuhh.sty b/beamerthemetuhh.sty
index bef0b3c8bcf1f0adb3a24644220c889ddaf8cab7..f48226a73e9323ca6a1d0aebe01be862872b75a8 100644
--- a/beamerthemetuhh.sty
+++ b/beamerthemetuhh.sty
@@ -38,6 +38,9 @@
   \setlist[itemize, 3]{leftmargin=\leftmargini, label=\raisebox{0.375ex}{\footnotesize$\bullet$}, before*=\footnotesize }  
 }
 
+\newcommand{\tuhhwordmark}{.theme_imgs/TUHH_logo-wortmarke_en_rgb.pdf}% Titlepage definition
+\newcommand{\settuhhwordmark}[2][]{\renewcommand{\tuhhwordmark}{#2}}
+
 % A default frame should always use a content_frame background
 \BeforeBeginEnvironment{frame}{%
   \setbeamertemplate{content_frame}{\usebeamertemplate{content_frame_background}}
diff --git a/tuhh_presentation.cls b/tuhh_presentation.cls
index b39c121797f9f7c352adbc97553bfb1db83e9937..62704201b3d60899092e69c798a07c85ed4ba278 100644
--- a/tuhh_presentation.cls
+++ b/tuhh_presentation.cls
@@ -1,9 +1,10 @@
 \ProvidesClass{tuhh_presentation}
 
+% First option pass to base class
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{beamer}}
 \ProcessOptions\relax
-\LoadClass{beamer}
 
+\LoadClass{beamer}
 \usetheme{tuhh}
 \setbeamertemplate{caption}[numbered]
 
@@ -14,6 +15,12 @@
 
 \AtBeginDocument{\usebeamerfont{normal text}}
 
+
+\def\university{\@dblarg\beamer@university}
+\long\def\beamer@university[#1]#2{%
+  \def\insertuniversity{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}#2}%
+}
+
 \def\street{\@dblarg\beamer@street}
 \long\def\beamer@street[#1]#2{%
   \def\insertstreet{\def\inst{\beamer@insttitle}\def\and{\beamer@andtitle}#2}%
@@ -51,7 +58,17 @@
 }
 
 % Defaults
+\university{Hamburg University of Technology (TUHH)}
 \closingstatement{Thank You very much}
 \street{Am Schwarzenberg-Campus 1}
 \city{21073 Hamburg}
-\website{www.tuhh.de}
\ No newline at end of file
+\website{www.tuhh.de}
+
+\DeclareOption{german}{%
+  \closingstatement{Vielen Dank}%
+  \university{Technische Universität Hamburg (TUHH)}%
+  \settuhhwordmark{.theme_imgs/TUHH_logo-wortmarke_de_rgb.pdf}%
+}
+
+% Second option pass to derived class
+\ProcessOptions\relax
\ No newline at end of file