diff --git a/material/content/ccc/ccc_bundesweit.tex b/material/content/ccc/ccc_bundesweit.tex
new file mode 100644
index 0000000..c65a5cc
--- /dev/null
+++ b/material/content/ccc/ccc_bundesweit.tex
@@ -0,0 +1,26 @@
+\begin{frame}
+ \frametitle{Chaos Computer Club}
+ \begin{center}
+ \includegraphics[height=0.2\textheight]{img/chaosknoten.png}
+ \end{center}
+ \begin{itemize}
+ \item<1-> Verein wurde 1981 gegr"undet (\url{https://ccc.de})
+ \item<2-> Aktuell > 6000 Mitglieder
+ \item<3-> Technologie zum gesellschaftlichen Nutzen (und nicht ihrem Schaden)
+ \item<4-> Betreibt u.a. "Offentlichkeitsarbeit und Politikberatung
+ \end{itemize}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Chaos Computer Club}
+ \begin{figure}
+ \includegraphics[height=0.7\textheight]{img/fingerabdruck.jpg}
+ \end{figure}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Chaos Computer Club}
+ \begin{figure}
+ \includegraphics[height=0.7\textheight]{img/trojaner.png}
+ \end{figure}
+\end{frame}
diff --git a/material/content/ccc/ccc_lokal.tex b/material/content/ccc/ccc_lokal.tex
new file mode 100644
index 0000000..f6aa93d
--- /dev/null
+++ b/material/content/ccc/ccc_lokal.tex
@@ -0,0 +1,13 @@
+\begin{frame}
+ \frametitle{Chaos Computer Club}
+ \begin{center}
+ \includegraphics[height=0.1\textheight]{img/c3d2_logo.png}
+ \end{center}
+ \begin{itemize}
+ \item<1-> Chaos Computer Club Dresden (\url{https://c3d2.de})
+ \item<2-> Datenspuren: Herbst 2016 (\url{https://datenspuren.de})
+ \item<3-> Podcasts (\url{https://c3d2.de/radio.html})
+ \item<4-> IT4Refugees
+ \item<5-> Chaos macht Schule (\url{https://c3d2.de/schule.html})
+ \end{itemize}
+\end{frame}
diff --git a/material/content/geraetesicherheit/app_permissions.tex b/material/content/geraetesicherheit/app_permissions.tex
new file mode 100644
index 0000000..d02b07d
--- /dev/null
+++ b/material/content/geraetesicherheit/app_permissions.tex
@@ -0,0 +1,24 @@
+\begin{frame}{Permissions}
+ \begin{columns}
+ \column{5.5cm}
+ \footnotesize
+
+ \textbf{Android}\\
+ Einstellungen -> Apps -> Appname -> Berechtigungen ändern\\
+ \vspace{0.2cm}
+ Einstellungen -> Apps -> Zahnrad -> Appberechtigungen\\
+ \vspace{0.5cm}
+
+ \textbf{iOS}\\
+ Einstellungen -> Privatsphäre -> Berechtigungsname\\
+ \vspace{0.5cm}
+
+ In den neuesten Versionen: Entscheidung bei erster Benutzung
+
+ \column{5cm}
+
+ \begin{center}
+ \includegraphics[width=3.5cm]{img/permissions-android.png}
+ \par\end{center}
+ \end{columns}
+\end{frame}
diff --git a/material/content/geraetesicherheit/foss_programme_apps.tex b/material/content/geraetesicherheit/foss_programme_apps.tex
new file mode 100644
index 0000000..97c4204
--- /dev/null
+++ b/material/content/geraetesicherheit/foss_programme_apps.tex
@@ -0,0 +1,45 @@
+\begin{frame}
+ \frametitle{Freie Software auf Computern}
+ \begin{columns}
+ \begin{column}{5cm}
+ \begin{center}
+ \includegraphics[height=0.2\textheight]{img/firefox.png} \\
+ Firefox \\
+ \vspace{0.1\textheight}
+ \includegraphics[height=0.2\textheight]{img/libreoffice.jpg}\\
+ LibreOffice
+ \end{center}
+ \end{column}
+ \begin{column}{5cm}
+ \begin{center}
+ \includegraphics[height=0.2\textheight]{img/thunderbird.png} \\
+ Thunderbird \\
+ \vspace{0.1\textheight}
+ \includegraphics[height=0.2\textheight]{img/vlc.png}\\
+ VLC Media Player
+ \end{center}
+ \end{column}
+ \end{columns}
+\end{frame}
+
+\begin{frame}{Freie Software auf dem Smartphone}
+ \begin{columns}
+ \column{6.5cm}
+
+ \textbf{F-Droid}\\
+ Android-Appstore für freie Software
+
+ \vspace{0.5cm}
+
+ \textbf{iOS Open Source Apps}\\
+ \url{https://github.com/dkhamsing/open-source-ios-apps}
+
+ \column{5cm}
+
+ \begin{center}
+ \includegraphics[width=2cm]{img/F-Droid_Logo_2}
+ \par\end{center}
+ \begin{center}
+ \par\end{center}
+ \end{columns}
+\end{frame}
diff --git a/material/content/geraetesicherheit/schutzmoeglichkeiten.tex b/material/content/geraetesicherheit/schutzmoeglichkeiten.tex
new file mode 100644
index 0000000..23afdfe
--- /dev/null
+++ b/material/content/geraetesicherheit/schutzmoeglichkeiten.tex
@@ -0,0 +1,7 @@
+\begin{frame}
+ \frametitle{Wie schütze ich meine Geräte?}
+ \begin{itemize}
+ \item Rechte von Applikationen einschränken (Permissions, Firewall)
+ \item Aktuelle und vertrauenswürdige Software
+ \end{itemize}
+\end{frame}
diff --git a/material/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex b/material/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex
new file mode 100644
index 0000000..2a2a258
--- /dev/null
+++ b/material/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex
@@ -0,0 +1,13 @@
+\begin{frame}
+ \frametitle{Unerwünschte Funktionalität}
+ \begin{center}
+ \includegraphics[width=0.7\textwidth]{img/windows10.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Unerwünschte Funktionalität}
+ \begin{center}
+ \includegraphics[width=7cm]{img/backdoor-apps}
+ \par\end{center}
+\end{frame}
diff --git a/material/content/internet/kommunikationsmodelle.tex b/material/content/internet/kommunikationsmodelle.tex
new file mode 100644
index 0000000..14ce2ce
--- /dev/null
+++ b/material/content/internet/kommunikationsmodelle.tex
@@ -0,0 +1,13 @@
+\begin{frame}
+ \frametitle{Wie kommunizieren wir im Internet?}
+ \begin{center}
+ \includegraphics[height=5cm]{img/c-s.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Föderation}
+ \begin{center}
+ \includegraphics[height=5cm]{img/fed.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/internet/server_kabel_router.tex b/material/content/internet/server_kabel_router.tex
new file mode 100644
index 0000000..6260409
--- /dev/null
+++ b/material/content/internet/server_kabel_router.tex
@@ -0,0 +1,21 @@
+\begin{frame}
+ \frametitle{Server im Rechenzentrum}
+ \begin{center}
+ \includegraphics[height=5cm]{img/data_center.jpg}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Internetknoten (Router)}
+ \begin{center}
+ \includegraphics[height=5cm]{img/internet_cable_map.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Internetknoten (DE-CIX in Frankfurt)}
+ \begin{center}
+ \includegraphics[height=5cm]{img/de_cix.jpg}
+ \\{\small \href{https://de.wikipedia.org/wiki/DE-CIX\#/media/File:DE-CIX\_GERMANY\_-\_Switch\_Rack\_\%286218137120\%29.jpg}{Grafik}: \href{https://creativecommons.org/licenses/by-sa/2.0/}{\cc{by-sa} Stefan Funke}}
+ \end{center}
+\end{frame}
diff --git a/material/content/metadaten/alternative_dienste.tex b/material/content/metadaten/alternative_dienste.tex
new file mode 100644
index 0000000..15d41a7
--- /dev/null
+++ b/material/content/metadaten/alternative_dienste.tex
@@ -0,0 +1,43 @@
+\begin{frame}
+ \frametitle{Alternative Suchmaschinen}
+ \begin{columns}
+ \begin{column}{5cm}
+ \begin{center}
+ \begin{itemize}
+ \item Startpage
+ \vspace{2cm}
+ \item DuckDuckGo
+ \end{itemize}
+ \end{center}
+ \end{column}
+ \begin{column}{5cm}
+ \begin{center}
+ \includegraphics[width=0.5\textwidth]{img/startp_logo.png}
+ \vspace{1cm}
+ \includegraphics[width=0.8\textwidth]{img/duckduckgo.pdf}
+ \end{center}
+ \end{column}
+ \end{columns}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Alternative Kartendienste}
+ \begin{columns}
+ \begin{column}{5cm}
+ \begin{center}
+ \begin{itemize}
+ \item OpenStreetMap
+ \vspace{2cm}
+ \item OpenRouteService
+ \end{itemize}
+ \end{center}
+ \end{column}
+ \begin{column}{5cm}
+ \begin{center}
+ \includegraphics[width=0.5\textwidth]{img/osm.png}
+ \vspace{1cm}
+ \includegraphics[width=0.8\textwidth]{img/openrouteservice.png}
+ \end{center}
+ \end{column}
+ \end{columns}
+\end{frame}
diff --git a/material/content/metadaten/antitracking.tex b/material/content/metadaten/antitracking.tex
new file mode 100644
index 0000000..660c6d2
--- /dev/null
+++ b/material/content/metadaten/antitracking.tex
@@ -0,0 +1,34 @@
+\begin{frame}
+ \frametitle{Disconnect, Privacy Badger (EFF), Ghostery}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/disconnectme.jpg}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Antitracking im Firefox Privatmodus}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/ff_antitrack.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}{Antitracking auf dem Handy}
+ \begin{columns}
+ \column{5.5cm}
+ \footnotesize
+
+ \textbf{Android: Google AdID}\\
+ Google-Einstellungen -> Anzeigen -> Interessensbezogene Werbung deaktivieren\\
+ \vspace{0.5cm}
+
+ \textbf{iOS: Apple IDFA}\\
+ Einstellungen -> Datenschutz -> Werbung -> Kein Ad-Tracking\\
+ \vspace{0.5cm}
+
+ \column{5cm}
+
+ \begin{center}
+ \includegraphics[width=3.5cm]{img/google-adid.png}
+ \par\end{center}
+ \end{columns}
+\end{frame}
diff --git a/material/content/metadaten/location_heatmap.tex b/material/content/metadaten/location_heatmap.tex
new file mode 100644
index 0000000..6fe88b1
--- /dev/null
+++ b/material/content/metadaten/location_heatmap.tex
@@ -0,0 +1,7 @@
+\begin{frame}
+ \frametitle{Google Takeout}
+ \begin{center}
+ \includegraphics[width=0.8\textwidth]<1>{img/google_heat_1.png}
+ \includegraphics[width=0.8\textwidth]<2>{img/google_heat_2.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/metadaten/nextcloud.tex b/material/content/metadaten/nextcloud.tex
new file mode 100644
index 0000000..91b21c4
--- /dev/null
+++ b/material/content/metadaten/nextcloud.tex
@@ -0,0 +1,5 @@
+\begin{frame}{Owncloud/Nextcloud}
+ \begin{center}
+ \includegraphics[width=9cm]{img/owncloud-screenshot.jpg}
+ \end{center}
+\end{frame}
diff --git a/material/content/metadaten/tracking.tex b/material/content/metadaten/tracking.tex
new file mode 100644
index 0000000..9dc30ab
--- /dev/null
+++ b/material/content/metadaten/tracking.tex
@@ -0,0 +1,7 @@
+\begin{frame}
+ \frametitle{Metadaten im WWW}
+ \begin{center}
+ \includegraphics<1>[width=0.7\textwidth]{img/lightbeam_1.png}
+ \includegraphics<2>[width=0.7\textwidth]{img/lightbeam_2.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/metadaten/vds.tex b/material/content/metadaten/vds.tex
new file mode 100644
index 0000000..4395c2c
--- /dev/null
+++ b/material/content/metadaten/vds.tex
@@ -0,0 +1,22 @@
+\begin{frame}
+ \frametitle{Metadaten - Vorratsdatenspeicherung}
+ \begin{itemize}
+ \item Handynetz
+ \begin{itemize}
+ \item Telefonnummern
+ \item Zeitpunkt und Dauer (Telefonate, SMS)
+ \item Funkzelle (Ort)
+ \end{itemize}
+ \item Internet
+ \begin{itemize}
+ \item IP-Adresse (= ungefährer Ort)
+ \item Alle Verbindungen
+ \item Email: Adressen von Sender und Empfänger, Zugriff
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Metadaten - VDS}
+ \includegraphics[height=0.7\textheight]{img/maltespitz.png}
+\end{frame}
diff --git a/material/content/metadaten/zeitstempel.tex b/material/content/metadaten/zeitstempel.tex
new file mode 100644
index 0000000..d0da793
--- /dev/null
+++ b/material/content/metadaten/zeitstempel.tex
@@ -0,0 +1,19 @@
+\begin{frame}
+ \frametitle{Zeitstempel}
+ \begin{center}
+ \only<1>{
+ \includegraphics[width=0.9\textwidth]{img/punch_1.png}
+ \\ \hfill \small Alan, Microblogging
+ }
+
+ \only<2>{
+ \includegraphics[width=0.9\textwidth]{img/punch_2.png}
+ \\ \hfill \small Bob, Microblogging
+ }
+
+ \only<3>{
+ \includegraphics[width=0.9\textwidth]{img/punch_3.png}
+ \\ \hfill \small Charlie, Github
+ }
+ \end{center}
+\end{frame}
diff --git a/material/content/motivation/stasi_vs_nsa.tex b/material/content/motivation/stasi_vs_nsa.tex
new file mode 100644
index 0000000..1c33eec
--- /dev/null
+++ b/material/content/motivation/stasi_vs_nsa.tex
@@ -0,0 +1,21 @@
+\begin{frame}
+ \frametitle{Bundespräsident Gauck zur NSA-Überwachung}
+ \begin{center}
+ ``Wir wissen z.B., dass es nicht so ist, wie bei der Stasi und dem KGB, dass es dicke Aktenbände gibt, wo unsere Gesprächsinhalte alle aufgeschrieben und schön abgeheftet sind. Das ist es nicht.''
+ (Gauck, 30.06.2013 im ZDF-Sommerinterview)
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Stasi vs. NSA}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/akten1.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Stasi vs. NSA}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/akten2.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/soziale_netzwerke/geschaeftsmodelleraten.tex b/material/content/soziale_netzwerke/geschaeftsmodelleraten.tex
new file mode 100644
index 0000000..3187327
--- /dev/null
+++ b/material/content/soziale_netzwerke/geschaeftsmodelleraten.tex
@@ -0,0 +1,35 @@
+\begin{frame}
+ \frametitle{Firmen}
+ \begin{itemize}
+ \item Womit verdienen folgende Firmen ihr Geld?
+ \begin{itemize}
+ \item<2-> Karstadt
+ \item<3-> Amazon
+ \item<4-> Ebay
+ \item<5-> Facebook
+ \end{itemize}
+ \end{itemize}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Gesch"aftsmodelle}
+ \begin{figure}
+ \includegraphics[height=0.7\textheight]{img/business_pigs.jpg}
+ \end{figure}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Soziale Netzwerke}
+
+ \begin{itemize}
+ \item Was haben soziale Netzwerke von euch?\\(am Bsp. von Facebook)
+ \begin{itemize}
+ \item<2-> 82\% Einnahmen aus Werbung
+ \item<3-> 30\% Anteil an "`Facebook-Einkäufen"'
+ \item<4-> durchschnittlich 1€/Profil
+ \item<5-> "`Poweruser"'-Profile deutlich mehr
+ \item<6-> => Mehr Werbegewinn durch personalisierte Werbung
+ \item<7-> Q2 2014 791 Mio Dollar Gewinn
+ \end{itemize}
+ \end{itemize}
+\end{frame}
diff --git a/material/content/soziale_netzwerke/umfrage.tex b/material/content/soziale_netzwerke/umfrage.tex
new file mode 100644
index 0000000..09a4c9b
--- /dev/null
+++ b/material/content/soziale_netzwerke/umfrage.tex
@@ -0,0 +1,14 @@
+\begin{frame}
+ \frametitle{Soziale Netzwerke}
+ \begin{itemize}
+ \item Wer nutzt was?
+ \begin{itemize}
+ \item<2-> Facebook
+ \item<3-> Twitter
+ \item<4-> Whatsapp
+ \item<5-> Instagram
+ \item<6-> Snapchat
+ \item<7-> Andere?
+ \end{itemize}
+ \end{itemize}
+\end{frame}
diff --git a/material/content/soziale_netzwerke/umgangsformen.tex b/material/content/soziale_netzwerke/umgangsformen.tex
new file mode 100644
index 0000000..9d52a37
--- /dev/null
+++ b/material/content/soziale_netzwerke/umgangsformen.tex
@@ -0,0 +1,23 @@
+\begin{frame}
+ \frametitle{Soziale Netzwerke}
+ \begin{itemize}
+ \item<2-> Das Internet vergisst nichts!
+ \item<3-> Was sollte man (nicht) schreiben?
+ \item<5-> Wer soll meine Infos (nicht) erhalten?
+ \item<6-> Beeinträchtigt was ich schreibe andere?
+ \end{itemize}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Umgangsformen}
+ \begin{itemize}
+ \item Wem sollte man was preisgeben (und was eher nicht)?
+ \begin{itemize}
+ \item<2-> "`Roadkill"' von Entertainment for the Braindead ist ein cooles Album
+ \item<3-> Ich gehe am Donnerstag, den 07.06.2012 ins Kino
+ \item<4-> Ich bin heut' echt gut drauf!
+ \item<5-> Ute Meyer war mit Carolin Wittich und Frederik Ulm am Samstag Abend in der Sportsbar und ist danach mit Michael Müller nach Hause gefahren
+ \item<6-> Meine Lehrerin ist voll doof!
+ \end{itemize}
+ \end{itemize}
+\end{frame}
diff --git a/material/content/verhalten/datensparsamkeit.tex b/material/content/verhalten/datensparsamkeit.tex
new file mode 100644
index 0000000..5906067
--- /dev/null
+++ b/material/content/verhalten/datensparsamkeit.tex
@@ -0,0 +1,15 @@
+\begin{frame}
+ \frametitle{Datensparsamkeit}
+ \begin{itemize}
+ \item<2-> Viele Daten zusammen ergeben Profile
+ \item<3-> Verteilen der Daten, Nutzung mehrerer Dienste
+ \item<4-> Werden die Daten gebraucht?
+ \item<5-> Werden echte Daten gebraucht?
+ \begin{itemize}
+ \item<6-> Pseudonymität
+ \item<7-> mailinator.com (Wegwerf-Email-Adresse)
+ \item<8-> frank-geht-ran.de (Wegwerf-Telefonnummer)
+ \item<9-> bugmenot.com (Fake Accounts)
+ \end{itemize}
+ \end{itemize}
+\end{frame}
diff --git a/material/content/verhalten/passworter.tex b/material/content/verhalten/passworter.tex
new file mode 100644
index 0000000..c8566c0
--- /dev/null
+++ b/material/content/verhalten/passworter.tex
@@ -0,0 +1,18 @@
+\begin{frame}
+ \frametitle{Passwörter}
+ \begin{itemize}
+ \item<2-> Keine einfachen Wörter
+ \item<3-> Groß-, Kleinbuchstaben, Ziffern, Sonderzeichen
+ \item<4-> Beispiele:
+ \begin{itemize}
+ \item<5-> dragon
+ \item<6-> (nCuAj.§Tsm!f
+ \item<7-> IchLiebeDich
+ \item<8-> .§)=/)=`
+ \item<9-> qwerty
+ \item<10-> Mks?o/.u,1Psw!
+ \end{itemize}
+ \item<12-> Verschiedene Passwörter nutzen!
+ \item<13-> Passwort-Manager verwenden \\ (z.B. Keepass, Password Safe)
+ \end{itemize}
+\end{frame}
diff --git a/material/content/verschluesselung/e2e.tex b/material/content/verschluesselung/e2e.tex
new file mode 100644
index 0000000..96fed5f
--- /dev/null
+++ b/material/content/verschluesselung/e2e.tex
@@ -0,0 +1,35 @@
+\begin{frame}
+ \frametitle{Ende-zu-Ende-Verschlüsselung}
+ \begin{center}
+ \includegraphics[height=0.8\textheight]{img/enc-e2e.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Email-Verschlüsselung (E2E): PGP}
+ \begin{center}
+ \includegraphics[height=0.5\textheight]{img/emailselfdefense.png}
+ \begin{itemize}
+ \item https://emailselfdefense.fsf.org/de/
+ \end{itemize}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Jabber: Conversations, ChatSecure}
+ \begin{center}
+ \includegraphics[height=6cm]{img/conversations.png}
+ \hspace{0.5cm}
+ \includegraphics[height=6cm]{img/chatsecure.png}
+ \end{center}
+ \url{https://xmpp.net/directory.php}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Signal}
+ \begin{center}
+ \includegraphics[height=6cm]{img/signal1.png}
+ \hspace{0.5cm}
+ \includegraphics[height=6cm]{img/signal2.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/verschluesselung/https_everywhere.tex b/material/content/verschluesselung/https_everywhere.tex
new file mode 100644
index 0000000..892493f
--- /dev/null
+++ b/material/content/verschluesselung/https_everywhere.tex
@@ -0,0 +1,6 @@
+\begin{frame}
+ \frametitle{HTTPS Everywhere}
+ \begin{center}
+ \includegraphics[height=5cm]{img/https-everywhere.png}
+ \end{center}
+\end{frame}
diff --git a/material/content/verschluesselung/messenger_vergleich.tex b/material/content/verschluesselung/messenger_vergleich.tex
new file mode 100644
index 0000000..cadf3ab
--- /dev/null
+++ b/material/content/verschluesselung/messenger_vergleich.tex
@@ -0,0 +1,19 @@
+\begin{frame}
+ \frametitle{Vergleich Messenger}
+ \small
+ \begin{tabular}{|c|c|c|c|c|c|}
+ \hline
+ & Whatsapp & Threema & Telegram & Signal & Jabber \\
+ \hline
+ Verschlüsselung & \cellcolor{green} & \cellcolor{yellow} & \cellcolor{orange} & \cellcolor{green} & \cellcolor{green} \\
+ \hline
+ Vertrauensw. & \cellcolor{red} & \cellcolor{yellow} & \cellcolor{orange} & \cellcolor{green} & \cellcolor{green} \\
+ \hline
+ Dezentr. & \cellcolor{red} & \cellcolor{red} & \cellcolor{red} & \cellcolor{orange} & \cellcolor{green} \\
+ \hline
+ Open Source & \cellcolor{red} & \cellcolor{orange} & \cellcolor{yellow} & \cellcolor{green} & \cellcolor{green} \\
+ \hline
+ Mobileignung & \cellcolor{green} & \cellcolor{green} & \cellcolor{green} & \cellcolor{green} & \cellcolor{yellow} \\
+ \hline
+ \end{tabular}
+\end{frame}
diff --git a/material/content/verschluesselung/ssl.tex b/material/content/verschluesselung/ssl.tex
new file mode 100644
index 0000000..148c813
--- /dev/null
+++ b/material/content/verschluesselung/ssl.tex
@@ -0,0 +1,20 @@
+\begin{frame}
+ \frametitle{Transportwegverschlüsselung}
+ \begin{center}
+ \includegraphics[height=0.8\textheight]{img/enc-transport.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{SSL im Browser}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/ssl_special.png}
+ \end{center}
+\end{frame}
+
+\begin{frame}
+ \frametitle{Ungültiges Zertifikat}
+ \begin{center}
+ \includegraphics[height=0.7\textheight]{img/ssl_badcert.png}
+ \end{center}
+\end{frame}
diff --git a/material/img/502400-64.png b/material/img/502400-64.png
new file mode 100644
index 0000000..8ec92d6
Binary files /dev/null and b/material/img/502400-64.png differ
diff --git a/material/img/Beta-badge.pdf b/material/img/Beta-badge.pdf
new file mode 100644
index 0000000..f74bf80
Binary files /dev/null and b/material/img/Beta-badge.pdf differ
diff --git a/material/img/Beta-badge.svg b/material/img/Beta-badge.svg
new file mode 100644
index 0000000..afedd3a
--- /dev/null
+++ b/material/img/Beta-badge.svg
@@ -0,0 +1,199 @@
+
+
+
+
diff --git a/material/img/F-Droid_Logo_2.pdf b/material/img/F-Droid_Logo_2.pdf
new file mode 100644
index 0000000..bb73326
Binary files /dev/null and b/material/img/F-Droid_Logo_2.pdf differ
diff --git a/material/img/Gnupg_logo.pdf b/material/img/Gnupg_logo.pdf
new file mode 100644
index 0000000..a0b138a
Binary files /dev/null and b/material/img/Gnupg_logo.pdf differ
diff --git a/material/img/Gnupg_logo.svg b/material/img/Gnupg_logo.svg
new file mode 100644
index 0000000..28b72d1
--- /dev/null
+++ b/material/img/Gnupg_logo.svg
@@ -0,0 +1,22 @@
+
+
+
\ No newline at end of file
diff --git a/material/img/Internet_map_1024.jpg b/material/img/Internet_map_1024.jpg
new file mode 100644
index 0000000..63ee4fa
Binary files /dev/null and b/material/img/Internet_map_1024.jpg differ
diff --git a/material/img/LibreOffice.pdf b/material/img/LibreOffice.pdf
new file mode 100644
index 0000000..a1f6ba5
Binary files /dev/null and b/material/img/LibreOffice.pdf differ
diff --git a/material/img/Mozilla_Thunderbird_3.png b/material/img/Mozilla_Thunderbird_3.png
new file mode 100644
index 0000000..d9e735f
Binary files /dev/null and b/material/img/Mozilla_Thunderbird_3.png differ
diff --git a/material/img/Replicant_logo_alpha.pdf b/material/img/Replicant_logo_alpha.pdf
new file mode 100644
index 0000000..ed28fb5
Binary files /dev/null and b/material/img/Replicant_logo_alpha.pdf differ
diff --git a/material/img/TextSecure_Icon.png b/material/img/TextSecure_Icon.png
new file mode 100644
index 0000000..9ff2982
Binary files /dev/null and b/material/img/TextSecure_Icon.png differ
diff --git a/material/img/Tux.pdf b/material/img/Tux.pdf
new file mode 100644
index 0000000..5497b75
Binary files /dev/null and b/material/img/Tux.pdf differ
diff --git a/material/img/akten1.png b/material/img/akten1.png
new file mode 100644
index 0000000..29a9938
Binary files /dev/null and b/material/img/akten1.png differ
diff --git a/material/img/akten2.png b/material/img/akten2.png
new file mode 100644
index 0000000..eece3de
Binary files /dev/null and b/material/img/akten2.png differ
diff --git a/material/img/anonymous.jpg b/material/img/anonymous.jpg
new file mode 100644
index 0000000..d3b4573
Binary files /dev/null and b/material/img/anonymous.jpg differ
diff --git a/material/img/asym_encryption.png b/material/img/asym_encryption.png
new file mode 100644
index 0000000..fa476a0
Binary files /dev/null and b/material/img/asym_encryption.png differ
diff --git a/material/img/auth.png b/material/img/auth.png
new file mode 100644
index 0000000..f51ad6e
Binary files /dev/null and b/material/img/auth.png differ
diff --git a/material/img/backdoor-android.png b/material/img/backdoor-android.png
new file mode 100644
index 0000000..8bf7ace
Binary files /dev/null and b/material/img/backdoor-android.png differ
diff --git a/material/img/backdoor-apps.png b/material/img/backdoor-apps.png
new file mode 100644
index 0000000..47faf15
Binary files /dev/null and b/material/img/backdoor-apps.png differ
diff --git a/material/img/backdoor-av.png b/material/img/backdoor-av.png
new file mode 100644
index 0000000..f2ddc39
Binary files /dev/null and b/material/img/backdoor-av.png differ
diff --git a/material/img/backdoor-flashlight.png b/material/img/backdoor-flashlight.png
new file mode 100644
index 0000000..e4e658e
Binary files /dev/null and b/material/img/backdoor-flashlight.png differ
diff --git a/material/img/backdoor-ios.png b/material/img/backdoor-ios.png
new file mode 100644
index 0000000..8664288
Binary files /dev/null and b/material/img/backdoor-ios.png differ
diff --git a/material/img/backdoor-samsung.png b/material/img/backdoor-samsung.png
new file mode 100644
index 0000000..23b759c
Binary files /dev/null and b/material/img/backdoor-samsung.png differ
diff --git a/material/img/backdoor-samsung2.png b/material/img/backdoor-samsung2.png
new file mode 100644
index 0000000..b3450b9
Binary files /dev/null and b/material/img/backdoor-samsung2.png differ
diff --git a/material/img/backdoor-windows.png b/material/img/backdoor-windows.png
new file mode 100644
index 0000000..17cfaca
Binary files /dev/null and b/material/img/backdoor-windows.png differ
diff --git a/material/img/backdoor-windows2.png b/material/img/backdoor-windows2.png
new file mode 100644
index 0000000..22ff005
Binary files /dev/null and b/material/img/backdoor-windows2.png differ
diff --git a/material/img/backdoor_gb.png b/material/img/backdoor_gb.png
new file mode 100644
index 0000000..86f4af4
Binary files /dev/null and b/material/img/backdoor_gb.png differ
diff --git a/material/img/bitmessagelogo.png b/material/img/bitmessagelogo.png
new file mode 100644
index 0000000..4f2b76b
Binary files /dev/null and b/material/img/bitmessagelogo.png differ
diff --git a/material/img/bote.jpg b/material/img/bote.jpg
new file mode 100644
index 0000000..b9728bf
Binary files /dev/null and b/material/img/bote.jpg differ
diff --git a/material/img/bridge1.png b/material/img/bridge1.png
new file mode 100644
index 0000000..13f1a91
Binary files /dev/null and b/material/img/bridge1.png differ
diff --git a/material/img/bridge2.png b/material/img/bridge2.png
new file mode 100644
index 0000000..45e1739
Binary files /dev/null and b/material/img/bridge2.png differ
diff --git a/material/img/business_pigs.jpg b/material/img/business_pigs.jpg
new file mode 100644
index 0000000..80028a2
Binary files /dev/null and b/material/img/business_pigs.jpg differ
diff --git a/material/img/by-nc-nd.png b/material/img/by-nc-nd.png
new file mode 100644
index 0000000..49f272f
Binary files /dev/null and b/material/img/by-nc-nd.png differ
diff --git a/material/img/by-nc-sa.png b/material/img/by-nc-sa.png
new file mode 100644
index 0000000..0f2a0f1
Binary files /dev/null and b/material/img/by-nc-sa.png differ
diff --git a/material/img/by-sa.png b/material/img/by-sa.png
new file mode 100644
index 0000000..f0a944e
Binary files /dev/null and b/material/img/by-sa.png differ
diff --git a/material/img/by.png b/material/img/by.png
new file mode 100644
index 0000000..822491e
Binary files /dev/null and b/material/img/by.png differ
diff --git a/material/img/c-s.png b/material/img/c-s.png
new file mode 100644
index 0000000..166904c
Binary files /dev/null and b/material/img/c-s.png differ
diff --git a/material/img/c3d2.pdf b/material/img/c3d2.pdf
new file mode 100644
index 0000000..944cde3
--- /dev/null
+++ b/material/img/c3d2.pdf
@@ -0,0 +1,69 @@
+%PDF-1.5
+%
+3 0 obj
+<< /Length 4 0 R
+ /Filter /FlateDecode
+>>
+stream
+xUA E9EN$$#]3J3l{MᗈD"~g?FZy
+2QeRFu
gCaB}HɻP1s9YĴtBkXBȆ?sFG`
G+2u!MpU |Ѝ>aa
+endstream
+endobj
+4 0 obj
+ 162
+endobj
+2 0 obj
+<<
+ /ExtGState <<
+ /a0 << /CA 1 /ca 1 >>
+ >>
+>>
+endobj
+5 0 obj
+<< /Type /Page
+ /Parent 1 0 R
+ /MediaBox [ 0 0 594.280029 194.889999 ]
+ /Contents 3 0 R
+ /Group <<
+ /Type /Group
+ /S /Transparency
+ /I true
+ /CS /DeviceRGB
+ >>
+ /Resources 2 0 R
+>>
+endobj
+1 0 obj
+<< /Type /Pages
+ /Kids [ 5 0 R ]
+ /Count 1
+>>
+endobj
+6 0 obj
+<< /Creator (cairo 1.12.16 (http://cairographics.org))
+ /Producer (cairo 1.12.16 (http://cairographics.org))
+>>
+endobj
+7 0 obj
+<< /Type /Catalog
+ /Pages 1 0 R
+>>
+endobj
+xref
+0 8
+0000000000 65535 f
+0000000576 00000 n
+0000000276 00000 n
+0000000015 00000 n
+0000000254 00000 n
+0000000348 00000 n
+0000000641 00000 n
+0000000770 00000 n
+trailer
+<< /Size 8
+ /Root 7 0 R
+ /Info 6 0 R
+>>
+startxref
+822
+%%EOF
diff --git a/material/img/c3d2.svg b/material/img/c3d2.svg
new file mode 100644
index 0000000..42fae99
--- /dev/null
+++ b/material/img/c3d2.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/material/img/c3d2_logo.png b/material/img/c3d2_logo.png
new file mode 100644
index 0000000..e565c9e
Binary files /dev/null and b/material/img/c3d2_logo.png differ
diff --git a/material/img/certificate.png b/material/img/certificate.png
new file mode 100644
index 0000000..55e6491
Binary files /dev/null and b/material/img/certificate.png differ
diff --git a/material/img/chaosknoten.png b/material/img/chaosknoten.png
new file mode 100644
index 0000000..a61c0a0
Binary files /dev/null and b/material/img/chaosknoten.png differ
diff --git a/material/img/chatsecure.png b/material/img/chatsecure.png
new file mode 100644
index 0000000..b308a96
Binary files /dev/null and b/material/img/chatsecure.png differ
diff --git a/material/img/client-server-graph.png b/material/img/client-server-graph.png
new file mode 100644
index 0000000..a845e26
Binary files /dev/null and b/material/img/client-server-graph.png differ
diff --git a/material/img/cms.png b/material/img/cms.png
new file mode 100644
index 0000000..c585862
Binary files /dev/null and b/material/img/cms.png differ
diff --git a/material/img/compilation-process.png b/material/img/compilation-process.png
new file mode 100644
index 0000000..5ee306c
Binary files /dev/null and b/material/img/compilation-process.png differ
diff --git a/material/img/conversations.png b/material/img/conversations.png
new file mode 100644
index 0000000..87f7cfa
Binary files /dev/null and b/material/img/conversations.png differ
diff --git a/material/img/data_center.jpg b/material/img/data_center.jpg
new file mode 100644
index 0000000..78598ca
Binary files /dev/null and b/material/img/data_center.jpg differ
diff --git a/material/img/daten.png b/material/img/daten.png
new file mode 100644
index 0000000..81aeddb
Binary files /dev/null and b/material/img/daten.png differ
diff --git a/material/img/de_cix.jpg b/material/img/de_cix.jpg
new file mode 100644
index 0000000..8669adb
Binary files /dev/null and b/material/img/de_cix.jpg differ
diff --git a/material/img/digitale_selbstverteidigung.png b/material/img/digitale_selbstverteidigung.png
new file mode 100644
index 0000000..382fd83
Binary files /dev/null and b/material/img/digitale_selbstverteidigung.png differ
diff --git a/material/img/direkt.png b/material/img/direkt.png
new file mode 100644
index 0000000..d18bf98
Binary files /dev/null and b/material/img/direkt.png differ
diff --git a/material/img/disconnect.png b/material/img/disconnect.png
new file mode 100644
index 0000000..fc93a48
Binary files /dev/null and b/material/img/disconnect.png differ
diff --git a/material/img/disconnectme.jpg b/material/img/disconnectme.jpg
new file mode 100644
index 0000000..f9d0ab3
Binary files /dev/null and b/material/img/disconnectme.jpg differ
diff --git a/material/img/duckduckgo.pdf b/material/img/duckduckgo.pdf
new file mode 100644
index 0000000..18a026d
Binary files /dev/null and b/material/img/duckduckgo.pdf differ
diff --git a/material/img/duckduckgo.svg b/material/img/duckduckgo.svg
new file mode 100644
index 0000000..a8d69aa
--- /dev/null
+++ b/material/img/duckduckgo.svg
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
\ No newline at end of file
diff --git a/material/img/emailselfdefense.png b/material/img/emailselfdefense.png
new file mode 100644
index 0000000..ef52c5b
Binary files /dev/null and b/material/img/emailselfdefense.png differ
diff --git a/material/img/enc-e2e.png b/material/img/enc-e2e.png
new file mode 100644
index 0000000..5af150e
Binary files /dev/null and b/material/img/enc-e2e.png differ
diff --git a/material/img/enc-transport.png b/material/img/enc-transport.png
new file mode 100644
index 0000000..672521a
Binary files /dev/null and b/material/img/enc-transport.png differ
diff --git a/material/img/facebook_whatsapp.png b/material/img/facebook_whatsapp.png
new file mode 100644
index 0000000..7576069
Binary files /dev/null and b/material/img/facebook_whatsapp.png differ
diff --git a/material/img/fed-all.png b/material/img/fed-all.png
new file mode 100644
index 0000000..a515376
Binary files /dev/null and b/material/img/fed-all.png differ
diff --git a/material/img/fed-bad-guy.png b/material/img/fed-bad-guy.png
new file mode 100644
index 0000000..c9c837e
Binary files /dev/null and b/material/img/fed-bad-guy.png differ
diff --git a/material/img/fed-clients-comm.png b/material/img/fed-clients-comm.png
new file mode 100644
index 0000000..10f1d46
Binary files /dev/null and b/material/img/fed-clients-comm.png differ
diff --git a/material/img/fed-clients.png b/material/img/fed-clients.png
new file mode 100644
index 0000000..5c72f6c
Binary files /dev/null and b/material/img/fed-clients.png differ
diff --git a/material/img/fed-end-to-end.png b/material/img/fed-end-to-end.png
new file mode 100644
index 0000000..3eab5f0
Binary files /dev/null and b/material/img/fed-end-to-end.png differ
diff --git a/material/img/fed-none.png b/material/img/fed-none.png
new file mode 100644
index 0000000..f51bce5
Binary files /dev/null and b/material/img/fed-none.png differ
diff --git a/material/img/fed-social.png b/material/img/fed-social.png
new file mode 100644
index 0000000..c9104f7
Binary files /dev/null and b/material/img/fed-social.png differ
diff --git a/material/img/fed.png b/material/img/fed.png
new file mode 100644
index 0000000..0a5c280
Binary files /dev/null and b/material/img/fed.png differ
diff --git a/material/img/ff_antitrack.png b/material/img/ff_antitrack.png
new file mode 100644
index 0000000..a73af6c
Binary files /dev/null and b/material/img/ff_antitrack.png differ
diff --git a/material/img/fingerabdruck.jpg b/material/img/fingerabdruck.jpg
new file mode 100644
index 0000000..52df633
Binary files /dev/null and b/material/img/fingerabdruck.jpg differ
diff --git a/material/img/firefox.png b/material/img/firefox.png
new file mode 100644
index 0000000..1d22450
Binary files /dev/null and b/material/img/firefox.png differ
diff --git a/material/img/formatstring.png b/material/img/formatstring.png
new file mode 100644
index 0000000..e603cae
Binary files /dev/null and b/material/img/formatstring.png differ
diff --git a/material/img/gnome.png b/material/img/gnome.png
new file mode 100644
index 0000000..45372ba
Binary files /dev/null and b/material/img/gnome.png differ
diff --git a/material/img/google-adid.png b/material/img/google-adid.png
new file mode 100644
index 0000000..65d2a4e
Binary files /dev/null and b/material/img/google-adid.png differ
diff --git a/material/img/google_heat_1.png b/material/img/google_heat_1.png
new file mode 100644
index 0000000..6cdb481
Binary files /dev/null and b/material/img/google_heat_1.png differ
diff --git a/material/img/google_heat_2.png b/material/img/google_heat_2.png
new file mode 100644
index 0000000..4bdee23
Binary files /dev/null and b/material/img/google_heat_2.png differ
diff --git a/material/img/gpg.mp4 b/material/img/gpg.mp4
new file mode 100644
index 0000000..7592f12
Binary files /dev/null and b/material/img/gpg.mp4 differ
diff --git a/material/img/gpgvideo.png b/material/img/gpgvideo.png
new file mode 100644
index 0000000..87d2751
Binary files /dev/null and b/material/img/gpgvideo.png differ
diff --git a/material/img/heise-merkel.png b/material/img/heise-merkel.png
new file mode 100644
index 0000000..919b1ef
Binary files /dev/null and b/material/img/heise-merkel.png differ
diff --git a/material/img/heise_lavabit.png b/material/img/heise_lavabit.png
new file mode 100644
index 0000000..c0a22e6
Binary files /dev/null and b/material/img/heise_lavabit.png differ
diff --git a/material/img/https-everywhere.png b/material/img/https-everywhere.png
new file mode 100644
index 0000000..b6839e6
Binary files /dev/null and b/material/img/https-everywhere.png differ
diff --git a/material/img/internet_cable_map.png b/material/img/internet_cable_map.png
new file mode 100644
index 0000000..d581e7e
Binary files /dev/null and b/material/img/internet_cable_map.png differ
diff --git a/material/img/internet_dog.jpg b/material/img/internet_dog.jpg
new file mode 100644
index 0000000..6879e4f
Binary files /dev/null and b/material/img/internet_dog.jpg differ
diff --git a/material/img/internetmap-abhoeren-prism-ssl.pdf b/material/img/internetmap-abhoeren-prism-ssl.pdf
new file mode 100644
index 0000000..4408612
Binary files /dev/null and b/material/img/internetmap-abhoeren-prism-ssl.pdf differ
diff --git a/material/img/internetmap-abhoeren-prism-ssl.svg b/material/img/internetmap-abhoeren-prism-ssl.svg
new file mode 100644
index 0000000..315f9b3
--- /dev/null
+++ b/material/img/internetmap-abhoeren-prism-ssl.svg
@@ -0,0 +1,29928 @@
+
+
+
+