diff --git a/plotting/exercises/Makefile b/plotting/exercises/Makefile
new file mode 100644
index 0000000..8e092f8
--- /dev/null
+++ b/plotting/exercises/Makefile
@@ -0,0 +1,3 @@
+TEXFILES=$(wildcard plotting-?.tex)
+
+include ../../exercises.mk
diff --git a/plotting/exercises/instructions.tex b/plotting/exercises/instructions.tex
index 37f737d..8f5d332 100644
--- a/plotting/exercises/instructions.tex
+++ b/plotting/exercises/instructions.tex
@@ -1,17 +1,11 @@
-\vspace*{-8ex}
-\begin{center}
-\textbf{\Large Introduction to scientific computing}\\[1ex]
-{\large Jan Grewe, Jan Benda}\\[-3ex]
-Neuroethology lab \hfill --- \hfill Institute for Neurobiology \hfill --- \hfill \includegraphics[width=0.28\textwidth]{UT_WBMW_Black_RGB} \\
-\end{center}
+\ifprintanswers%
+\else
 
 The exercises are meant for self-monitoring and revision of the
 lecture. You should try to solve them on your own. In contrast
 to previous exercises, the solutions can not be saved in a single file. Combine the files into a
 single zip archive and submit it via ILIAS. Name the archive according
 to the pattern: ``plotting\_\{surname\}.zip''.
-% \ifprintanswers%
-% \else
 
 % % Die folgenden Aufgaben dienen der Wiederholung, \"Ubung und
 % % Selbstkontrolle und sollten eigenst\"andig bearbeitet und gel\"ost
@@ -43,4 +37,4 @@ to the pattern: ``plotting\_\{surname\}.zip''.
 %   Antworten!
 % \end{itemize}
 
-% \fi
+\fi
diff --git a/plotting/exercises/exercises.tex b/plotting/exercises/plotting-1.tex
similarity index 54%
rename from plotting/exercises/exercises.tex
rename to plotting/exercises/plotting-1.tex
index f66c61c..48c0fd6 100644
--- a/plotting/exercises/exercises.tex
+++ b/plotting/exercises/plotting-1.tex
@@ -1,88 +1,18 @@
 \documentclass[12pt,a4paper,pdftex]{exam}
 
-\usepackage[german]{babel}
-\usepackage{pslatex}
-\usepackage[mediumspace,mediumqspace]{SIunits}      % \ohm, \micro
-\usepackage{xcolor}
-\usepackage{graphicx}
-\usepackage[breaklinks=true,bookmarks=true,bookmarksopen=true,pdfpagemode=UseNone,pdfstartview=FitH,colorlinks=true,citecolor=blue]{hyperref}
+\newcommand{\exercisetopic}{Plotting}
+\newcommand{\exercisenum}{X}
+\newcommand{\exercisedate}{December 14th, 2020}
 
-%%%%% layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[left=20mm,right=20mm,top=25mm,bottom=25mm]{geometry}
-\pagestyle{headandfoot}
-\ifprintanswers
-\newcommand{\stitle}{: Solutions}
-\else
-\newcommand{\stitle}{}
-\fi
-\header{{\bfseries\large Exercise 7\stitle}}{{\bfseries\large Plotting}}{{\bfseries\large November 20, 2019}}
-\firstpagefooter{Dr. Jan Grewe}{Phone: 29 74588}{Email:
-jan.grewe@uni-tuebingen.de}
-\runningfooter{}{\thepage}{}
+\input{../../exercisesheader}
 
-\setlength{\baselineskip}{15pt}
-\setlength{\parindent}{0.0cm}
-\setlength{\parskip}{0.3cm}
-\renewcommand{\baselinestretch}{1.15}
+\firstpagefooter{Prof. Dr. Jan Benda}{}{jan.benda@uni-tuebingen.de}
 
-%%%%% listings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{listings}
-\lstset{
-  language=Matlab,
-  basicstyle=\ttfamily\footnotesize,
-  numbers=left,
-  numberstyle=\tiny,
-  title=\lstname,
-  showstringspaces=false,
-  commentstyle=\itshape\color{darkgray},
-  breaklines=true,
-  breakautoindent=true,
-  columns=flexible,
-  frame=single,
-  xleftmargin=1em,
-  xrightmargin=1em,
-  aboveskip=10pt
-}
-
-%%%%% math stuff: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{amsmath}
-\usepackage{amssymb}
-\usepackage{bm} 
-\usepackage{dsfont}
-\newcommand{\naZ}{\mathds{N}}
-\newcommand{\gaZ}{\mathds{Z}}
-\newcommand{\raZ}{\mathds{Q}}
-\newcommand{\reZ}{\mathds{R}}
-\newcommand{\reZp}{\mathds{R^+}}
-\newcommand{\reZpN}{\mathds{R^+_0}}
-\newcommand{\koZ}{\mathds{C}}
-
-%%%%% page breaks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\continue}{\ifprintanswers%
-\else
-\vfill\hspace*{\fill}$\rightarrow$\newpage%
-\fi}
-\newcommand{\continuepage}{\ifprintanswers%
-\newpage
-\else
-\vfill\hspace*{\fill}$\rightarrow$\newpage%
-\fi}
-\newcommand{\newsolutionpage}{\ifprintanswers%
-\newpage%
-\else
-\fi}
-
-%%%%% new commands %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\qt}[1]{\textbf{#1}\\}
-\newcommand{\pref}[1]{(\ref{#1})}
-\newcommand{\extra}{--- Zusatzaufgabe ---\ \mbox{}}
-\newcommand{\code}[1]{\texttt{#1}}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}
 
+\input{../../exercisestitle}
+
 \input{instructions}
 
 \begin{questions}