Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -52,11 +52,11 @@
 	$(PACK) -u packfile -s src -t zip --zip-shebang "/usr/bin/env python"	\
 		-f -p "$(NAME)-$(VERSION).pyz" --prefix=./  .zip.py st2.py
 src:
 	cd .. && pax -wvJf streamtuner2/streamtuner2-$(VERSION).src.txz \
 		streamtuner2/*.{py,png,svg,desktop} streamtuner2/channels/*.{py,png} \
-		streamtuner2/{bundle/,help/,gtk,NEWS,READ,PACK,PKG,CRED,Make,bin,.zip}*
+		streamtuner2/{bundle/,contrib/,help/,gtk,NEWS,READ,PACK,PKG,CRED,Make,bin,.zip}*
 
 # test .deb contents
 check:
 	dpkg-deb -c streamtuner2*deb
 	dpkg-deb -I streamtuner2*deb

Index: channels/dnd.py
==================================================================
--- channels/dnd.py
+++ channels/dnd.py
@@ -2,14 +2,14 @@
 # api: streamtuner2
 # title: Drag and Drop (experimental)
 # description: Copy streams/stations from and to other applications.
 # depends: uikit
 # version: 0.5
-# type: interface
+# type: feature
 # config:
 #   { name: dnd_format, type: select, value: xspf, select: "pls|m3u|xspf|jspf|asx|smil|desktop", description: "Default temporary file format for copying a station." }
-# category: ui
+# category: io
 # priority: default
 # support: experimental
 #
 # Implements Gtk/X11 drag and drop support for station lists.
 # Should allow to export either just stream URLs, or complete

Index: channels/exportcat.py
==================================================================
--- channels/exportcat.py
+++ channels/exportcat.py
@@ -4,11 +4,11 @@
 # description: Exports a complete channel category (all stations into one file).
 # version: 0.2
 # type: feature
 # category: file
 # priority: optional
-# config:
+# -disabled-config:
 #   { name: export_format, value: xspf, type: select, select: "pls|xspf|m3u|jspf|smil|asx|json", description: Default export format. }
 # hooks: config_save
 #
 # Adds a context menu "Extensions > Export all", which can be used
 # in any channel and category to save all stations into one playlist.
@@ -48,11 +48,11 @@
     # Fetch streams from category, show "Save as" dialog, then convert URLs and export as playlist file
     def savewindow(self, *w):
         cn = self.parent.channel()
         source = cn.listformat
         streams = cn.streams[cn.current]
-        fn = uikit.save_file("Export category", None, "%s.%s.%s" % (cn.module, cn.current, conf.export_format))
+        fn = uikit.save_file("Export category", None, "%s.%s.%s" % (cn.module, cn.current, "xspf"))
         log.PROC("Exporting category to", fn)
         if fn:
             dest = re.findall("\.(m3u|pls|xspf|jspf|json|smil|asx|desktop|url)8?$", fn.lower())
             if dest:
                 dest = dest[0]

Index: st2.py
==================================================================
--- st2.py
+++ st2.py
@@ -424,23 +424,19 @@
                     self.features[name] = plugin_obj
                 
             except Exception as e:
                 log.INIT("load_plugin_channels: error initializing:", name, ", exception:")
                 traceback.print_exc()
+
 
     # load application state (widget sizes, selections, etc.)
     def init_app_state(self):
         winlayout = conf.load("window")
         if (winlayout):
             try: uikit.app_restore(self, winlayout)
             except Exception as e: log.APPSTATE_RESTORE(e) # may fail for disabled/reordered plugin channels
 
-        #winstate = conf.state()    # now handled by channels.gui() already
-        #if (winstate):
-        #    for id,prev in winstate.items():
-        #        try: self.channels[id].current = prev["current"]
-        #        except Exception as e: log.APPSTATE_RESTORE(e)
 
     # store window/widget states (sizes, selections, etc.)
     def save_app_state(self, widget):
         # gtk widget states
         widgetnames = ["win_streamtuner2", "toolbar", "notebook_channels", ] \