diff --git a/gajim.nsi b/gajim.nsi
index 25df14534..ffbd294ef 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -224,18 +224,8 @@ Section "Gtk+ 2" SecGtk
 	SetOutPath "$INSTDIR\bin\gtk"
 	File /r "bin\gtk\bin"
 	File /r "bin\gtk\etc"
-	SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
-	File /r "bin\gtk\lib\gtk-2.0\2.10.0\loaders"
-	SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines"
-	File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
-	File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
-	File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll"
-	SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
-	SetOutPath "$INSTDIR\bin\gtk\lib"
-	File "bin\gtk\lib\charset.alias"
-	SetOutPath "$INSTDIR\bin\gtk\share"
-	File /r "bin\gtk\share\gtkthemeselector"
-	File /r "bin\gtk\share\xml"
+	File /r "bin\gtk\lib"
+	File /r "bin\gtk\share"
 SectionEnd
 
 Section "Plugins" SecPlugins
@@ -527,128 +517,8 @@ SectionEnd
 Section "Uninstall"
 	RMDir /r "$INSTDIR\bin\gtk\bin"
 	RMDir /r "$INSTDIR\bin\gtk\etc"
-	RMDir /r "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\loaders"
-	Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
-	Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
-	Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll"
-	Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libwimp.dll"
-	RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines"
-	RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
-	RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0"
-	Delete "$INSTDIR\bin\gtk\lib\charset.alias"
-	RMDir "$INSTDIR\bin\gtk\lib"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\de"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\es"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\fr"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\it"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ru"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\af"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\am"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ang"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ar"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\as"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\az"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\be"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\bg"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\bn"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\br"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\bs"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ca"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\cs"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\cy"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\da"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\dz"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\el"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\eo"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\et"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\eu"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\fa"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\fi"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ga"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\gl"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\gu"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\he"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\hi"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\hr"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\hu"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\hy"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ia"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\id"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\io"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\is"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ja"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ka"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\kn"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ko"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ku"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\li"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\lt"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\lv"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mai"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mg"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mi"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mk"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ml"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mn"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\mr"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ms"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\nb"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ne"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\nl"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\nn"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\nso"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\oc"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\or"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\pa"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\pl"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ps"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\pt"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ro"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\rw"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\si"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sk"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sl"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sq"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\sv"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ta"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\te"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\th"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\tk"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\tl"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\tr"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\tt"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ug"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\uk"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\ur"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\uz"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\vi"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\wa"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\xh"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\yi"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK"
-	RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW"
-	RMDir "$INSTDIR\bin\gtk\share\locale"
-	RMDir /r "$INSTDIR\bin\gtk\share\themes\Clearlooks"
-	RMDir /r "$INSTDIR\bin\gtk\share\themes\Default"
-	RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy"
-	RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy-js"
-	RMDir /r "$INSTDIR\bin\gtk\share\themes\MS-Windows"
-	RMDir "$INSTDIR\bin\gtk\share\themes"
-	RMDir /r "$INSTDIR\bin\gtk\share\gtkthemeselector"
-	RMDir /r "$INSTDIR\bin\gtk\share\xml"
-	RMDir "$INSTDIR\bin\gtk\share"
+	RMDir /r "$INSTDIR\bin\gtk\lib"
+	RMDir /r "$INSTDIR\bin\gtk\share"
 	RMDir "$INSTDIR\bin\gtk"
 	Delete "$INSTDIR\bin\_bsddb.pyd"
 	Delete "$INSTDIR\bin\_ctypes.pyd"