diff --git a/include/ResourceItem.h b/include/ResourceItem.h
index 594b6b968..a9827c627 100644
--- a/include/ResourceItem.h
+++ b/include/ResourceItem.h
@@ -55,7 +55,7 @@ public:
 		TypeSample,
 		TypeSoundFont,
 		TypePreset,
-		TypePluginSpecificPreset,
+		TypePluginSpecificResource,
 		TypeProject,
 		TypeMidiFile,
 		TypeForeignProject,
diff --git a/src/core/ResourceItem.cpp b/src/core/ResourceItem.cpp
index f5baf3b83..2fcdea4c0 100644
--- a/src/core/ResourceItem.cpp
+++ b/src/core/ResourceItem.cpp
@@ -30,6 +30,7 @@
 #include "ResourceItem.h"
 #include "ResourceProvider.h"
 #include "config_mgr.h"
+#include "engine.h"
 
 
 
@@ -185,8 +186,6 @@ ResourceItem::Type ResourceItem::guessType( void ) const
 
 		typeMap["xpf"] = TypePreset;
 
-		typeMap["xiz"] = TypePluginSpecificPreset;
-
 		typeMap["mmp"] = TypeProject;
 		typeMap["mmpz"] = TypeProject;
 
@@ -200,6 +199,16 @@ ResourceItem::Type ResourceItem::guessType( void ) const
 		typeMap["png"] = TypeImage;
 		typeMap["jpg"] = TypeImage;
 		typeMap["jpeg"] = TypeImage;
+
+		for( QMap<QString, QString>::ConstIterator it =
+					engine::pluginFileHandling().begin();
+			it != engine::pluginFileHandling().end(); ++it )
+		{
+			if( !typeMap.contains( it.key() ) )
+			{
+				typeMap[it.key()] = TypePluginSpecificResource;
+			}
+		}
 	}
 
 	const QString s = QFileInfo( name() ).suffix().toLower();
diff --git a/src/core/ResourceTreeModel.cpp b/src/core/ResourceTreeModel.cpp
index 6256d9e61..bbcf4e6cc 100644
--- a/src/core/ResourceTreeModel.cpp
+++ b/src/core/ResourceTreeModel.cpp
@@ -87,7 +87,7 @@ case ResourceItem::TypeDirectory:
 case ResourceItem::TypeSample:
 	return embed::getIconPixmap( "mimetypes/sample", 24, 24 );
 case ResourceItem::TypePreset:
-case ResourceItem::TypePluginSpecificPreset:
+case ResourceItem::TypePluginSpecificResource:
 	return embed::getIconPixmap( "mimetypes/preset", 24, 24 );
 case ResourceItem::TypeProject:
 	return embed::getIconPixmap( "project_file", 24, 24 );
@@ -117,7 +117,7 @@ Qt::ItemFlags ResourceTreeModel::flags( const QModelIndex & _index ) const
 		{
 			case ResourceItem::TypeSample:
 			case ResourceItem::TypePreset:
-			case ResourceItem::TypePluginSpecificPreset:
+			case ResourceItem::TypePluginSpecificResource:
 			case ResourceItem::TypeProject:
 			case ResourceItem::TypeMidiFile:
 			case ResourceItem::TypeImage:
diff --git a/src/gui/ResourceBrowser.cpp b/src/gui/ResourceBrowser.cpp
index 705d21b28..a69ef6b62 100644
--- a/src/gui/ResourceBrowser.cpp
+++ b/src/gui/ResourceBrowser.cpp
@@ -183,7 +183,7 @@ void ResourceBrowser::showContextMenu( const QPoint & _pos )
 		case ResourceItem::TypeSample:
 		case ResourceItem::TypeSoundFont:
 		case ResourceItem::TypePreset:
-		case ResourceItem::TypePluginSpecificPreset:
+		case ResourceItem::TypePluginSpecificResource:
 		case ResourceItem::TypePlugin:
 			m.addAction( m_actions[LoadInNewTrackSongEditor] );
 			m.addAction( m_actions[LoadInNewTrackBBEditor] );
@@ -271,7 +271,7 @@ void ResourceBrowser::triggerDefaultAction( const QModelIndex & _idx )
 			action = LoadInNewTrackBBEditor;
 			break;
 		case ResourceItem::TypePreset:
-		case ResourceItem::TypePluginSpecificPreset:
+		case ResourceItem::TypePluginSpecificResource:
 		case ResourceItem::TypePlugin:
 		case ResourceItem::TypeSoundFont:
 			action = LoadInNewTrackSongEditor;