Index: channels/bookmarks.py
==================================================================
--- channels/bookmarks.py
+++ channels/bookmarks.py
@@ -30,11 +30,11 @@
 #
 # Furthermore it pretty much only handles a static streams{} list.
 # Sub-plugins simply append a new category, and populate the streams
 # list themselves.
 #
-# It's accessible as `main.bookmarks` in the ST2 window and elsewhere.
+# It's accessible as `parent.bookmarks` in the ST2 window and elsewhere.
 #
 class bookmarks(GenericChannel):
 
     # desc
     module = "bookmarks"
@@ -107,11 +107,11 @@
         # normalize data (this row originated in a gtk+ widget)
         row["favourite"] = 1
         if row.get("favicon"):
            row["favicon"] = favicon.file(row.get("homepage"))
         if not row.get("listformat"):
-            row["listformat"] = self.main.channel().listformat
+            row["listformat"] = self.parent.channel().listformat
            
         # append to storage
         self.streams["favourite"].append(row)
         self.save()
         self.load(self.default)
@@ -156,11 +156,11 @@
         # This step is most likely redundant, but prevents accidently re-rewriting
         # stations that are in two channels (=duplicates with different PLS urls).
         check = {"http//": "[row]"}
         check = dict((row.get("url", "http//"),row) for row in fav)
         # walk through all channels/streams
-        for chname,channel in self.main.channels.items():
+        for chname,channel in self.parent.channels.items():
             for cat,streams in channel.streams.items():
 
                 # keep the potentially changed rows
                 if (chname == updated_channel) and (cat == updated_category):
                     freshened_streams = streams