diff --git a/.gitignore b/.gitignore
index da808e597dd64b62ecf992b23e8b05774f22a5bf..b5ffd682ab7847bb6cdd61f7d3a917bb8561ea93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 .DS_Store
 auto
 *.toc
diff --git a/faubrief/faubrief.cls b/faubrief/faubrief.cls
index e72707058db03d6d396ea9e0e9427637d6976879..7baf9695372e7b8b68d5783219511aa59368f705 100644
--- a/faubrief/faubrief.cls
+++ b/faubrief/faubrief.cls
@@ -1,18 +1,34 @@
-\LoadClass[version=first]{scrlttr2}
+% this class file is derived from the official FAU letter template at
+% https://www.intern.fau.de/kommunikation-marketing-und-corporate-identity/vorlagen/briefvorlagen/
+
+% instead of directly taking scrlttr2.cls, we use scrartcl.cls, since that gives us
+% sections. We just have to load scrletter.sty later. 
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{faubrief}
+\LoadClass[%
+  version=first % Stabilitaet bei Aenderungen von 'scrlttr2'
+]{scrartcl}
 
 %%%%%%%%%%%%%%%%%%%%%% Pakete %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{scrletter} % for the letter functionality
 \RequirePackage[T1]{fontenc} % Umbrueche bei deutschen Umlauten, Schriftsatzerweiterung
 \RequirePackage[utf8]{inputenc} % Direkte Eingabe deutscher Umlaute
 \RequirePackage{graphicx}
+\RequirePackage{paralist}
+\RequirePackage{xspace}
+\RequirePackage{url}
+\RequirePackage{eurosym}\def\texteuro{\euro\xspace}
+\RequirePackage[ngerman, num]{isodate} % Datum im Format tt.mm.jjjj
+\monthyearsepgerman{\,}{\,} % kein Leerzeichen zwischen Monat und Jahr
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-
 %%%%%%%%%%%%%%%%%%%%%% Fakultaet %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % An dieser Stelle werden fakultaetsspezifische Einstellungen
 % getroffen.
+\newcommand{\coloredlogo}{true}
 %
 % Welcher Fakultaet gehoere ich an?
-\newcommand*{\fromdepartment}{tech}%\newcommand*{\fromdepartment}{template}
+\newcommand*{\fromdepartment}{tech}
 %
 % Moegliche Werte sind:
 %   TAG            FAKULTAET
@@ -23,15 +39,11 @@
 % philtheo   Philosophische Fakultaet und Fachbereich Theologie
 % recht      Fachbereich Rechtswissenschaft
 % rechtwirt  Rechts- und Wirtschaftswissenschaftliche Fakultaet
+% sobe       School of Business, Economics and Society
 % tech       Technische Fakultaet
-% wirtschaft Fachbereich Wirtschaftswissenschaften
+% wiso       Fachbereich Wirtschafts- und Sozialwissenschaften
 % template	 Template Logo eines abstrakten Fachbereichs zu Testzwecken
 % ------------------------------------------------------------
-%
-% Wird der Brief farbig oder schwarz-weiss gedruckt?
-% coloredlogo = true => Farbige Logos
-% coloredlogo = false => Schwarz-weiss Logos
-\newcommand{\coloredlogo}{true}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
@@ -39,6 +51,15 @@
 \LoadLetterOption{faudesign} % Laden des FAU-Stylefiles
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%%%%%%%%%%%%%%%%%%%%% Absender %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Ruecksendeadresse des Absenders
+\setkomavar{backaddress}{Universit\"at Erlangen-N\"urnberg $\cdot$ Postfach 3520 $\cdot$ 91023 Erlangen}
+
+%%%%%%%%%%%%%%%%%%%%%% Datum %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Datum, 'faudate' ersetzt 'date'
+% \today generiert das aktuelle Datum
+\setkomavar{faudate}{\today}
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Benoetige ich ein Lehrstuhl-Logo?
@@ -52,48 +73,43 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+% Für den Briefinhalt müssen noch verschiedene Optionen gesetzt werden, typischerweise durch
+% \LoadLetterOption{<name>} % lädt <absender>.lco (Absender)
+% \LoadLetterOption{<orga>}  % lädt <orga>.lco (Organisationseinheit. )
 
-% Hier folgt der eigentliche Briefinhalt
-
-%%%%%%%%%%%%%%%%%%%%%% Absender %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Ruecksendeadresse des Absenders
-\setkomavar{backaddress}{Michael Kohlhase, Informatik, FAU Erlangen-N\"urnberg Postfach 3520, 91023 Erlangen}
+% Die folgenden geben die Leerstellen
 % Funktion des Absenders (% Wenn kein Lehrstuhl angegeben wird)
-\setkomavar{fromfunction}{Department Informatik}
+\setkomavar{fromfunction}{Professur für XXX}
 % Lehrstuhl des Absenders
-\setkomavar{fromdepartment}{Professur f\"ur Wissensrepr\"asentation und -verabeitung}
+\setkomavar{fromdepartment}{Department XXX}
 % Name des Absenders
-\setkomavar{fromname}{Prof. Dr. Michael Kohlhase}
+\setkomavar{fromname}{Prof. Dr. XXX}
 % Signatur des Absenders, falls abweichend von Name des Absenders
-\setkomavar{signature}{Michael Kohlhase} 
+\setkomavar{signature}{XXX} 
 % Strasse des Absenders
 \setkomavar{fromstreet}{Martensstr. 3}
 % Stadt des Absenders
 \setkomavar{fromcity}{91054 Erlangen} 
 % Telefonnummer des Absenders
-\setkomavar{fromphone}{Telefon +49 9131-85-64052} 
+\setkomavar{fromphone}{Telefon +49 XXX} 
 % Faksimile des Absenders
-\setkomavar{fromfax}{Fax +49 9131-85-64055} 
+\setkomavar{fromfax}{Fax +49 XXX} 
 % Email des Absenders
-\setkomavar{fromemail}{michael.kohlhase@fau.de}
+\setkomavar{fromemail}{XXX.XXX@fau.de}
 % Internetpraesenz des Absenders 
-\setkomavar{fromurl}{http://kwarc.info/kohlhase}
+\setkomavar{fromurl}{https://XXX}
+% Aktenzeichen des Empfaengers
+\setkomavar{yourref}{Ihr Zeichen }
+% Bezugnehmend auf Nachricht des Empfaengers
+\setkomavar{yourmessage}{Ihre Nachricht vom }
+% Aktenzeichen des Absenders
+\setkomavar{myref}{Unser Zeichen }
 % Ort des Absenders
 \setkomavar{place}{Erlangen}
-% Datum, 'faudate' ersetzt 'date'
-\setkomavar{faudate}{\today}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%% Brieffuss %%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Optionaler Text im Fuss des Briefes
-%\setkomavar{footopt}{Arum nimus corem Maretisila pore con Sit atiorep Eliaepudit Ipsum nonsite Estis uttare lie 000 34 56 78 atiorepioles Molor nonsed eru Eliaepudiut corem Dolor re pore con nectotam maretisilan}
-%
-% Moeglichkeit Partnerlogo einzufuegen, MIT Fusstext
-% Maximale Groesse des Partnerlogos: Breite: 112mm, Hoehe: 14.35mm
-% Moeglichkeit Partnerlogo einzufuegen, OHNE Fusstext
-% Maximale Groesse des Partnerlogos: Breite: 165mm, Hoehe: 14.35mm
-%\setkomavar{partnerlogo}{\includegraphics[scale=XX]{Pfad/zum/Logo}}
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%% Signature %%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\signaturepicture#1{\def\jcl@sigpic{#1}}
+\def\sign#1{\strut\closing{#1\strut\\[.2cm]\includegraphics[width=6cm]{\jcl@sigpic}\strut\\[-1.2cm]}}
+
 
 
diff --git a/faubrief/faudesign.lco b/faubrief/faudesign.lco
index caa0e2f52cff776bbe6eddf9bf3f18e7b7db1102..8faaab63d15b407c5b60aa288a85a688efbc7cdb 100644
--- a/faubrief/faudesign.lco
+++ b/faubrief/faudesign.lco
@@ -12,7 +12,8 @@ pgf,       % Paket um Bilder einzubinden
 eso-pic,   % Hintergrundgraphiken setzen
 ifthen,    % logische Operatoren
 ragged2e,  % Umbrueche bei linksbuendigem Satz
-helvet     % Helvetica als Hausschrift
+helvet,    % Helvetica als Hausschrift,
+lastpage   % Seitennummerierung
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -43,7 +44,7 @@ helvet     % Helvetica als Hausschrift
   \begin{minipage}[t]{84.5mm}
     \fontsize{10}{13}\selectfont % Schriftgroesse und Zeilenabstand in Empfaengerfeld
     % KEIN '\\', vermutl. Neudefinition!
-    \vspace*{-2\baselineskip}
+    %\vspace*{-2\baselineskip}
     \Ifkomavarempty{todepartment}{}{\usekomavar{todepartment}\newline}
     \Ifkomavarempty{tofullname}{}{\usekomavar{tofullname}\newline}
     \Ifkomavarempty{tobureau}{}{\usekomavar{tobureau}\newline}
@@ -69,56 +70,37 @@ helvet     % Helvetica als Hausschrift
 \newkomavar{departmentlogofoot}
 
 % Standardeinstellungen loeschen
-\setkomavar{firsthead}{}
-\setkomavar{nexthead}{}
-
-% FAU-Logo, evtl. mit Fakultaetszusatz:
-%  \put             height    zus. Zeilen    Kandidaten
-% ------------------------------------------------------------------
-% (110.50,272.00)  15.00mm         0        std. FAU-Logo
-% (110.50,266.25)  20.75mm         1        med, tech
-% (110.50,263.00)  24.00mm         2        nat, philtheo, recht, 
-%                                           rechtwirt, wirtschaft
-\ifthenelse{ % if zwei Zeilen
-  \equal{\fromdepartment}{nat}\OR
-  \equal{\fromdepartment}{philtheo}\OR
-  \equal{\fromdepartment}{recht}\OR
-  \equal{\fromdepartment}{rechtwirt}\OR
-  \equal{\fromdepartment}{wirtschaft}\OR
-  \equal{\fromdepartment}{template}
+\setkomavar{firsthead}{
 }
-{ % then zwei Zeilen
-  \def\TA@yput{263.00}
-  \def\TA@yheight{24.00mm}
-  \def\TA@logopath{fau-logo-\fromdepartment}
+
+\setkomavar{nexthead}{
 }
-{ % else zwei Zeilen
-  \ifthenelse{ % if eine Zeile
-    \equal{\fromdepartment}{med}\OR
-    \equal{\fromdepartment}{tech}
-  }
-  { % then eine Zeile
-    \def\TA@yput{266.25}
-    \def\TA@yheight{20.75mm}
-    \def\TA@logopath{fau-logo-\fromdepartment}
-  }
-  { % else Standardlogo
-    \def\TA@yput{272.00}
-    \def\TA@yheight{15.00mm} 
-    \def\TA@logopath{fau-logo}
-  }
+
+\ifthenelse{
+    \equal{\fromdepartment}{fau}
+}
+{
+    \def\TA@logopath{art/fau-text-logo}
+}
+{
+    \def\TA@logopath{art/fau-text-logo_\fromdepartment}
 }
+
+%\def\TA@yput{263.00}
+%\def\TA@yheight{24.00mm}
+
 \ifthenelse{\equal{\coloredlogo}{true}} % if farbiges Logo/Siegel
   {\def\TA@bw{}}    % then keine Endung
   {\def\TA@bw{-sw}} % else Endung anhaengen
 
 
-\pgfdeclareimage[height=\TA@yheight]{faulogo}{\TA@logopath\TA@bw} 
-\pgfdeclareimage[width=91.5mm,height=91.5mm]{siegel}{siegel\TA@bw}
+\pgfdeclareimage[height=24mm]{faulogo}{art/fau-logo} 
+\pgfdeclareimage[height=20mm]{fautextlogo}{\TA@logopath\TA@bw} 
+%\pgfdeclareimage[width=91.5mm,height=91.5mm]{siegel}{art/siegel\TA@bw}
 \AddToShipoutPicture{%
   \setlength{\unitlength}{1mm}%
-  \put(110.50,\TA@yput){\pgfuseimage{faulogo}} % FAU Logo, evtl. mit Fakulaet
-  \put(127.25,  33.1){\pgfuseimage{siegel}}   % FAU Siegel
+  \put(145.0,260.00){\pgfuseimage{faulogo}} % FAU Logo, evtl. mit Fakulaet
+  \put(22.0,263.00){\pgfuseimage{fautextlogo}}
 }
 
 
@@ -168,9 +150,9 @@ helvet     % Helvetica als Hausschrift
 % Definition des Absenderfeldes, falls Variablen leer wird zusammengerueckt
 \setkomavar{location}{%
 \fontsize{8}{10.4}\selectfont% \newline macht Probleme bei Flattersatz, daher \\
-\Ifkomavarempty{fromfunction}{}{\textbf{\fontsize{10}{10.4}\selectfont\usekomavar{fromfunction}}\\[\baselineskip]}%
+\Ifkomavarempty{fromfunction}{}{\textbf{\fontsize{8}{10.4}\selectfont\usekomavar{fromfunction}}\\[\baselineskip]}%
 \Ifkomavarempty{fromdepartment}{}{\begin{minipage}{51.3mm}\textbf{\usekomavar{fromdepartment}}\end{minipage}\\[\baselineskip]}%
-\Ifkomavarempty{fromname}{}{\usekomavar{fromname}\\}%
+\Ifkomavarempty{fromname}{}{\usekomavar{fromname}\\[\baselineskip]}%
 \Ifkomavarempty{fromstreet}{}{\usekomavar{fromstreet}, }%
 \Ifkomavarempty{fromcity}{}{\usekomavar{fromcity}\\}%
 \Ifkomavarempty{fromphone}{}{\usekomavar{fromphone}\\}%
@@ -231,13 +213,13 @@ helvet     % Helvetica als Hausschrift
 \setkomavar{placeseparator}{, den}
 
 % Grussformel und Signatur
+\def\TA@closing{}                                                 % Abstand zwischen Brieftext
+  \let\TA@closing\closing                                         %   und Grussfloskel setzen,
+  \renewcommand*{\closing}{\vspace{2\baselineskip}\\\TA@closing}  %   '\closing' substituieren
 \renewcommand*{\raggedsignature}{\raggedright}                    % Ausrichtung am linken Rand
-\@setplength{sigbeforevskip}{1.8cm}                      % Abstand von drei Zeilen zwischen Gruss und Signatur
+\@setplength{sigbeforevskip}{3\baselineskip}                      % Abstand von drei Zeilen zwischen Gruss und Signatur
 \@setplength{sigindent}{0mm}                                      % Kein Einzug des Grusses und der Signatur
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\signaturepicture#1{\def\jcl@sigpic{#1}}
-\def\sign#1{\@setplength{sigbeforevskip}{0cm}%
-\closing{#1\\\vspace*{.5cm}\includegraphics[width=6cm]{\jcl@sigpic}}\strut\vspace*{-2.2cm}}
 
 
 %%%%%%%%%%%%%%%%%%%%%% Brieffuss %%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -252,7 +234,7 @@ helvet     % Helvetica als Hausschrift
 \setlength{\unitlength}{1mm}
 \Ifkomavarempty{footopt}{
   \begin{picture}(0,0)
-  \put(2,-6.5){
+  \put(0.5,-2){
   \begin{minipage}[t][14.35mm][t]{165mm}
   \Ifkomavarempty{partnerlogo}{}{\usekomavar{partnerlogo}}
   \end{minipage}
@@ -261,7 +243,7 @@ helvet     % Helvetica als Hausschrift
   }
   {
   \begin{picture}(0,0)
-  \put(2,-6.5){
+  \put(0.5,-2){
   \begin{minipage}[t][14.35mm][t]{112mm}
   \Ifkomavarempty{partnerlogo}{}{\usekomavar{partnerlogo}}
   \end{minipage}
@@ -278,8 +260,9 @@ helvet     % Helvetica als Hausschrift
 
 % Definition des Brieffusses auf den Folgeseiten
 \setkomavar{nextfoot}{
+\setlength{\unitlength}{1mm}
   \begin{picture}(0,0)
-  \put(-5,26){
+  \put(-3,-2){
   \begin{minipage}[t][14.35mm][t]{112mm}
   \Ifkomavarempty{partnerlogo}{}{\usekomavar{partnerlogo}}
   \end{minipage}
@@ -288,9 +271,9 @@ helvet     % Helvetica als Hausschrift
   \fontsize{8}{8}\selectfont
   \setlength{\unitlength}{1mm}
   \begin{picture}(0,0)
-    \put(121.7,0){%
+    \put(138.7,0){%
     \begin{minipage}{41.3mm}
-    \textup{\pagemark}
+    \textup{\pagemark\ von \pageref{LastPage}}
     \end{minipage}
     }
 
diff --git a/faubrief/miko.lco b/faubrief/miko.lco
index a7b05ec59c2c8658eea12015f59ca4c05668674d..26906cf8009ef0f136c9ad7cfb5565268d3f04bc 100644
--- a/faubrief/miko.lco
+++ b/faubrief/miko.lco
@@ -1,12 +1,23 @@
-% Name des Absenders
+%\ProvidesFile{wuv.lco}[2022/05/5 fauletter.cls options Prof. Michael Kohlhase]
+
+%%%%%%%%%%%%%%%%%%%%%% Absender %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \setkomavar{fromname}{Prof. Dr. Michael Kohlhase}
+% Signatur des Absenders, falls abweichend von Name des Absenders
+\setkomavar{signature}{Michael Kohlhase} 
+% Strasse des Absenders
+\setkomavar{fromstreet}{Martexnsstr. 3}
+% Stadt des Absenders
+\setkomavar{fromcity}{91054 Erlangen} 
 % Telefonnummer des Absenders
 \setkomavar{fromphone}{Telefon +49 9131-85-64052} 
 % Faksimile des Absenders
 \setkomavar{fromfax}{Fax +49 9131-85-64055} 
 % Email des Absenders
 \setkomavar{fromemail}{michael.kohlhase@fau.de}
+% Internetpraesenz des Absenders 
+\setkomavar{fromurl}{https://kwarc.info/kohlhase}
 % Ort des Absenders
 \setkomavar{place}{Erlangen}
-\signaturepicture{mikosig} % only MiKo has access to this on the TeX Path 
 
+% sets my signature picture
+\signaturepicture{mikosig}
diff --git a/faubrief/template.tex b/faubrief/template.tex
index e4c1d6a658482b6f53da2ed50b6303e07e995368..c120edc887f2ca5f523bb4b8aa873130da99dbb3 100644
--- a/faubrief/template.tex
+++ b/faubrief/template.tex
@@ -1,8 +1,12 @@
-\documentclass[12pt]{wrvbrief}
-\usepackage{ngerman}
-
+\documentclass[12pt]{faubrief}
 \LoadLetterOption{miko}
+\LoadLetterOption{wuv}
+ \usepackage[ngerman]{babel}
 \setkomavar{subject}{Letter of Intent}
+%\place{Bialystok}
+%\signature{Andrea \& Michael Kohlhase}
+%\signaturepicture{?????}
+
 
 \begin{document}
 \begin{letter}{TO}
@@ -11,7 +15,7 @@
 
 blabla
  \closing{Sincerely,}
-%  \sign{Beste Gr"u"se,} set the signaturepicture variable above
+%  \sign{Beste Gr"u"se,}% set the signaturepicture variable above or use <name>.clo
 \end{letter}
 
 \end{document}
@@ -22,6 +26,3 @@ blabla
 %%% fill-column: 5000
 %%% TeX-master: t
 %%% End:
-
-
-%  LocalWords:  signaturepicture