diff --git a/tex/.envrc b/tex/.envrc
deleted file mode 100644
index 9800a71..0000000
--- a/tex/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use_nix shell.nix
diff --git a/tex/energy_transfer/.envrc b/tex/energy_transfer/.envrc
new file mode 100644
index 0000000..c7a853c
--- /dev/null
+++ b/tex/energy_transfer/.envrc
@@ -0,0 +1,2 @@
+use_flake
+eval "$shellHook"
diff --git a/tex/energy_transfer/Tectonic.toml b/tex/energy_transfer/Tectonic.toml
deleted file mode 100644
index 93d61ab..0000000
--- a/tex/energy_transfer/Tectonic.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[doc]
-name = 'energy_transfer'
-bundle = 'https://data1.fullyjustified.net/tlextras-2021.3r1.tar'
-
-[[output]]
-name = 'default'
-type = 'pdf'
diff --git a/tex/energy_transfer/flake.lock b/tex/energy_transfer/flake.lock
new file mode 100644
index 0000000..294cff3
--- /dev/null
+++ b/tex/energy_transfer/flake.lock
@@ -0,0 +1,42 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1655567057,
+        "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e0a42267f73ea52adc061a64650fddc59906fc99",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/tex/flake.nix b/tex/energy_transfer/flake.nix
similarity index 57%
rename from tex/flake.nix
rename to tex/energy_transfer/flake.nix
index 193ba48..7db0d44 100644
--- a/tex/flake.nix
+++ b/tex/energy_transfer/flake.nix
@@ -2,8 +2,8 @@
   description = "Typesetting for Valentin's Masters Thesis";
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
-    flake-utils.url = github:numtide/flake-utils;
-    utils.inputs.nixpkgs.follows = "nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+    flake-utils.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, flake-utils }:
@@ -11,21 +11,25 @@
     let
       pkgs = nixpkgs.legacyPackages.${system};
       tex = pkgs.texlive.combine {
-          inherit (pkgs.texlive) scheme-minimal latex-bin latexmk;
+          inherit (pkgs.texlive) scheme-medium latexmk koma-script babel-english
+          physics mathtools amsmath fontspec booktabs siunitx caption biblatex float
+          pgfplots microtype fancyvrb csquotes setspace newunicodechar hyperref
+          cleveref multirow bbold unicode-math biblatex-phys xpatch;
       };
     in rec {
       packages = {
         document = pkgs.stdenvNoCC.mkDerivation rec {
-          name = "latex-demo-document";
+          name = "masters-thesis";
           src = self;
-          buildInputs = [ pkgs.coreutils tex ];
+          buildInputs = [ pkgs.coreutils tex pkgs.biber];
           phases = ["unpackPhase" "buildPhase" "installPhase"];
           buildPhase = ''
             export PATH="${pkgs.lib.makeBinPath buildInputs}";
             mkdir -p .cache/texmf-var
             env TEXMFHOME=.cache TEXMFVAR=.cache/texmf-var \
-              latexmk -interaction=nonstopmode -pdf -lualatex \
-              document.tex
+              OSFONTDIR=${pkgs.gyre-fonts}/share/fonts \
+              latexmk -interaction=nonstopmode \
+              ./index.tex
           '';
           installPhase = ''
             mkdir -p $out
diff --git a/tex/hiromacros.sty b/tex/energy_transfer/hiromacros.sty
similarity index 90%
rename from tex/hiromacros.sty
rename to tex/energy_transfer/hiromacros.sty
index 2724def..fd87060 100644
--- a/tex/hiromacros.sty
+++ b/tex/energy_transfer/hiromacros.sty
@@ -84,8 +84,11 @@
 \def\iu{\ensuremath{\mathrm{i}}}
 \def\i{\iu}
 \def\id{\ensuremath{\mathbb{1}}}
+\def\NN{\ensuremath{\mathbb{N}}}
 \def\RR{\ensuremath{\mathbb{R}}}
 \def\CC{\ensuremath{\mathbb{C}}}
+\def\dim{\ensuremath{\mathrm{dim}}}
+\def\hilb{\ensuremath{\mathcal{H}}}
 
 % fixme
 \newcommand{\fixme}[1]{\textbf{\textcolor{red}{FIXME:~#1}}}
@@ -98,3 +101,8 @@
 
 \newcommand{\mat}[1]{\ensuremath{{\underline{\vb{#1}}}}}
 \def\kmat{{\mat{k}}}
+
+
+% Thermo
+\newcommand{\ergo}[1]{\ensuremath{\mathcal{W}\qty[#1]}}
+\newcommand{\qrelent}[2]{\ensuremath{S\qty(#1\,\middle|\middle|\,#2)}}
diff --git a/tex/hirostyle.sty b/tex/energy_transfer/hirostyle.sty
similarity index 84%
rename from tex/hirostyle.sty
rename to tex/energy_transfer/hirostyle.sty
index 5e68f31..18c94f9 100644
--- a/tex/hirostyle.sty
+++ b/tex/energy_transfer/hirostyle.sty
@@ -3,7 +3,6 @@
 \usepackage[T1]{fontenc}
 % load early
 \usepackage[english]{babel}
-%\usepackage{newpxtext,newpxmath}
 \usepackage{physics}
 \usepackage{graphicx, booktabs, float}
 \usepackage[tbtags]{mathtools}
@@ -14,17 +13,18 @@
 \usepackage[list=true, font=small,
 labelformat=brace, position=top]{subcaption}
 \usepackage{tikz}
-\usepackage{tikz-feynman}
-\usepackage{wrapfig}
-\usepackage{slashed}
 \usepackage{pgfplots}
 \usepackage{ifdraft}
-\usepackage{microtype}
+\usepackage[protrusion=true,expansion=true,tracking=true]{microtype}
 \usepackage{fancyvrb}
 \usepackage[autostyle=true]{csquotes}
 \usepackage{setspace}
 \usepackage{newunicodechar}
-\usepackage[pdfencoding=auto,hidelinks,colorlinks=true]{hyperref} % load late
+\usepackage[pdfencoding=auto,hidelinks,colorlinks=true,
+linkcolor=blue,
+     filecolor=blue,
+     citecolor = black,
+     urlcolor=cyan,]{hyperref} % load late
 \usepackage[capitalize]{cleveref}
 \usepackage{multirow,tabularx}
 \usepackage{bbold}
@@ -38,12 +38,13 @@ labelformat=brace, position=top]{subcaption}
   ItalicFont = *-italic,
   BoldItalicFont = *-bolditalic,
   ]
+\setmathfont{texgyrepagella-math.otf}
+\KOMAoptions{DIV=last}
+\usepackage[autooneside]{scrlayer-scrpage}
 
 %% use the current pgfplots
 \pgfplotsset{compat=1.16}
 
-%% fix p slash
-\declareslashed{}{/}{0}{.15}{p}
 
 %% Tikz
 \usetikzlibrary{arrows,shapes,angles,quotes,arrows.meta,external}
diff --git a/tex/energy_transfer/src/_preamble.tex b/tex/energy_transfer/index.tex
similarity index 56%
rename from tex/energy_transfer/src/_preamble.tex
rename to tex/energy_transfer/index.tex
index 312b91c..e0c085b 100644
--- a/tex/energy_transfer/src/_preamble.tex
+++ b/tex/energy_transfer/index.tex
@@ -1,11 +1,13 @@
-\documentclass[fontsize=11pt,paper=a4,open=any,
+\documentclass[fontsize=10pt,paper=b5,open=any,
 ,twoside=true,toc=listof,toc=bibliography,headings=optiontohead,
-captions=nooneline,captions=tableabove,english,DIV=12,numbers=noenddot,final,parskip=half,
+captions=nooneline,captions=tableabove,english,DIV=calc,numbers=noenddot,final,parskip=half,
 headinclude=true,footinclude=false,BCOR=1cm]{scrbook}
 
 
-\usepackage{../../hirostyle}
-\usepackage{../../hiromacros}
+\usepackage{hirostyle}
+\usepackage{hiromacros}
+
+
 
 \addbibresource{references.bib}
 \synctex=1
@@ -16,8 +18,12 @@ headinclude=true,footinclude=false,BCOR=1cm]{scrbook}
 \maketitle
 \tableofcontents
 
+% Chapters
+\include{src/index.tex}
 
-
+\printbibliography{}
+\end{document}
+\end{document}
 
 %%% Local Variables:
 %%% mode: latex
diff --git a/tex/energy_transfer/latexmkrc b/tex/energy_transfer/latexmkrc
new file mode 100644
index 0000000..6f3c6c9
--- /dev/null
+++ b/tex/energy_transfer/latexmkrc
@@ -0,0 +1,2 @@
+$pdf_mode = 4;
+@default_files = ('index.tex');
diff --git a/tex/energy_transfer/src/references.bib b/tex/energy_transfer/references.bib
similarity index 100%
rename from tex/energy_transfer/src/references.bib
rename to tex/energy_transfer/references.bib
diff --git a/tex/energy_transfer/src/_postamble.tex b/tex/energy_transfer/src/_postamble.tex
deleted file mode 100644
index 66da099..0000000
--- a/tex/energy_transfer/src/_postamble.tex
+++ /dev/null
@@ -1,2 +0,0 @@
-\printbibliography{}
-\end{document}
diff --git a/tex/energy_transfer/src/index.tex b/tex/energy_transfer/src/index.tex
index 1f4a9a0..86946b9 100644
--- a/tex/energy_transfer/src/index.tex
+++ b/tex/energy_transfer/src/index.tex
@@ -794,7 +794,7 @@ some \(τ\geq 0\).
 
 %%% Local Variables:
 %%% mode: latex
-%%% TeX-master: "_preamble"
+%%% TeX-master: "../index.tex"
 %%% End:
 
 % LocalWords:  ergotropy
diff --git a/tex/hops_tweaks/src/index.tex b/tex/hops_tweaks/src/index.tex
index 3dd3c54..1ec0e4d 100644
--- a/tex/hops_tweaks/src/index.tex
+++ b/tex/hops_tweaks/src/index.tex
@@ -327,15 +327,18 @@ the expression
 \end{equation}
 
 This indicates, that we trade hierarchy depth for sample count in the
-nonlinear method. The Markov limit may be related to
-\(\Re[W_μ]\rightarrow ∞\). In this case the extra term vanishes and
-the nonlinear method looses its advantage (as the shift vanishes).
+nonlinear method. Interestingly the divisor in
+\cref{eq:steadynorm_nonlin} may vanish, leading to a breakdown of the
+estimate. An interpretation would be, that for very strong coupling or
+long bath correlation times the interaction \fixme{reference} with the
+bath diverges and the method fails.  On the other hand, the estimate
+may simply be wrong and should account for the coupling to the lower
+orders as well.
 
 The relations \cref{eq:steadynorm,eq:steadynorm_nonlin} are recursive
 and break off at \(ψ^0\), the norm of which can be assumed to be \(1\)
 in the nonlinear method.
 
-
 These ideas remain to be verified. Especially the assumptions should
 be checked. For time dependent coupling, one may maximize the estimate
 over all \(L(t)\).