8 files changed, 29 insertions, 26 deletions

diff --git a/Makefile.in b/Makefile.in
index d9343d149..bcf9d613f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,7 @@ realinstall:
         install -c -m 0644 etc/conkeror.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 etc/unbound.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 etc/dnscrypt-proxy.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 etc/whitelist-common.inc $(DESTDIR)/$(sysconfdir)/firejail/.
         bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
         # man pages
         rm -f firejail.1.gz
diff --git a/README b/README
index ffb28134b..5f03b4af3 100644
--- a/README
+++ b/README
@@ -18,6 +18,10 @@ License: GPL v2
 Firejail Authors:
 
 netblue30 (netblue30@yahoo.com)
+Andrey Alekseenko (https://github.com/al42and)
+        - fixed Skype profile
+Ondra Nekola (https://github.com/satai)
+        - allow firefox theming with non-global themes
 emacsomancer (https://github.com/emacsomancer)
         - added profile for Conkeror browser
 Daan Bakker (https://github.com/dbakker)
diff --git a/README.md b/README.md
index 6d244f8da..7802d0333 100644
--- a/README.md
+++ b/README.md
@@ -44,19 +44,22 @@ whitelist ~/Загрузки (new in 0.9.35)
 whitelist ~/dwhelper (0.9.34)
 whitelist ~/.zotero (0.9.34)
 whitelist ~/.lastpass (0.9.34)
-whitelist ~/.gtkrc-2.0 (0.9.34)
-whitelist ~/.config/gtk-3.0 (new in 0.9.35)
 whitelist ~/.vimperatorrc (0.9.34)
 whitelist ~/.vimperator (0.9.34)
 whitelist ~/.pentadactylrc (0.9.34)
 whitelist ~/.pentadactyl (0.9.34)
-
-# common
+include /etc/firejail/whitelist-common.inc
+`````
+/etc/firejail/whitelist-common.inc
+`````
 whitelist ~/.fonts (0.9.34)
 whitelist ~/.fonts.d (0.9.34)
 whitelist ~/.fontconfig (0.9.34)
 whitelist ~/.fonts.conf (0.9.34)
 whitelist ~/.fonts.conf.d (0.9.34)
+whitelist ~/.gtkrc-2.0 (0.9.34)
+whitelist ~/.config/gtk-3.0 (new in 0.9.35)
+whitelist ~/.themes/ (new in 0.9.35)
 `````
 If you are using a plugin or extension that requires other directories, please open a new issue: https://github.com/netblue30/firejail/issues
 
diff --git a/etc/chromium.profile b/etc/chromium.profile
index 077ec62d0..980e539d5 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -12,10 +12,5 @@ netfilter
 whitelist ~/Downloads
 whitelist ~/Загрузки
 whitelist ~/.config/chromium
+include /etc/firejail/whitelist-common.inc
 
-# common
-whitelist ~/.fonts
-whitelist ~/.fonts.d
-whitelist ~/.fontconfig
-whitelist ~/.fonts.conf
-whitelist ~/.fonts.conf.d
diff --git a/etc/firefox.profile b/etc/firefox.profile
index 954068d47..809363fd6 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -15,17 +15,8 @@ whitelist ~/Загрузки
 whitelist ~/dwhelper
 whitelist ~/.zotero
 whitelist ~/.lastpass
-whitelist ~/.gtkrc-2.0
-whitelist ~/.config/gtk-3.0
-whitelist ~/.themes/
 whitelist ~/.vimperatorrc
 whitelist ~/.vimperator
 whitelist ~/.pentadactylrc
 whitelist ~/.pentadactyl
-
-# common
-whitelist ~/.fonts
-whitelist ~/.fonts.d
-whitelist ~/.fontconfig
-whitelist ~/.fonts.conf
-whitelist ~/.fonts.conf.d
+include /etc/firejail/whitelist-common.inc
\ No newline at end of file
diff --git a/etc/spotify.profile b/etc/spotify.profile
index f77f900cf..414660857 100644
--- a/etc/spotify.profile
+++ b/etc/spotify.profile
@@ -10,6 +10,7 @@ include /etc/firejail/disable-devel.inc
 whitelist ${HOME}/.config/spotify
 whitelist ${HOME}/.local/share/spotify
 whitelist ${HOME}/.cache/spotify
+include /etc/firejail/whitelist-common.inc
 
 caps.drop all
 seccomp
@@ -17,9 +18,3 @@ protocol unix,inet,inet6
 netfilter
 noroot
 
-# common
-whitelist ~/.fonts
-whitelist ~/.fonts.d
-whitelist ~/.fontconfig
-whitelist ~/.fonts.conf
-whitelist ~/.fonts.conf.d
diff --git a/etc/whitelist-common.inc b/etc/whitelist-common.inc
new file mode 100644
index 000000000..e0c2975df
--- /dev/null
+++ b/etc/whitelist-common.inc
@@ -0,0 +1,13 @@
+# common whitelist for all profiles
+
+# fonts
+whitelist ~/.fonts
+whitelist ~/.fonts.d
+whitelist ~/.fontconfig
+whitelist ~/.fonts.conf
+whitelist ~/.fonts.conf.d
+
+# gtk
+whitelist ~/.gtkrc-2.0
+whitelist ~/.config/gtk-3.0
+whitelist ~/.themes/
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 60f375cb6..c78dab441 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -41,3 +41,4 @@
 /etc/firejail/conkeror.profile
 /etc/firejail/unbound.profile
 /etc/firejail/dnscrypt-proxy.profile
+etc/whitelist-common.inc