Index: channels/bookmarks.py
==================================================================
--- channels/bookmarks.py
+++ channels/bookmarks.py
@@ -1,12 +1,12 @@
 # encoding: UTF-8
 # api: streamtuner2
-# title: bookmarks
+# title: Bookmarks
 # description: For collecting favourites. And provides some feature/category plugins.
 # type: channel
 # version: 1.5
-# category: channel
+# category: builtin
 # priority: core
 # config: { name: like_my_bookmarks,  type: boolean, value: 0, description: "I like my bookmarks" }
 # 
 # Favourite lists.
 #
@@ -17,11 +17,11 @@
 # "search" feature adds its own result list here, as does the "timer" plugin.
 #
 #
 
 from config import *
-from mygtk import mygtk
+from uikit import uikit
 from channels import *
 
 
 
 # The bookmarks tab is a core feature and built into the GtkBuilder
@@ -115,11 +115,11 @@
         # simplified gtk TreeStore display logic (just one category for the moment, always rebuilt)
         def load(self, category, force=False):
             __print__(dbg.UI, category, self.streams.keys())
             self.streams[category] = self.update_streams(category)
             #self.liststore[category] = \
-            mygtk.columns(self.gtk_list, self.datamap, self.prepare(self.streams[category]))
+            uikit.columns(self.gtk_list, self.datamap, self.prepare(self.streams[category]))
 
 
         # add a categories[]/streams{} subcategory, update treeview
         def add_category(self, cat, plugin=None):
             if cat not in self.categories: # add category if missing

Index: channels/file.py
==================================================================
--- channels/file.py
+++ channels/file.py
@@ -1,11 +1,11 @@
 #
 # api: streamtuner2
 # title: File browser
 # description: Displays mp3/oggs or m3u/pls files from local media file directories.
 # type: channel
-# category: media
+# category: local
 # version: 0.1
 # priority: optional
 # depends: mutagen
 # config:  
 #   { name: file_browser_dir, type: text, value: "~/Music, /media/music", description: "List of directories to scan for audio files." },

Index: channels/history.py
==================================================================
--- channels/history.py
+++ channels/history.py
@@ -1,11 +1,11 @@
 #
 # api: streamtuner2
 # title: History
 # description: List recently played stations under favourites > history.
 # version: 1.0
-# type: category
+# type: group
 # category: ui
 # config:
 #     { name: history,  type: int,  value: 20,  description: Number of last played streams to keep in history list.,  category: limit }
 # priority: optional
 #

Index: channels/links.py
==================================================================
--- channels/links.py
+++ channels/links.py
@@ -1,10 +1,10 @@
 #
 # api: streamtuner2
 # title: Links to directory services
 # description: Static list of various music directory websites.
-# type: category
+# type: group
 # category: web
 # version: 0.2
 # priority: default
 # config: -
 #

Index: channels/live365.py
==================================================================
--- channels/live365.py
+++ channels/live365.py
@@ -20,11 +20,11 @@
 #
 
 
 # streamtuner2 modules
 from config import conf
-from mygtk import mygtk
+from uikit import uikit
 import ahttp as http
 from channels import *
 from config import __print__, dbg
 import action
 

Index: channels/modarchive.py
==================================================================
--- channels/modarchive.py
+++ channels/modarchive.py
@@ -5,11 +5,11 @@
 # type: channel
 # version: 0.2
 # url: http://www.modarchive.org/
 # priority: extra
 # config: -
-# category: music
+# category: collection
 #
 #
 # Just a genre browser.
 #
 # MOD files dodn't work with all audio players. And with the default

Index: channels/myoggradio.py
==================================================================
--- channels/myoggradio.py
+++ channels/myoggradio.py
@@ -24,11 +24,11 @@
 
 
 from channels import *
 from config import conf
 from action import action
-from mygtk import mygtk
+from uikit import uikit
 import ahttp as http
 
 import re
 import json
 from compat2and3 import StringIO
@@ -59,11 +59,11 @@
     
     # prepare GUI
     def __init__(self, parent):
         ChannelPlugin.__init__(self, parent)
         if parent:
-            mygtk.add_menu(parent.extensions, "Share in MyOggRadio", self.share)
+            uikit.add_menu(parent.extensions, "Share in MyOggRadio", self.share)
 
 
 
     # this is simple, there are no categories
     def update_categories(self):

Index: channels/timer.py
==================================================================
--- channels/timer.py
+++ channels/timer.py
@@ -1,11 +1,11 @@
 #
 # api: streamtuner2
 # title: Recording timer
 # description: Schedules play/record events for bookmarked radio stations.
 # type: feature
-# category: ui
+# category: hook
 # depends: kronos
 # version: 0.5
 # config: -
 # priority: optional
 # support: unsupported
@@ -21,12 +21,12 @@
 #
 
 
 from config import *
 from channels import *
-import kronos  # Doesn't work with Python3
-from mygtk import mygtk
+import bundle.kronos as kronos  # Doesn't work with Python3
+from uikit import uikit
 from action import action
 import copy
 import re
 
 
@@ -57,11 +57,11 @@
         # keep reference to main window
         self.parent = parent
         self.bookmarks = parent.bookmarks
         
         # add menu
-        mygtk.add_menu(self.parent.extensions, "Add timer for station", self.edit_timer)
+        uikit.add_menu(self.parent.extensions, "Add timer for station", self.edit_timer)
         
         # target channel
         if not self.bookmarks.streams.get("timer"):
             self.bookmarks.streams["timer"] = [{"title":"--- timer events ---"}]
         self.bookmarks.add_category("timer")

Index: channels/xiph.py
==================================================================
--- channels/xiph.py
+++ channels/xiph.py
@@ -30,11 +30,11 @@
 
 
 
 # streamtuner2 modules
 from config import conf
-from mygtk import mygtk
+from uikit import uikit
 import ahttp as http
 from channels import *
 from config import __print__, dbg
 import json