diff --git a/img/Zeitstempel_01.jpg b/img/Zeitstempel_01.jpg
new file mode 100644
index 0000000..ee007dc
Binary files /dev/null and b/img/Zeitstempel_01.jpg differ
diff --git a/img/docker.eps b/img/docker.eps
new file mode 100644
index 0000000..e77e030
Binary files /dev/null and b/img/docker.eps differ
diff --git a/img/elab/elab_01.png b/img/elab/elab_01.png
index 1bec56c..495f91c 100644
Binary files a/img/elab/elab_01.png and b/img/elab/elab_01.png differ
diff --git a/img/elab/elab_03.png b/img/elab/elab_03.png
new file mode 100644
index 0000000..4a03ff5
Binary files /dev/null and b/img/elab/elab_03.png differ
diff --git a/img/elab/elab_editor1.png b/img/elab/elab_editor1.png
new file mode 100644
index 0000000..ae36c9e
Binary files /dev/null and b/img/elab/elab_editor1.png differ
diff --git a/img/elab/elab_editor2.png b/img/elab/elab_editor2.png
new file mode 100644
index 0000000..0da15ab
Binary files /dev/null and b/img/elab/elab_editor2.png differ
diff --git a/img/elab/elabapy.png b/img/elab/elabapy.png
new file mode 100644
index 0000000..33b9526
Binary files /dev/null and b/img/elab/elabapy.png differ
diff --git a/img/elab/ts01.png b/img/elab/ts01.png
new file mode 100644
index 0000000..a4abfab
Binary files /dev/null and b/img/elab/ts01.png differ
diff --git a/img/elabftw-logo.pdf b/img/elabftw-logo.pdf
index 358ee8f..2efc791 100644
Binary files a/img/elabftw-logo.pdf and b/img/elabftw-logo.pdf differ
diff --git a/img/elabftw-logo.svg b/img/elabftw-logo.svg
index 3d6f4ea..bffda23 100644
--- a/img/elabftw-logo.svg
+++ b/img/elabftw-logo.svg
@@ -37,97 +37,107 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="1015"
+     inkscape:window-height="1003"
      id="namedview46"
      showgrid="false"
-     inkscape:zoom="0.734375"
-     inkscape:cx="106.89362"
-     inkscape:cy="87.333333"
+     inkscape:zoom="1.46875"
+     inkscape:cx="269.61702"
+     inkscape:cy="34.907801"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg44" />
   <g
-     id="g880">
-    <path
-       id="path2"
-       d=" M 0.00 0.00 L 50.65 0.00 C 33.81 9.82 16.89 19.51 0.00 29.24 L 0.00 0.00 Z"
-       fill="#ffffff" />
+     id="g870">
     <path
        id="path4"
-       d=" M 50.65 0.00 L 51.01 0.00 C 50.94 13.89 51.11 27.78 50.92 41.68 C 40.72 45.29 33.37 56.03 34.87 66.94 C 35.95 78.78 47.08 88.62 59.00 88.05 C 71.61 88.15 82.82 76.63 82.31 64.01 C 82.43 54.03 75.39 45.14 66.26 41.65 C 66.26 27.76 66.20 13.88 66.29 0.00 L 67.19 0.00 C 69.40 1.44 71.59 2.92 73.89 4.22 C 88.44 12.49 102.85 21.01 117.44 29.20 C 117.61 51.85 117.42 74.51 117.54 97.16 C 100.60 107.04 83.56 116.73 66.60 126.58 C 64.12 128.01 61.71 129.62 59.00 130.59 C 57.29 130.41 55.81 129.45 54.33 128.67 C 36.29 118.07 18.01 107.85 0.00 97.19 L 0.00 29.24 C 16.89 19.51 33.81 9.82 50.65 0.00 Z"
-       fill="#706f6f" />
-    <path
-       id="path6"
-       d=" M 51.01 0.00 L 66.29 0.00 C 66.20 13.88 66.26 27.76 66.26 41.65 C 75.39 45.14 82.43 54.03 82.31 64.01 C 82.82 76.63 71.61 88.15 59.00 88.05 C 47.08 88.62 35.95 78.78 34.87 66.94 C 33.37 56.03 40.72 45.29 50.92 41.68 C 51.11 27.78 50.94 13.89 51.01 0.00 Z"
-       fill="#ffffff" />
+       d="m 50.65,0 h 0.36 C 50.94,13.89 51.11,27.78 50.92,41.68 40.72,45.29 33.37,56.03 34.87,66.94 35.95,78.78 47.08,88.62 59,88.05 71.61,88.15 82.82,76.63 82.31,64.01 82.43,54.03 75.39,45.14 66.26,41.65 66.26,27.76 66.2,13.88 66.29,0 h 0.9 c 2.21,1.44 4.4,2.92 6.7,4.22 14.55,8.27 28.96,16.79 43.55,24.98 0.17,22.65 -0.02,45.31 0.1,67.96 -16.94,9.88 -33.98,19.57 -50.94,29.42 -2.48,1.43 -4.89,3.04 -7.6,4.01 -1.71,-0.18 -3.19,-1.14 -4.67,-1.92 C 36.29,118.07 18.01,107.85 0,97.19 V 29.24 C 16.89,19.51 33.81,9.82 50.65,0 Z"
+       inkscape:connector-curvature="0"
+       style="fill:#706f6f" />
     <path
        id="path10"
-       d=" M 6.21 33.06 C 19.01 25.58 31.83 18.13 44.76 10.88 C 44.72 19.77 44.81 28.67 44.71 37.57 C 35.31 42.39 28.77 52.36 28.48 62.97 C 27.86 73.76 33.66 84.66 43.03 90.08 C 53.35 96.44 67.59 95.61 77.06 88.02 C 87.63 80.08 91.53 64.83 86.32 52.73 C 83.72 46.17 78.56 40.99 72.50 37.53 C 72.50 28.65 72.53 19.77 72.48 10.90 C 85.56 17.96 98.27 25.70 111.22 33.01 C 111.29 53.04 111.21 73.06 111.26 93.08 L 110.80 93.81 C 93.45 103.77 76.10 113.71 58.83 123.80 C 41.22 113.91 23.85 103.59 6.27 93.65 C 6.20 73.45 6.31 53.26 6.21 33.06 Z"
-       fill="#ffffff" />
+       d="m 6.21,33.06 c 12.8,-7.48 25.62,-14.93 38.55,-22.18 -0.04,8.89 0.05,17.79 -0.05,26.69 -9.4,4.82 -15.94,14.79 -16.23,25.4 -0.62,10.79 5.18,21.69 14.55,27.11 10.32,6.36 24.56,5.53 34.03,-2.06 10.57,-7.94 14.47,-23.19 9.26,-35.29 -2.6,-6.56 -7.76,-11.74 -13.82,-15.2 0,-8.88 0.03,-17.76 -0.02,-26.63 13.08,7.06 25.79,14.8 38.74,22.11 0.07,20.03 -0.01,40.05 0.04,60.07 l -0.46,0.73 C 93.45,103.77 76.1,113.71 58.83,123.8 41.22,113.91 23.85,103.59 6.27,93.65 6.2,73.45 6.31,53.26 6.21,33.06 Z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path12"
-       d=" M 176.48 41.29 C 179.86 41.31 183.28 40.98 186.64 41.47 C 188.75 41.85 189.29 44.20 189.23 46.02 C 189.31 57.35 189.19 68.69 189.27 80.02 C 193.55 80.39 197.85 80.29 202.14 80.15 C 202.18 78.77 202.22 77.40 202.25 76.03 C 204.83 76.01 207.41 76.00 209.99 75.99 C 209.91 79.20 210.39 82.53 209.51 85.66 C 208.59 87.73 205.90 87.43 204.02 87.53 C 197.38 87.39 190.73 87.70 184.09 87.39 C 182.23 87.45 180.77 85.79 180.84 83.98 C 180.42 72.14 181.22 60.27 180.45 48.45 C 179.14 48.47 177.82 48.49 176.51 48.51 C 176.50 46.10 176.49 43.70 176.48 41.29 Z"
-       fill="#525456" />
+       d="m 176.48,41.29 c 3.38,0.02 6.8,-0.31 10.16,0.18 2.11,0.38 2.65,2.73 2.59,4.55 0.08,11.33 -0.04,22.67 0.04,34 4.28,0.37 8.58,0.27 12.87,0.13 0.04,-1.38 0.08,-2.75 0.11,-4.12 2.58,-0.02 5.16,-0.03 7.74,-0.04 -0.08,3.21 0.4,6.54 -0.48,9.67 -0.92,2.07 -3.61,1.77 -5.49,1.87 -6.64,-0.14 -13.29,0.17 -19.93,-0.14 -1.86,0.06 -3.32,-1.6 -3.25,-3.41 -0.42,-11.84 0.38,-23.71 -0.39,-35.53 -1.31,0.02 -2.63,0.04 -3.94,0.06 -0.01,-2.41 -0.02,-4.81 -0.03,-7.22 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path14"
-       d=" M 249.72 41.32 C 252.98 41.32 256.30 40.93 259.53 41.56 C 261.09 41.83 261.87 43.45 261.90 44.90 C 262.16 49.15 261.96 53.41 261.96 57.67 C 267.14 52.36 276.34 52.06 281.65 57.31 C 287.00 62.99 287.70 71.96 284.95 79.02 C 282.71 84.96 276.35 88.95 270.01 88.18 C 266.67 87.99 263.92 85.94 261.40 83.95 C 261.44 84.84 261.51 86.62 261.55 87.50 C 258.95 87.50 256.34 87.50 253.74 87.49 C 253.71 74.99 253.83 62.48 253.70 49.98 C 254.02 47.78 251.18 48.48 249.88 47.82 C 249.63 45.66 249.74 43.48 249.72 41.32 Z"
-       fill="#525456" />
+       d="m 249.72,41.32 c 3.26,0 6.58,-0.39 9.81,0.24 1.56,0.27 2.34,1.89 2.37,3.34 0.26,4.25 0.06,8.51 0.06,12.77 5.18,-5.31 14.38,-5.61 19.69,-0.36 5.35,5.68 6.05,14.65 3.3,21.71 -2.24,5.94 -8.6,9.93 -14.94,9.16 -3.34,-0.19 -6.09,-2.24 -8.61,-4.23 0.04,0.89 0.11,2.67 0.15,3.55 -2.6,0 -5.21,0 -7.81,-0.01 -0.03,-12.5 0.09,-25.01 -0.04,-37.51 0.32,-2.2 -2.52,-1.5 -3.82,-2.16 -0.25,-2.16 -0.14,-4.34 -0.16,-6.5 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path16"
-       d=" M 291.80 41.22 C 300.54 41.31 309.28 41.18 318.02 41.27 C 319.74 41.23 321.99 41.87 322.23 43.89 C 322.76 46.80 322.44 49.79 322.51 52.74 C 319.92 52.75 317.34 52.74 314.76 52.70 C 314.72 51.33 314.67 49.96 314.62 48.59 C 311.24 48.49 307.87 48.48 304.50 48.49 C 304.50 52.83 304.50 57.16 304.49 61.49 C 309.35 61.50 314.21 61.53 319.06 61.45 C 319.22 63.88 319.26 66.32 319.26 68.76 C 314.44 68.81 309.62 68.60 304.80 68.83 C 304.04 74.99 304.75 81.30 304.50 87.51 C 301.66 87.51 298.83 87.50 296.00 87.50 C 295.93 74.47 296.14 61.44 295.89 48.41 C 294.50 48.45 293.11 48.50 291.73 48.54 C 291.75 46.10 291.77 43.66 291.80 41.22 Z"
-       fill="#525456" />
+       d="m 291.8,41.22 c 8.74,0.09 17.48,-0.04 26.22,0.05 1.72,-0.04 3.97,0.6 4.21,2.62 0.53,2.91 0.21,5.9 0.28,8.85 -2.59,0.01 -5.17,0 -7.75,-0.04 -0.04,-1.37 -0.09,-2.74 -0.14,-4.11 -3.38,-0.1 -6.75,-0.11 -10.12,-0.1 0,4.34 0,8.67 -0.01,13 4.86,0.01 9.72,0.04 14.57,-0.04 0.16,2.43 0.2,4.87 0.2,7.31 -4.82,0.05 -9.64,-0.16 -14.46,0.07 -0.76,6.16 -0.05,12.47 -0.3,18.68 -2.84,0 -5.67,-0.01 -8.5,-0.01 -0.07,-13.03 0.14,-26.06 -0.11,-39.09 -1.39,0.04 -2.78,0.09 -4.16,0.13 0.02,-2.44 0.04,-4.88 0.07,-7.32 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path18"
-       d=" M 325.49 43.45 C 325.89 41.39 328.29 41.22 329.97 41.24 C 340.30 41.25 350.64 41.25 360.98 41.24 C 362.65 41.24 365.08 41.35 365.50 43.41 C 366.02 46.49 365.69 49.64 365.74 52.75 C 363.25 52.75 360.76 52.75 358.27 52.75 C 358.23 51.36 358.19 49.98 358.15 48.60 C 355.35 48.51 352.55 48.49 349.74 48.50 C 349.79 61.48 349.68 74.46 349.80 87.43 C 346.93 87.52 344.06 87.52 341.20 87.44 C 341.32 74.46 341.20 61.48 341.26 48.50 C 338.46 48.49 335.65 48.51 332.86 48.59 C 332.80 49.98 332.75 51.37 332.71 52.76 C 330.22 52.75 327.74 52.75 325.26 52.75 C 325.30 49.66 324.99 46.52 325.49 43.45 Z"
-       fill="#525456" />
+       d="m 325.49,43.45 c 0.4,-2.06 2.8,-2.23 4.48,-2.21 10.33,0.01 20.67,0.01 31.01,0 1.67,0 4.1,0.11 4.52,2.17 0.52,3.08 0.19,6.23 0.24,9.34 -2.49,0 -4.98,0 -7.47,0 -0.04,-1.39 -0.08,-2.77 -0.12,-4.15 -2.8,-0.09 -5.6,-0.11 -8.41,-0.1 0.05,12.98 -0.06,25.96 0.06,38.93 -2.87,0.09 -5.74,0.09 -8.6,0.01 0.12,-12.98 0,-25.96 0.06,-38.94 -2.8,-0.01 -5.61,0.01 -8.4,0.09 -0.06,1.39 -0.11,2.78 -0.15,4.17 -2.49,-0.01 -4.97,-0.01 -7.45,-0.01 0.04,-3.09 -0.27,-6.23 0.23,-9.3 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path20"
-       d=" M 369.03 41.20 C 372.76 41.56 378.98 39.82 380.18 44.82 C 382.71 55.55 385.20 66.31 387.51 77.09 C 390.20 65.13 393.77 53.38 396.83 41.51 C 399.28 41.50 401.73 41.51 404.19 41.52 C 406.89 53.26 410.37 64.82 412.83 76.61 C 412.91 76.61 413.07 76.62 413.16 76.62 C 414.96 66.71 417.58 56.96 419.72 47.12 C 420.26 45.37 420.31 43.06 422.13 42.05 C 424.86 40.66 428.05 41.40 431.00 41.28 C 431.00 43.58 431.00 45.87 430.98 48.17 C 430.03 48.69 428.29 48.60 428.18 50.02 C 425.09 61.62 422.20 73.27 419.23 84.90 C 418.96 85.53 418.40 86.80 418.12 87.43 C 414.99 87.64 411.85 87.48 408.72 87.50 C 406.00 76.93 402.74 66.49 400.52 55.80 C 397.92 66.43 394.62 76.88 391.85 87.46 C 388.51 87.52 385.18 87.51 381.84 87.48 C 378.64 74.55 375.37 61.63 371.98 48.74 C 371.25 48.68 369.79 48.57 369.07 48.51 C 369.02 46.07 369.01 43.64 369.03 41.20 Z"
-       fill="#525456" />
+       d="m 369.03,41.2 c 3.73,0.36 9.95,-1.38 11.15,3.62 2.53,10.73 5.02,21.49 7.33,32.27 2.69,-11.96 6.26,-23.71 9.32,-35.58 2.45,-0.01 4.9,0 7.36,0.01 2.7,11.74 6.18,23.3 8.64,35.09 0.08,0 0.24,0.01 0.33,0.01 1.8,-9.91 4.42,-19.66 6.56,-29.5 0.54,-1.75 0.59,-4.06 2.41,-5.07 2.73,-1.39 5.92,-0.65 8.87,-0.77 0,2.3 0,4.59 -0.02,6.89 -0.95,0.52 -2.69,0.43 -2.8,1.85 -3.09,11.6 -5.98,23.25 -8.95,34.88 -0.27,0.63 -0.83,1.9 -1.11,2.53 -3.13,0.21 -6.27,0.05 -9.4,0.07 -2.72,-10.57 -5.98,-21.01 -8.2,-31.7 -2.6,10.63 -5.9,21.08 -8.67,31.66 -3.34,0.06 -6.67,0.05 -10.01,0.02 -3.2,-12.93 -6.47,-25.85 -9.86,-38.74 -0.73,-0.06 -2.19,-0.17 -2.91,-0.23 -0.05,-2.44 -0.06,-4.87 -0.04,-7.31 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path22"
-       d=" M 59.41 47.47 C 61.42 45.29 65.64 47.02 65.43 50.00 C 65.59 52.61 62.37 54.56 60.14 53.10 C 57.99 52.15 57.90 49.02 59.41 47.47 Z"
-       fill="#24b2be" />
+       d="m 59.41,47.47 c 2.01,-2.18 6.23,-0.45 6.02,2.53 0.16,2.61 -3.06,4.56 -5.29,3.1 -2.15,-0.95 -2.24,-4.08 -0.73,-5.63 z"
+       inkscape:connector-curvature="0"
+       style="fill:#24b2be" />
     <path
        id="path24"
-       d=" M 53.14 50.25 C 56.07 48.38 58.75 53.22 55.67 54.64 C 52.98 56.28 50.40 51.78 53.14 50.25 Z"
-       fill="#24b2be" />
+       d="m 53.14,50.25 c 2.93,-1.87 5.61,2.97 2.53,4.39 -2.69,1.64 -5.27,-2.86 -2.53,-4.39 z"
+       inkscape:connector-curvature="0"
+       style="fill:#24b2be" />
     <path
        id="path26"
-       d=" M 145.80 56.76 C 151.96 52.22 161.70 52.16 167.07 57.97 C 170.59 61.77 171.21 67.21 170.96 72.17 C 163.18 72.35 155.39 72.20 147.60 72.25 C 148.28 75.72 150.15 79.23 153.68 80.47 C 158.32 82.49 163.32 80.39 167.21 77.74 C 168.37 79.61 169.52 81.48 170.67 83.36 C 165.71 87.26 159.07 89.25 152.83 87.78 C 146.80 86.64 141.60 81.94 140.00 76.00 C 138.00 69.23 140.00 61.07 145.80 56.76 Z"
-       fill="#525456" />
+       d="m 145.8,56.76 c 6.16,-4.54 15.9,-4.6 21.27,1.21 3.52,3.8 4.14,9.24 3.89,14.2 -7.78,0.18 -15.57,0.03 -23.36,0.08 0.68,3.47 2.55,6.98 6.08,8.22 4.64,2.02 9.64,-0.08 13.53,-2.73 1.16,1.87 2.31,3.74 3.46,5.62 -4.96,3.9 -11.6,5.89 -17.84,4.42 C 146.8,86.64 141.6,81.94 140,76 c -2,-6.77 0,-14.93 5.8,-19.24 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path28"
-       d=" M 218.67 55.69 C 223.67 52.93 229.96 52.88 235.30 54.65 C 239.60 56.04 242.10 60.42 242.37 64.75 C 242.71 69.93 242.36 75.13 242.56 80.32 C 243.87 80.40 245.18 80.48 246.50 80.56 C 246.50 82.87 246.50 85.18 246.51 87.49 C 243.39 87.43 240.21 87.84 237.14 87.17 C 235.14 86.81 235.06 84.59 234.63 83.04 C 230.92 88.69 222.53 89.98 217.26 85.81 C 212.51 82.43 212.13 74.43 216.86 70.88 C 221.80 67.19 228.27 66.88 234.20 66.72 C 233.98 64.47 233.87 61.55 231.40 60.55 C 228.47 59.27 222.96 59.55 223.59 63.97 C 221.04 63.99 218.48 64.00 215.93 64.01 C 215.97 61.09 215.66 57.34 218.67 55.69 Z"
-       fill="#525456" />
+       d="m 218.67,55.69 c 5,-2.76 11.29,-2.81 16.63,-1.04 4.3,1.39 6.8,5.77 7.07,10.1 0.34,5.18 -0.01,10.38 0.19,15.57 1.31,0.08 2.62,0.16 3.94,0.24 0,2.31 0,4.62 0.01,6.93 -3.12,-0.06 -6.3,0.35 -9.37,-0.32 -2,-0.36 -2.08,-2.58 -2.51,-4.13 -3.71,5.65 -12.1,6.94 -17.37,2.77 -4.75,-3.38 -5.13,-11.38 -0.4,-14.93 4.94,-3.69 11.41,-4 17.34,-4.16 -0.22,-2.25 -0.33,-5.17 -2.8,-6.17 -2.93,-1.28 -8.44,-1 -7.81,3.42 -2.55,0.02 -5.11,0.03 -7.66,0.04 0.04,-2.92 -0.27,-6.67 2.74,-8.32 z"
+       inkscape:connector-curvature="0"
+       style="fill:#525456" />
     <path
        id="path30"
-       d=" M 50.28 80.68 C 41.90 76.67 38.26 65.95 41.68 57.44 C 53.13 57.63 64.58 57.29 76.02 57.63 C 77.44 63.12 77.47 69.29 74.22 74.18 C 69.47 82.09 58.39 85.09 50.28 80.68 Z"
-       fill="#24b2be" />
+       d="M 50.28,80.68 C 41.9,76.67 38.26,65.95 41.68,57.44 c 11.45,0.19 22.9,-0.15 34.34,0.19 1.42,5.49 1.45,11.66 -1.8,16.55 -4.75,7.91 -15.83,10.91 -23.94,6.5 z"
+       inkscape:connector-curvature="0"
+       style="fill:#24b2be" />
     <path
        id="path32"
-       d=" M 66.33 59.43 C 68.75 57.82 72.42 60.02 71.77 62.97 C 71.72 65.57 68.38 66.91 66.33 65.56 C 64.13 64.35 64.11 60.64 66.33 59.43 Z"
-       fill="#ffffff" />
+       d="m 66.33,59.43 c 2.42,-1.61 6.09,0.59 5.44,3.54 -0.05,2.6 -3.39,3.94 -5.44,2.59 -2.2,-1.21 -2.22,-4.92 0,-6.13 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path34"
-       d=" M 47.36 60.37 C 49.04 58.80 52.35 59.44 52.49 62.01 C 53.06 63.98 50.85 66.05 48.91 65.37 C 46.66 64.98 46.05 62.00 47.36 60.37 Z"
-       fill="#ffffff" />
+       d="m 47.36,60.37 c 1.68,-1.57 4.99,-0.93 5.13,1.64 0.57,1.97 -1.64,4.04 -3.58,3.36 -2.25,-0.39 -2.86,-3.37 -1.55,-5 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path36"
-       d=" M 147.88 66.52 C 148.93 62.47 152.80 59.32 157.10 60.01 C 160.43 60.29 162.10 63.57 162.76 66.47 C 157.80 66.52 152.84 66.49 147.88 66.52 Z"
-       fill="#ffffff" />
+       d="m 147.88,66.52 c 1.05,-4.05 4.92,-7.2 9.22,-6.51 3.33,0.28 5,3.56 5.66,6.46 -4.96,0.05 -9.92,0.02 -14.88,0.05 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path38"
-       d=" M 266.36 61.37 C 270.12 59.19 275.30 61.09 277.02 65.03 C 279.06 69.53 278.83 75.61 275.16 79.23 C 271.85 82.47 265.73 81.72 263.49 77.60 C 260.55 72.56 260.98 64.62 266.36 61.37 Z"
-       fill="#ffffff" />
+       d="m 266.36,61.37 c 3.76,-2.18 8.94,-0.28 10.66,3.66 2.04,4.5 1.81,10.58 -1.86,14.2 -3.31,3.24 -9.43,2.49 -11.67,-1.63 -2.94,-5.04 -2.51,-12.98 2.87,-16.23 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path40"
-       d=" M 57.32 65.49 C 59.35 64.08 62.86 65.37 62.77 68.06 C 63.36 70.78 59.75 73.07 57.50 71.46 C 55.21 70.33 55.23 66.80 57.32 65.49 Z"
-       fill="#ffffff" />
+       d="m 57.32,65.49 c 2.03,-1.41 5.54,-0.12 5.45,2.57 0.59,2.72 -3.02,5.01 -5.27,3.4 -2.29,-1.13 -2.27,-4.66 -0.18,-5.97 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
     <path
        id="path42"
-       d=" M 221.72 76.92 C 223.62 71.93 230.15 72.65 234.50 72.47 C 234.17 75.76 232.92 79.21 229.89 80.92 C 226.79 83.09 221.15 81.29 221.72 76.92 Z"
-       fill="#ffffff" />
+       d="m 221.72,76.92 c 1.9,-4.99 8.43,-4.27 12.78,-4.45 -0.33,3.29 -1.58,6.74 -4.61,8.45 -3.1,2.17 -8.74,0.37 -8.17,-4 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
   </g>
 </svg>
diff --git a/img/hhu-logo.pdf b/img/hhu-logo.pdf
new file mode 100644
index 0000000..e3fa3bd
Binary files /dev/null and b/img/hhu-logo.pdf differ
diff --git a/img/python-logo-inkscape.svg b/img/python-logo-inkscape.svg
new file mode 100644
index 0000000..938831f
--- /dev/null
+++ b/img/python-logo-inkscape.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docname="logo-python-inkscape.svg"
+   width="388.84pt"
+   height="115.02pt"
+   sodipodi:docbase="/home/sdeibel">
+  <metadata
+     id="metadata371">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="882"
+     inkscape:window-width="1233"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="2.1461642"
+     inkscape:cx="250.73166"
+     inkscape:cy="67.50975"
+     inkscape:window-x="0"
+     inkscape:window-y="6"
+     inkscape:current-layer="svg2"
+     width="210mm"
+     height="40mm"
+     units="mm" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         style="stop-color:#b8b8b8;stop-opacity:0.49803922;"
+         offset="0"
+         id="stop2797" />
+      <stop
+         style="stop-color:#7f7f7f;stop-opacity:0;"
+         offset="1"
+         id="stop2799" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2787">
+      <stop
+         style="stop-color:#7f7f7f;stop-opacity:0.5;"
+         offset="0"
+         id="stop2789" />
+      <stop
+         style="stop-color:#7f7f7f;stop-opacity:0;"
+         offset="1"
+         id="stop2791" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3676">
+      <stop
+         style="stop-color:#b2b2b2;stop-opacity:0.5;"
+         offset="0"
+         id="stop3678" />
+      <stop
+         style="stop-color:#b3b3b3;stop-opacity:0;"
+         offset="1"
+         id="stop3680" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3236">
+      <stop
+         style="stop-color:#f4f4f4;stop-opacity:1"
+         offset="0"
+         id="stop3244" />
+      <stop
+         style="stop-color:white;stop-opacity:1"
+         offset="1"
+         id="stop3240" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4671">
+      <stop
+         style="stop-color:#ffd43b;stop-opacity:1;"
+         offset="0"
+         id="stop4673" />
+      <stop
+         style="stop-color:#ffe873;stop-opacity:1"
+         offset="1"
+         id="stop4675" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4689">
+      <stop
+         style="stop-color:#5a9fd4;stop-opacity:1;"
+         offset="0"
+         id="stop4691" />
+      <stop
+         style="stop-color:#306998;stop-opacity:1;"
+         offset="1"
+         id="stop4693" />
+    </linearGradient>
+    <linearGradient
+       x1="224.23996"
+       y1="144.75717"
+       x2="-65.308502"
+       y2="144.75717"
+       id="linearGradient2987"
+       xlink:href="#linearGradient4671"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)" />
+    <linearGradient
+       x1="172.94208"
+       y1="77.475983"
+       x2="26.670298"
+       y2="76.313133"
+       id="linearGradient2990"
+       xlink:href="#linearGradient4689"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4689"
+       id="linearGradient2587"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)"
+       x1="172.94208"
+       y1="77.475983"
+       x2="26.670298"
+       y2="76.313133" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4671"
+       id="linearGradient2589"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)"
+       x1="224.23996"
+       y1="144.75717"
+       x2="-65.308502"
+       y2="144.75717" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4689"
+       id="linearGradient2248"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)"
+       x1="172.94208"
+       y1="77.475983"
+       x2="26.670298"
+       y2="76.313133" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4671"
+       id="linearGradient2250"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(100.2702,99.61116)"
+       x1="224.23996"
+       y1="144.75717"
+       x2="-65.308502"
+       y2="144.75717" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4671"
+       id="linearGradient2255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
+       x1="224.23996"
+       y1="144.75717"
+       x2="-65.308502"
+       y2="144.75717" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4689"
+       id="linearGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
+       x1="172.94208"
+       y1="76.176224"
+       x2="26.670298"
+       y2="76.313133" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2795"
+       id="radialGradient2801"
+       cx="61.518883"
+       cy="132.28575"
+       fx="61.518883"
+       fy="132.28575"
+       r="29.036913"
+       gradientTransform="matrix(1,0,0,0.177966,0,108.7434)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4671"
+       id="linearGradient1475"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)"
+       x1="150.96111"
+       y1="192.35176"
+       x2="112.03144"
+       y2="137.27299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4689"
+       id="linearGradient1478"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)"
+       x1="26.648937"
+       y1="20.603781"
+       x2="135.66525"
+       y2="114.39767" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2795"
+       id="radialGradient1480"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.382716e-8,-0.296405,1.43676,4.683673e-7,-128.544,150.5202)"
+       cx="61.518883"
+       cy="132.28575"
+       fx="61.518883"
+       fy="132.28575"
+       r="29.036913" />
+  </defs>
+  <path
+     id="path46"
+     style="fill:#646464;fill-opacity:1"
+     d="M 184.61344,61.929363 C 184.61344,47.367213 180.46118,39.891193 172.15666,39.481813 C 168.85239,39.325863 165.62611,39.852203 162.48754,41.070593 C 159.98254,41.967323 158.2963,42.854313 157.40931,43.751043 L 157.40931,78.509163 C 162.72147,81.842673 167.43907,83.392453 171.55234,83.148783 C 180.25649,82.573703 184.61344,75.507063 184.61344,61.929363 z M 194.85763,62.533683 C 194.85763,69.931723 193.12265,76.072393 189.63319,80.955683 C 185.7441,86.482283 180.35396,89.328433 173.46277,89.484393 C 168.26757,89.650093 162.91642,88.022323 157.40931,84.610843 L 157.40931,116.20116 L 148.50047,113.02361 L 148.50047,42.903043 C 149.96253,41.109583 151.84372,39.569543 154.12454,38.263433 C 159.42696,35.173603 165.86978,33.584823 173.45302,33.506853 L 173.57973,33.633563 C 180.50991,33.545833 185.85132,36.391993 189.60395,42.162263 C 193.10315,47.454933 194.85763,54.238913 194.85763,62.533683 z " />
+  <path
+     id="path48"
+     style="fill:#646464;fill-opacity:1"
+     d="M 249.30487,83.265743 C 249.30487,93.188283 248.31067,100.05998 246.32227,103.88084 C 244.32411,107.7017 240.52275,110.75254 234.90842,113.02361 C 230.35653,114.81707 225.43425,115.79178 220.15133,115.95748 L 218.67952,110.34316 C 224.05016,109.61213 227.83204,108.88109 230.02513,108.15006 C 234.34309,106.688 237.30621,104.44617 238.93397,101.44406 C 240.24008,98.997543 240.88339,94.328693 240.88339,87.418003 L 240.88339,85.098203 C 234.79146,87.866373 228.40711,89.240713 221.73036,89.240713 C 217.34417,89.240713 213.47457,87.866373 210.14107,85.098203 C 206.39818,82.086343 204.52674,78.265483 204.52674,73.635623 L 204.52674,36.557693 L 213.43558,33.506853 L 213.43558,70.828453 C 213.43558,74.815013 214.7222,77.885353 217.29543,80.039463 C 219.86866,82.193563 223.20217,83.226753 227.2862,83.148783 C 231.37023,83.061053 235.74667,81.482023 240.39603,78.392203 L 240.39603,34.851953 L 249.30487,34.851953 L 249.30487,83.265743 z " />
+  <path
+     id="path50"
+     style="fill:#646464;fill-opacity:1"
+     d="M 284.08249,88.997033 C 283.02006,89.084753 282.04535,89.123743 281.14862,89.123743 C 276.10937,89.123743 272.18129,87.924853 269.37413,85.517323 C 266.57671,83.109793 265.17314,79.786033 265.17314,75.546053 L 265.17314,40.456523 L 259.07146,40.456523 L 259.07146,34.851953 L 265.17314,34.851953 L 265.17314,19.968143 L 274.07223,16.800333 L 274.07223,34.851953 L 284.08249,34.851953 L 284.08249,40.456523 L 274.07223,40.456523 L 274.07223,75.302373 C 274.07223,78.645623 274.96896,81.014163 276.76243,82.398253 C 278.30247,83.538663 280.74899,84.191723 284.08249,84.357423 L 284.08249,88.997033 z " />
+  <path
+     id="path52"
+     style="fill:#646464;fill-opacity:1"
+     d="M 338.02288,88.266003 L 329.11404,88.266003 L 329.11404,53.878273 C 329.11404,50.379063 328.29528,47.367213 326.66753,44.852463 C 324.78634,42.006313 322.17411,40.583233 318.82112,40.583233 C 314.73708,40.583233 309.6296,42.737343 303.4987,47.045563 L 303.4987,88.266003 L 294.58985,88.266003 L 294.58985,6.0687929 L 303.4987,3.2616329 L 303.4987,40.700203 C 309.191,36.557693 315.40963,34.481563 322.16436,34.481563 C 326.88196,34.481563 330.70282,36.070333 333.62694,39.238143 C 336.56082,42.405943 338.02288,46.353513 338.02288,51.071103 L 338.02288,88.266003 L 338.02288,88.266003 z " />
+  <path
+     id="path54"
+     style="fill:#646464;fill-opacity:1"
+     d="M 385.37424,60.525783 C 385.37424,54.930953 384.31182,50.310833 382.19669,46.655673 C 379.68195,42.201253 375.77337,39.852203 370.49044,39.608523 C 360.72386,40.173863 355.85032,47.172273 355.85032,60.584263 C 355.85032,66.734683 356.86401,71.871393 358.91089,75.994413 C 361.52312,81.248093 365.44145,83.840823 370.66589,83.753103 C 380.47146,83.675123 385.37424,75.935933 385.37424,60.525783 z M 395.13109,60.584263 C 395.13109,68.547643 393.09395,75.175663 389.02941,80.468333 C 384.5555,86.394563 378.37584,89.367423 370.49044,89.367423 C 362.67328,89.367423 356.58135,86.394563 352.18541,80.468333 C 348.19885,75.175663 346.21044,68.547643 346.21044,60.584263 C 346.21044,53.098503 348.36455,46.801883 352.67276,41.674913 C 357.22466,36.236033 363.20937,33.506853 370.6074,33.506853 C 378.00545,33.506853 384.02914,36.236033 388.66877,41.674913 C 392.97697,46.801883 395.13109,53.098503 395.13109,60.584263 z " />
+  <path
+     id="path56"
+     style="fill:#646464;fill-opacity:1"
+     d="M 446.20583,88.266003 L 437.29699,88.266003 L 437.29699,51.928853 C 437.29699,47.942293 436.0981,44.832973 433.70032,42.591133 C 431.30253,40.359053 428.10549,39.277123 424.11893,39.364853 C 419.8887,39.442833 415.86314,40.826913 412.04229,43.507363 L 412.04229,88.266003 L 403.13345,88.266003 L 403.13345,42.405943 C 408.26042,38.672813 412.97801,36.236033 417.28621,35.095623 C 421.35076,34.033193 424.93769,33.506853 428.02752,33.506853 C 430.14264,33.506853 432.13104,33.711543 434.00248,34.120913 C 437.50169,34.929923 440.34783,36.430973 442.54093,38.633823 C 444.98744,41.070593 446.20583,43.994723 446.20583,47.415943 L 446.20583,88.266003 z " />
+  <path
+     style="fill:url(#linearGradient1478);fill-opacity:1"
+     d="M 60.510156,6.3979729 C 55.926503,6.4192712 51.549217,6.8101906 47.697656,7.4917229 C 36.35144,9.4962267 34.291407,13.691825 34.291406,21.429223 L 34.291406,31.647973 L 61.103906,31.647973 L 61.103906,35.054223 L 34.291406,35.054223 L 24.228906,35.054223 C 16.436447,35.054223 9.6131468,39.73794 7.4789058,48.647973 C 5.0170858,58.860939 4.9078907,65.233996 7.4789058,75.897973 C 9.3848341,83.835825 13.936449,89.491721 21.728906,89.491723 L 30.947656,89.491723 L 30.947656,77.241723 C 30.947656,68.391821 38.6048,60.585475 47.697656,60.585473 L 74.478906,60.585473 C 81.933857,60.585473 87.885159,54.447309 87.885156,46.960473 L 87.885156,21.429223 C 87.885156,14.162884 81.755176,8.7044455 74.478906,7.4917229 C 69.872919,6.7249976 65.093809,6.3766746 60.510156,6.3979729 z M 46.010156,14.616723 C 48.779703,14.616723 51.041406,16.915369 51.041406,19.741723 C 51.041404,22.558059 48.779703,24.835473 46.010156,24.835473 C 43.23068,24.835472 40.978906,22.558058 40.978906,19.741723 C 40.978905,16.91537 43.23068,14.616723 46.010156,14.616723 z "
+     id="path1948" />
+  <path
+     style="fill:url(#linearGradient1475);fill-opacity:1"
+     d="M 91.228906,35.054223 L 91.228906,46.960473 C 91.228906,56.191228 83.403011,63.960472 74.478906,63.960473 L 47.697656,63.960473 C 40.361823,63.960473 34.291407,70.238956 34.291406,77.585473 L 34.291406,103.11672 C 34.291406,110.38306 40.609994,114.65704 47.697656,116.74172 C 56.184987,119.23733 64.323893,119.68835 74.478906,116.74172 C 81.229061,114.78733 87.885159,110.85411 87.885156,103.11672 L 87.885156,92.897973 L 61.103906,92.897973 L 61.103906,89.491723 L 87.885156,89.491723 L 101.29141,89.491723 C 109.08387,89.491723 111.98766,84.056315 114.69765,75.897973 C 117.49698,67.499087 117.37787,59.422197 114.69765,48.647973 C 112.77187,40.890532 109.09378,35.054223 101.29141,35.054223 L 91.228906,35.054223 z M 76.166406,99.710473 C 78.945884,99.710476 81.197656,101.98789 81.197656,104.80422 C 81.197654,107.63057 78.945881,109.92922 76.166406,109.92922 C 73.396856,109.92922 71.135156,107.63057 71.135156,104.80422 C 71.135158,101.98789 73.396853,99.710473 76.166406,99.710473 z "
+     id="path1950" />
+  <path
+     d="M 463.5544,26.909383 L 465.11635,26.909383 L 465.11635,17.113143 L 468.81648,17.113143 L 468.81648,15.945483 L 459.85427,15.945483 L 459.85427,17.113143 L 463.5544,17.113143 L 463.5544,26.909383 M 470.20142,26.909383 L 471.53589,26.909383 L 471.53589,17.962353 L 474.4323,26.908259 L 475.91799,26.908259 L 478.93615,17.992683 L 478.93615,26.909383 L 480.39194,26.909383 L 480.39194,15.945483 L 478.46605,15.945483 L 475.16774,25.33834 L 472.35477,15.945483 L 470.20142,15.945483 L 470.20142,26.909383"
+     style="font-size:15.16445827px;font-style:normal;font-weight:normal;line-height:125%;fill:#646464;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+     id="text3004"
+     sodipodi:nodetypes="ccccccccccccccccccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.44382022;fill:url(#radialGradient1480);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1894"
+     sodipodi:cx="61.518883"
+     sodipodi:cy="132.28575"
+     sodipodi:rx="48.948284"
+     sodipodi:ry="8.6066771"
+     d="M 110.46717 132.28575 A 48.948284 8.6066771 0 1 1  12.570599,132.28575 A 48.948284 8.6066771 0 1 1  110.46717 132.28575 z"
+     transform="matrix(0.73406,0,0,0.809524,16.24958,27.00935)" />
+</svg>
diff --git a/img/python-logo.pdf b/img/python-logo.pdf
new file mode 100644
index 0000000..7cb212c
Binary files /dev/null and b/img/python-logo.pdf differ
diff --git a/master.pdf b/master.pdf
index 8214a94..0d99318 100644
Binary files a/master.pdf and b/master.pdf differ
diff --git a/master.tex b/master.tex
index 117eb7b..a921112 100644
--- a/master.tex
+++ b/master.tex
@@ -23,6 +23,13 @@
 
     \hypersetup{pdfauthor={Alexander Minges}}
 
+    \newcommand\blfootnote[1]{%
+    \begingroup
+    \renewcommand\thefootnote{}\footnote{#1}%
+    \addtocounter{footnote}{-1}%
+    \endgroup
+    }
+
 \begin{document}
 
 \maketitle
@@ -34,8 +41,8 @@
     eLabFTW ist ein generisches elektronisches Laborjournal (ELN)
     \pause
     \begin{itemize}
-        \item Offene und freie Software (GNU AGPL 3.0~\includegraphics[height=1.0em]{img/AGPLv3_Logo.pdf})\pause        
-        \item Gemeinschaftliche Entwicklung durch Freiwillige (Github~\faGithub)\pause
+        \item Offene und freie Software (GNU AGPL 3.0~\includegraphics[height=1.0em]{img/AGPLv3_Logo.pdf})\pause
+        \item Gemeinschaftliche Entwicklung durch \\ Freiwillige -- von Wissenschaftlern, für Wissenschaftler\pause
         \item Browser basierte Benutzeroberfläche, kompatibel mit allen gängigen Browsern und (Mobil-) Geräten\pause
         \item Übersetzt in verschiedene Sprachen
     \end{itemize}
@@ -61,6 +68,7 @@
         \item[Feb. 2013] Erste veröffentlichte Version (0.7.0)
         \item[2018] Offiziell durch das \emph{Institut Curie} unterstütztes Softwareprojekt
         \item[Aug. 2018] Veröffentlichung der aktuellen stabilen Version 2.0
+        \item[Vorgestern] Bugfix-Release 2.0.1
     \end{description}
 \end{frame}
 
@@ -90,57 +98,64 @@
     \end{figure}
 \end{frame}
 
+\section{Funktionsumfang}
+
 \begin{frame}
-    \frametitle{Funktionsumfang}
-    \centering eLabFTW verfügt über eine ansprechende und leicht verständliche Benutzeroberfläche
+    \frametitle{Benutzeroberfläche}
+    \centering eLabFTW verfügt über eine moderne und übersichtliche Benutzeroberfläche
     \begin{figure}
         \centering
-        \includegraphics[width=0.8\textwidth]{img/elab/elab_01.png}
+        \includegraphics[width=\textwidth]{img/elab/elab_01.png}
     \end{figure}
 \end{frame}
 
 \begin{frame}
-    \frametitle{Funktionsumfang}
-    Zwei Arten von Einträgen möglich:
-    \begin{itemize}
-        \item Experimente
-         \begin{itemize}
+    \frametitle{Datenmodell}
+    \huge\faFlask\hspace{0.5em}\large Experimente\normalsize
+        \begin{itemize}
             \item Frei definierbarer \textbf{Status} (z.B. \textquote{abgeschlossen}, \textquote{laufend} \ldots)
             \item \textbf{Zeitstempel} möglich
             \item Definierung von \textbf{Vorlagen und Schritten}
-         \end{itemize}
-         \pause
-         \item Datenbankeinträge
-         \begin{itemize}
+        \end{itemize}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Datenmodell}
+    \huge\faDatabase\hspace{0.5em}\large Datenbankeinträge\normalsize
+        \begin{itemize}
             \item Definierung von \textbf{Vorlagen und Subtypen}
             \item Nutzbar für z.B. Laborinventar, Protokolle
             \item Definition von \textbf{buchbaren Einträgen} möglich
-         \end{itemize}
-    \end{itemize}
+        \end{itemize}
+    \pause
+    \huge\faTag\hspace{0.5em}\large Kategorisierung\normalsize
+        \begin{itemize}
+            \item Frei definierbare Schlagwörter (\emph{Tags})
+        \end{itemize}
 \end{frame}
 
 \begin{frame}
-    \frametitle{Funktionsumfang}
-    Für beide Typen gilt:
-    \begin{itemize}
-        \item Kategorisierbar über frei definierbare \emph{Tags}
-        \item Durchsuchbar (Volltextsuche, Überschriften, Ersteller, usw.)
-    \end{itemize}
+    \frametitle{Erstellen von Experimenten und Datenbankeinträgen}
+    \only<1>{\centering Bearbeitung im grafischen Texteditor}
+    \only<2>{\centering Anhängen von Dateien mit Vorschau}
+    \begin{figure}
+        \centering
+        \only<1>{\includegraphics[width=\textwidth]{img/elab/elab_editor1.png}}
+        \only<2>{\includegraphics[width=\textwidth]{img/elab/elab_editor2.png}}
+    \end{figure}
 \end{frame}
 
 \begin{frame}
-    \frametitle{Funktionsumfang}
-    Sichtbarkeit von Experimenten/Datenbankeinträgen einschränkbar:
-    \begin{itemize}
-        \item auf Gruppen
-        \item auf Benutzer
-        \item öffentliche Einträge sind möglich!
-    \end{itemize}
-    
+    \frametitle{Laborinventar}
+    \centering Inventarverwaltung mit frei definierbaren Vorlagen
+    \begin{figure}
+        \centering
+        \includegraphics[width=\textwidth]{img/elab/elab_03.png}
+    \end{figure}
 \end{frame}
 
 \begin{frame}
-    \frametitle{Funktionsumfang}
+    \frametitle{Integrierter Zeitplan}
     \centering Buchung von Geräten über integrierten Kalender
     \begin{figure}
         \centering
@@ -148,5 +163,202 @@
     \end{figure}
 \end{frame}
 
+\begin{frame}
+    \frametitle{Erstellen von Experimenten und Datenbankeinträgen}
+    Weitere Funktionen
+    \begin{itemize}
+        \item Eingabe alternativ als \textbf{strukturierter Text} (Markdown)\pause
+        \item \textbf{Vorschau} gängiger Dateiformate (u.a. PDF, TIFF, PDB, SDF,\ldots)\pause
+        \item \textbf{Versionierung} von Einträgen und angehängten Daten\pause
+        \item \textbf{Verlinkung} von Experimenten/Datenbankeinträgen auch untereinander\pause
+        \item \textbf{Freigabe} von Experimenten für andere Benutzer\pause
+        \item Satz \textbf{mathematischer Formeln}
+    \end{itemize}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Zeitstempel}
+    Fixierung von Experimenten mittels Zeitstempel
+    \begin{columns}[c]
+        \begin{column}{0.8\textwidth}
+             \begin{itemize}
+                \small
+                \item Nachweis eines definierten Zustandes zum Zeitpunkt \textquote{X}
+                \item Zeitstempeldienst (TSA) nach RFC 3161 (z.B. DFN)
+                \item Datenintegrität mittels Signatur überprüfbar
+             \end{itemize}
+        \end{column}
+        \begin{column}{0.2\textwidth}
+            \includegraphics[width=\textwidth]{img/Zeitstempel_01.jpg}
+        \end{column}
+    \end{columns}
+    \pause
+    \begin{figure}
+        \centering
+        \includegraphics[width=0.95\textwidth]{img/elab/ts01.png}
+    \end{figure}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Datenexport/-import}
+    \begin{itemize}
+        \item Export einzelner Experimente und Datenbankeinträge inkl. angehängter Dateien als \textbf{ZIP}
+        \item Export als \textbf{PDF-Datei} mit Vorschau angehängter Dateien
+        \item Massenexport als \textbf{CSV} (nur Text) und ZIP (inkl. Dateien)
+        \item Import von Tabellen im CSV-Format als Experimente oder Datenbankeinträge
+    \end{itemize}
+    \centering
+    \huge\faFileArchive\hspace{0.75em}\faFilePdf\hspace{0.75em}\faFile
+\end{frame}
+
+\section{Einbindung in bestehende Infrastruktur}
+
+\begin{frame}
+    \frametitle{Benutzerauthentifizierung}
+    \begin{itemize}
+        \item Nach Installation: Lokale Benutzerkonten
+        \item Einbindung in zentrale Identitätsmanagementsysteme möglich (SAML 2.0)
+        \item Kombination von lokalen und zentralen Zugängen möglich
+    \end{itemize}
+    \begin{center}
+        \huge\faUsers\normalsize
+    \end{center}
+\end{frame}
+
+\begin{frame}
+    \frametitle{API-Zugriff}
+    Zugriff über öffentliche REST-API
+    \begin{itemize}
+        \item Interaktion mit Geräten und Prozessen
+        \item Automatisches Anlegen/Abschließen von Experimenten
+        \item Hochladen von Daten zu eLabFTW
+        \item Datenexport im JSON-Format
+    \end{itemize}
+\end{frame}
+
+\begin{frame}[fragile]
+    \frametitle{API-Zugriff}
+    \begin{block}{Erstellen eines Experimentes aus der \emph{bash} heraus}
+        \scriptsize\begin{verbatim}
+  #!/bin/bash
+  export API_KEY=XXXXX
+  curl -X POST -H "Authorization: $API_KEY" \
+    "https://elabftw.example.org/api/v1/experiments"
+
+  # Datei zu Experiment 3 hochladen
+  curl -X POST -F "file=@your-file.jpg" -H \
+    "Authorization: $API_KEY" \
+    "https://elabftw.example.org/api/v1/experiments/3"
+        \end{verbatim}
+    \end{block}
+\end{frame}
+
+\begin{frame}
+    \frametitle{API-Zugriff}
+    \begin{figure}
+        \centering
+        \includegraphics[width=0.5\textwidth]{img/python-logo.pdf}
+    \end{figure}
+    \begin{figure}
+        \centering
+        Python-Bibliothek zur einfachen Interaktion mit eLabFTW:\vspace{1em}
+        \includegraphics[width=0.25\textwidth]{img/elab/elabapy.png}
+    \end{figure}
+\end{frame}
+
+\begin{frame}[fragile]
+    \frametitle{API-Zugriff}
+    \begin{block}{Erstellen eines Experimentes mit \emph{python}}
+        \tiny\begin{verbatim}
+  #!/sbin/env python
+  import elabapy
+
+  manager = elabapy.Manager(endpoint="https://elab.example.org/api/v1/",
+                                      token="XXXX")
+  exp = manager.create_experiment()
+
+  files = {'file': open('report.xls', 'rb')}
+  print(manager.upload_to_experiment(exp["id], files))
+        \end{verbatim}
+    \end{block}
+    \pause
+    Weitere Beispiele:~\small\url{https://doc.elabftw.net/api.html}
+\end{frame}
+
+\section{Wie ausprobieren?}
+
+\begin{frame}
+    \frametitle{Demo-Installation}
+    \begin{figure}
+        \centering
+        \includegraphics[width=0.5\textwidth]{img/elabftw-logo.pdf}
+    \end{figure}
+    \centering
+    \url{https://demo.elabftw.net}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Installation}
+    \begin{figure}
+        \centering
+        \includegraphics[width=0.5\textwidth]{img/docker.eps}
+    \end{figure}
+    \centering
+    \url{https://doc.elabftw.net/install.html}
+\end{frame}
+
+\section{Zum Abschluss}
+
+\begin{frame}
+    \frametitle{Weitere Fragen?}
+    \begin{center}
+        \huge\faGlobe\normalsize
+    \end{center}
+    \begin{description}
+        \item[Website] \small\url{https://www.elabftw.net}\normalsize
+        \item[Hilfe] \small\url{https://doc.elabftw.net}\normalsize
+        \item[Quelltext] \small\url{https://github.com/elabftw/elabftw}\normalsize
+    \end{description}
+    \vfill
+    \begin{center}
+        \huge\faEnvelope\normalsize
+
+        \url{alexander.minges@hhu.de} \\
+        \url{nicolas.carpi@curie.fr}
+    \end{center}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Danksagung}
+    \begin{columns}[c]
+        \begin{column}{0.7\textwidth}
+            Prof.~Dr.~Georg Groth\\
+            Biochemische Pflanzenphysiologie\\
+            \emph{Heinrich-Heine-Universität}
+
+            \vspace{3em}
+
+            Nicolas Carpi\\
+            \emph{Institut Curie, Paris}\\
+            Frankreich
+        \end{column}
+        \begin{column}{0.3\textwidth}
+            \includegraphics[width=\textwidth]{img/hhu-logo.pdf}
+
+            \vspace{3em}
+
+            \includegraphics[width=\textwidth]{img/institut-curie.jpg}
+        \end{column}
+    \end{columns}
+    \vfill
+    \blfootnote{\faCreativeCommons~\faCreativeCommonsBy~\faCreativeCommonsSa\hspace{1em}Creative Commons BY-SA 4.0}
+\end{frame}
+
+\begin{frame}
+    \frametitle{Abschließend\ldots}
+    \begin{center}
+        \Huge Vielen Dank für Ihre Aufmerksamkeit!
+    \end{center}
+\end{frame}
 
 \end{document}
\ No newline at end of file