diff --git a/src/colophon.tex b/src/colophon.tex
index b734921..b295568 100644
--- a/src/colophon.tex
+++ b/src/colophon.tex
@@ -8,5 +8,9 @@ created by Raph Levien and supplemented by Dimosthenis Kaponis and Takashi Tanig
 typeface is Alegreya, designed by Juan Pablo del Peral.
 
 Original book layout design and typography are done by Andres Raba. Syntax highlighting is using ``GitHub'' style for Pygments by
-\urlref{https://github.com/hugomaiavieira/pygments-style-github}{Hugo Maia Vieira}. Scala code translation was done by 
-\urlref{https://github.com/typelevel/CT_from_Programmers.scala}{Typelevel} contributors.
\ No newline at end of file
+\urlref{https://github.com/hugomaiavieira/pygments-style-github}{Hugo Maia Vieira}.
+\ifdefined\OPTCustomLanguage{%
+Scala code translation was done by 
+\urlref{https://github.com/typelevel/CT_from_Programmers.scala}{Typelevel} contributors.
+}
+\fi
\ No newline at end of file
diff --git a/src/half-title.tex b/src/half-title.tex
index 7d91765..021aa72 100644
--- a/src/half-title.tex
+++ b/src/half-title.tex
@@ -7,12 +7,15 @@
 
 \begin{raggedleft}
 \fontsize{24pt}{24pt}\selectfont
-  \textbf{Category Theory \\ for Programmers}\\
-\vspace*{1cm}
-\small\selectfont{
-\textbf{Scala Edition}\\
-\textit{Contains code snippets in Haskell and Scala}\\
+\textbf{Category Theory \\ for Programmers}\\
+\ifdefined\OPTCustomLanguage{%
+  \vspace*{1cm}
+  \small\selectfont{
+    \textbf{\titlecap{\OPTCustomLanguage} Edition}\\
+    \textit{Contains code snippets in Haskell and \titlecap{\OPTCustomLanguage}}\\
+  }
 }
+\fi
 \vspace*{1cm}
 \fontsize{16pt}{18pt}\selectfont \textit{By } \textbf{Bartosz Milewski}\\
 \vspace{1cm}
diff --git a/src/opt-print-ustrade.tex b/src/opt-print-ustrade.tex
index 57e0fdb..7d6ef10 100644
--- a/src/opt-print-ustrade.tex
+++ b/src/opt-print-ustrade.tex
@@ -3,8 +3,6 @@
 \def\OPTmodes{twoside,final,openright,10pt}
 
 % PAGE FORMAT
-%
-% These settings are for letter format
 \def\OTPpapersize{6.125in,9.25in}    % Page size
 \def\OPTtopmargin{0.75in}     % Margin at the top of the page
 \def\OPTbottommargin{0.75in}  % Margin at the bottom of the page
diff --git a/src/preamble.tex b/src/preamble.tex
index 68070db..d5f3875 100644
--- a/src/preamble.tex
+++ b/src/preamble.tex
@@ -53,6 +53,7 @@
 \usepackage{caption, wrapfig, framed, subfigure}
 \usepackage[export]{adjustbox}
 \captionsetup{labelformat=empty,font=scriptsize}
+\usepackage{titlecaps}
 
 \usepackage[usenames,dvipsnames,x11names]{xcolor}
 \usepackage{longtable}