diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3a24117
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index edd5119..33f7cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 Makefile
 output
 __*/
+
+remote_credentials.py
diff --git a/.gitmodules b/.gitmodules
index 67122c0..952742d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "pelican-plugins"]
 	path = pelican-plugins
 	url = https://github.com/getpelican/pelican-plugins
+[submodule "theme/Flex"]
+	path = theme/Flex
+	url = https://github.com/alexandrevicenzi/Flex/
diff --git a/pelicanconf.py b/pelicanconf.py
index ab9d58f..b78a5e6 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -33,6 +33,7 @@ DEFAULT_PAGINATION = 10
 # Uncomment following line if you want document-relative URLs when developing
 #RELATIVE_URLS = True
 
+# Multilang
 PLUGIN_PATHS = ['pelican-plugins']
 PLUGINS = ['i18n_subsites']
 
@@ -41,3 +42,6 @@ I18N_SUBSITES = {
             'SITENAME': 'schmittlauch',
             }
         }
+
+# Theming and templates
+THEME = './theme/Flex'
diff --git a/theme/Flex b/theme/Flex
new file mode 160000
index 0000000..ef20ea1
--- /dev/null
+++ b/theme/Flex
@@ -0,0 +1 @@
+Subproject commit ef20ea1fb3af763e23179a9a08cc9c40260eee52