diff --git a/.gitignore b/.gitignore
index 2cf2361..3fae172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 !/.gitignore
 !/.gitlab-ci.yml
 !/.latexmkrc
+!/.vscode/settings.json
 
 !*/
 !*.tex
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47f1ded..9ec256f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,8 @@ build:
   stage: build
   image: texlive/texlive:latest
   script:
-    - latexmk -pdfxe -jobname="manuale-italiano" main.tex
+    - latexmk -jobname="manuale-italiano"
+    - mv build/manuale-italiano.pdf .
   artifacts:
     paths:
       - ./manuale-italiano.pdf
diff --git a/.latexmkrc b/.latexmkrc
index d78de37..6334f61 100644
--- a/.latexmkrc
+++ b/.latexmkrc
@@ -1 +1,8 @@
-$pdflatex=q/xelatex -synctex=1 %O %S/
\ No newline at end of file
+@default_files = ('main');
+$jobname = 'manuale-italiano';
+$pdf_mode = 5;
+$xelatex = 'xelatex -synctex=1 %O %P';
+$out_dir = 'build';
+$pdf_previewer = 'xdg-open';
+
+$pre_tex_code = '\newcommand*\GermanTranslation{}';
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0435782
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,25 @@
+{
+    "latex-workshop.latex.outDir": "%DIR%/build",
+    "latex-workshop.latex.clean.subfolder.enabled": true,
+    "latex-workshop.latex.recipe.default": "latexmk",
+    "latex-workshop.latex.recipes": [
+        {
+            "name": "latexmk",
+            "tools": [
+                "latexmk_rconly"
+            ]
+        }
+    ],
+    "latex-workshop.latex.tools": [
+        {
+            "name": "latexmk_rconly",
+            "command": "latexmk",
+            "args": [
+                "-interaction=nonstopmode",
+                "-pv",
+                "%DOC%"
+            ],
+            "env": {}
+        },
+    ]
+}
\ No newline at end of file
diff --git a/definitions.tex b/definitions.tex
new file mode 100644
index 0000000..ed04259
--- /dev/null
+++ b/definitions.tex
@@ -0,0 +1,17 @@
+\newcommand\gm{\textit{(m.)} }
+\newcommand\gf{\textit{(f.)} }
+
+\newenvironment{translation}[1]{%
+    \def\switchtolang{#1}
+    % TODO: for now we accept only german, else proper case handling needed:
+    \ifdefined\GermanTranslation
+        \begin{adjustwidth}{.1\textwidth}{}
+        \begin{\switchtolang}
+            \itshape
+}{%
+        \end{\switchtolang}
+        \end{adjustwidth}
+    \else % do not translate
+        % No output
+    \fi
+}
diff --git a/preamble.tex b/preamble.tex
index db807ba..d5db0db 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -1,6 +1,8 @@
 \usepackage[xetex,nomarginpar,margin=2cm,%showframe%
   ]{geometry}
 
+\usepackage{ifthen}
+
 \usepackage{tipa}
 \usepackage{tipx}
 \usepackage{fontspec}
@@ -24,13 +26,25 @@
 \let\endoldlongtable\endlongtable
 \renewenvironment{longtable}{\rowcolors{2}{white}{lightgray}\oldlongtable} {\endoldlongtable}
 
+\usepackage[pdfusetitle]{hyperref}
+\hypersetup{
+    bookmarksnumbered=true,
+    bookmarksopen=true,
+    bookmarksopenlevel=1,
+    colorlinks=true,
+    pdfstartview=Fit,
+    pdfpagemode=UseOutlines,
+    pdfpagelayout=TwoPageRight,
+    linkcolor=blue,
+    urlcolor=blue
+}
+
 % Activate as last:
 \usepackage{polyglossia}
 \setmainlanguage{italian}
 \setotherlanguage{german}
 \setotherlanguage[variant=american]{english}
 
-\newcommand\gm{\textit{(m.)} }
-\newcommand\gf{\textit{(f.)} }
-
 \usepackage{lipsum}
+
+\input{definitions}
\ No newline at end of file
diff --git a/verbi/indicativo/presente.tex b/verbi/indicativo/presente.tex
index 5cfb845..fa474aa 100644
--- a/verbi/indicativo/presente.tex
+++ b/verbi/indicativo/presente.tex
@@ -20,6 +20,10 @@ il suffisso ``-isc-'' prima della desinenza. Per esempio: dorm\textbf{o}
 (dormire) contro pul\textbf{isco} (pulire). Purtroppo non vi è una regola
 fissa.
 
+%\begin{translation}{german}
+%    Translation goes here.
+%\end{translation}
+
 \nopagebreak\medskip
 
 \begin{table}[H]