diff --git a/filesystem-extra/PKGBUILD b/filesystem-extra/PKGBUILD
index cbb0230..b458fb9 100644
--- a/filesystem-extra/PKGBUILD
+++ b/filesystem-extra/PKGBUILD
@@ -2,15 +2,15 @@
 
 pkgname=filesystem-extra
 pkgver=2013.04
-pkgrel=4
+pkgrel=6
 arch=('any')
 pkgdesc="Extra filesystem"
 groups=('extra')
 install=extra.install
 source=('extra.conf' 'extra.profile' 'extra.tcsh')
 md5sums=('b0f054b6c5f809927817b345351ed7b6'
-         '1b6239c9831a902984bfae2ef225dee6'
-         '92f34257b49c2b15c7205222c4c22d5b')
+         '820748a27c22315e23ab22ddf4be7880'
+         '3ab04e0f2ac65f4834e1861d65bbf83d')
 
 package() {
   cd ${pkgdir}
diff --git a/filesystem-extra/extra.profile b/filesystem-extra/extra.profile
index cdaa6fb..4547abb 100644
--- a/filesystem-extra/extra.profile
+++ b/filesystem-extra/extra.profile
@@ -13,9 +13,4 @@ if [ ! -z $XDG_CONFIG_DIRS ]; then
 else 
   export XDG_CONFIG_DIRS=$EXTRADIR/etc/xdg 
 fi
-if [ ! -z $MOZ_PLUGIN_PATH ]; then
-  export XMOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$EXTRADIR/usr/lib/mozilla/plugins
-else
-  export MOZ_PLUGIN_PATH=$EXTRADIR/usr/lib/mozilla/plugins
-fi
 
diff --git a/filesystem-extra/extra.tcsh b/filesystem-extra/extra.tcsh
index b64b711..a29a068 100644
--- a/filesystem-extra/extra.tcsh
+++ b/filesystem-extra/extra.tcsh
@@ -13,8 +13,3 @@ if ( ! $?XDG_CONFIG_DIRS ) then
 else
   setenv XDG_CONFIG_DIRS $XDG_CONFIG_DIRS:$EXTRADIR/etc/xdg
 endif
-if ( ! $MOZ_PLUGIN_PATH ) then
-  setenv MOZ_PLUGIN_PATH=$EXTRADIR/usr/lib/mozilla/plugins
-else
-  setenv MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$EXTRADIR/usr/lib/mozilla/plugins
-endif
diff --git a/flashplugin/PKGBUILD b/flashplugin/PKGBUILD
index 4c65036..389b1f3 100644
--- a/flashplugin/PKGBUILD
+++ b/flashplugin/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=flashplugin
 _licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf'
 pkgver=11.2.202.275
-pkgrel=2
+pkgrel=3
 pkgdesc='Adobe Flash Player'
 url='http://labs.adobe.com/technologies/flashplatformruntimes/flashplayer11/'
 arch=('x86_64')
@@ -21,15 +21,20 @@ md5sums=('d0a35620a3e54f6fa9e4c64b7c3d095f'
 
 package () {
     cd ${srcdir}
+   
+    # Plugin install in /extra
     install -Dm755 libflashplayer.so "${pkgdir}/extra/usr/lib/mozilla/plugins/libflashplayer.so"
-    install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "${pkgdir}/extra/usr/lib/kde4/kcm_adobe_flash_player.so"
-    install -Dm755 usr/bin/flash-player-properties "${pkgdir}/extra/usr/bin/flash-player-properties"
-    for i in 16x16 22x22 24x24 32x32 48x48; do
-        install -Dm644 usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
-            "${pkgdir}/extra/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png"
-    done
-    install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/extra/usr/share/applications/flash-player-properties.desktop"
-    install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "${pkgdir}/extra/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
     install -Dm644 "${_licensefile}" "${pkgdir}/extra/usr/share/licenses/${pkgname}/LICENSE.pdf"
     install -Dm644 ${srcdir}/mms.cfg "${pkgdir}/extra/etc/adobe/mms.cfg"
+
+
+    # KCM install in /usr
+    install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "${pkgdir}/usr/lib/kde4/kcm_adobe_flash_player.so"
+    install -Dm755 usr/bin/flash-player-properties "${pkgdir}/usr/bin/flash-player-properties"
+    for i in 16x16 22x22 24x24 32x32 48x48; do
+        install -Dm644 usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \
+            "${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png"
+    done
+    install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/usr/share/applications/flash-player-properties.desktop"
+    install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "${pkgdir}/usr/share/kde4/services/kcm_adobe_flash_player.desktop"
 }
diff --git a/flashplugin/flashplugin.install b/flashplugin/flashplugin.install
index 8018fcb..a070908 100644
--- a/flashplugin/flashplugin.install
+++ b/flashplugin/flashplugin.install
@@ -1,5 +1,5 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
     echo " >> "
     echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips,"
     echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg."