diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..95aac07
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+addonprop=$(shell xmlstarlet sel -t -v "$(1)" addon.xml)
+
+ID=$(call addonprop,"/addon/@id")
+
+PLUGIN_FILES=addon.xml changelog.txt icon.png LICENSE.txt \
+	default.py plus7.py \
+	resources/settings.xml \
+	resources/language/English/strings.xml \
+	resources/language/German/strings.xml \
+	resources/language/French/strings.xml
+
+install:
+	mkdir -p $(patsubst %,$(HOME)/.xbmc/addons/$(ID)/%,$(dir $(PLUGIN_FILES)))
+	for file in $(PLUGIN_FILES); do \
+	  dir=$(dir $$file); \
+	  cp -v $$file $(HOME)/.xbmc/addons/$(ID)/$$dir/$$file; \
+	done
+
+.PHONY: install
diff --git a/default.py b/default.py
index 89559fb..026e141 100644
--- a/default.py
+++ b/default.py
@@ -1,217 +1,139 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon
+import sys
+import urllib, urllib2, re
+try:
+  import HTMLParser as htmlparser
+except ImportError:
+  import html.parser as htmlparser
+import xbmcplugin, xbmcgui, xbmcaddon
+import plus7
 
 pluginhandle = int(sys.argv[1])
 settings = xbmcaddon.Addon(id='plugin.video.arte_tv')
 translation = settings.getLocalizedString
 
-language=""
-language=settings.getSetting("language")
-if language=="":
+language = ""
+language = settings.getSetting("language")
+if language == "":
   settings.openSettings()
-  language=settings.getSetting("language")
+  language = settings.getSetting("language")
 
-if language=="0":
-  language="de"
-elif language=="1":
-  language="fr"
+if language == "0":
+  language = "de"
+elif language == "1":
+  language = "fr"
 
-numbers=["10","25","50","100",]
-videosPerPage=numbers[int(settings.getSetting("itemsPerPage"))]
+hp = htmlparser.HTMLParser()
 
-def cleanTitle(title):
-        title=title.replace("&lt;","<").replace("&gt;",">").replace("&amp;","&").replace("&#39;","\\").replace("&#039;","\\").replace("&quot;","\"").replace("&szlig;","ß").replace("&ndash;","-")
-        title=title.replace("&Auml;","Ä").replace("&Uuml;","Ü").replace("&Ouml;","Ö").replace("&auml;","ä").replace("&uuml;","ü").replace("&ouml;","ö")
-        title=title.strip()
-        return title
+def escape_unicode(text):
+  return text.encode("utf8", "ignore")
 
-def index():
-        addDir(translation(30001),"ARTE_7","showSortList","")
-        addDir(translation(30002),"ALL_VIDS","listShows","")
-        addDir(translation(30003),"SHOWS_AZ","listShows","")
-        addDir(translation(30004),"EVENTS","listShows","")
-        addDir(translation(30005),"SEARCH","search","")
-        xbmcplugin.endOfDirectory(pluginhandle)
-
-def showSortList(url):
-        if url=="ARTE_7":
-          urlDate="http://videos.arte.tv/"+language+"/do_delegate/videos/index-3188698,view,asThumbnail.html?hash=tv/thumb/date//1/"+videosPerPage+"/"
-          urlTitle="http://videos.arte.tv/"+language+"/do_delegate/videos/index-3188698,view,asThumbnail.html?hash=tv/thumb/title//1/"+videosPerPage+"/"
-          urlRated="http://videos.arte.tv/"+language+"/do_delegate/videos/index-3188698,view,asThumbnail.html?hash=tv/thumb/popular/bestrated/1/"+videosPerPage+"/"
-          urlViewed="http://videos.arte.tv/"+language+"/do_delegate/videos/index-3188698,view,asThumbnail.html?hash=tv/thumb/popular/mostviewed/1/"+videosPerPage+"/"
-        else:
-          content = getUrl(url)
-          match=re.compile('thumbnailViewUrl: "(.+?)"', re.DOTALL).findall(content)
-          url="http://videos.arte.tv"+match[0]
-          urlTitle=url+"?hash=tv/thumb/title//1/"+videosPerPage+"/"
-          urlDate=url+"?hash=tv/thumb/date//1/"+videosPerPage+"/"
-          urlRated=url+"?hash=tv/thumb/popular/bestrated/1/"+videosPerPage+"/"
-          urlViewed=url+"?hash=tv/thumb/popular/mostviewed/1/"+videosPerPage+"/"
-        addDir(translation(30006),urlTitle,"listVideos","")
-        addDir(translation(30007),urlDate,"listVideos","")
-        addDir(translation(30008),urlRated,"listVideos","")
-        addDir(translation(30009),urlViewed,"listVideos","")
-        xbmcplugin.endOfDirectory(pluginhandle)
-
-def listShows(url):
-        if url=="ALL_VIDS":
-          if language=="de":
-            url="http://videos.arte.tv/de/videos/alleVideos"
-          elif language=="fr":
-            url="http://videos.arte.tv/fr/videos/toutesLesVideos"
-        elif url=="SHOWS_AZ":
-          if language=="de":
-            url="http://videos.arte.tv/de/videos/sendungen"
-          elif language=="fr":
-            url="http://videos.arte.tv/fr/videos/programmes"
-        elif url=="EVENTS":
-          url="http://videos.arte.tv/"+language+"/videos/events/index-3188672.html"
-        content = getUrl(url)
-        content = content[content.find('<div class="navTop"></div>'):]
-        content = content[:content.find('</ul>')]
-        spl=content.split('<a href')
-        for i in range(1,len(spl),1):
-          entry=spl[i]
-          match=re.compile('>(.+?)<', re.DOTALL).findall(entry)
-          title=cleanTitle(match[0])
-          match=re.compile('="(.+?)"', re.DOTALL).findall(entry)
-          url="http://videos.arte.tv"+match[0]
-          addDir(title,url,'showSortList',"")
-        xbmcplugin.endOfDirectory(pluginhandle)
+def sorted_nicely(_list):
+  """ Sort the given iterable in the way that humans expect.""" 
+  convert = lambda text: int(text) if text.isdigit() else text 
+  alphanum_key = lambda key: [ convert(c) for c in re.split('([0-9]+)', key) ] 
+  return sorted(l, key = alphanum_key)
 
-def listVideos(url):
-        urlMain=url
-        content = getUrl(url)
-        spl=content.split('<div class="video">')
-        for i in range(1,len(spl),1):
-          entry=spl[i]
-          match=re.compile('<p>(.+?)</p>', re.DOTALL).findall(entry)
-          date=match[0]
-          match=re.compile('<h2><a href="(.+?)">(.+?)</a></h2>', re.DOTALL).findall(entry)
-          url="http://videos.arte.tv"+match[0][0]
-          title=date+" - "+cleanTitle(match[0][1])
-          entry=entry[entry.find('class="thumbnail"'):]
-          match=re.compile('src="(.+?)"', re.DOTALL).findall(entry)
-          thumb="http://videos.arte.tv"+match[0]
-          addLink(title,url,'playVideo',thumb)
-        content=content[content.find('<div class="pagination inside">'):]
-        content=content[:content.find('</ul>')]
-        spl=content.split('<a href=')
-        for i in range(1,len(spl),1):
-          entry=spl[i]
-          if entry.find('"#"')>=0:
-            next=""
-            if language=="de":
-              next="Weiter"
-            elif language=="fr":
-              next="Suivant"
-            if entry.find(next)>=0:
-              match=re.compile('class="{page:\'(.+?)\'}">'+next+'</a>', re.DOTALL).findall(entry)
-              nextPage=match[0]
-              currentPage=int(nextPage)-1
-              url=urlMain.replace("/"+str(currentPage)+"/"+videosPerPage+"/","/"+nextPage+"/"+videosPerPage+"/")
-              addDir(translation(30010)+" ("+nextPage+")",url,"listVideos","")
-          else:
-            if language=="de":
-              next="Weiter"
-            elif language=="fr":
-              next="Suivant"
-            if entry.find(next)>=0:
-              match=re.compile('"(.+?)"', re.DOTALL).findall(entry)
-              url="http://videos.arte.tv"+match[0].replace("&amp;","&")
-              match=re.compile('pageNr=(.+?)&', re.DOTALL).findall(url)
-              nextPage=match[0]
-              addDir(translation(30010)+" ("+nextPage+")",url,"listVideos","")
-        xbmcplugin.endOfDirectory(pluginhandle)
-
-def search():
-        keyboard = xbmc.Keyboard('', translation(30005))
-        keyboard.doModal()
-        if keyboard.isConfirmed() and keyboard.getText():
-          search_string = keyboard.getText().replace(" ","+")
-          if language=="de":
-            url="http://videos.arte.tv/de/do_search/videos/suche?q="+search_string
-          elif language=="fr":
-            url="http://videos.arte.tv/fr/do_search/videos/recherche?q="+search_string
-          listVideos(url)
+def index():
+  addDir(translation(30002),"ALL_VIDS","listAll","")
+  addDir(translation(30003),"","listPrograms","")  
+  addDir(translation(30011),"","listCategories","")
+  xbmcplugin.endOfDirectory(pluginhandle)
+
+def listAll(url):
+  l = plus7.Listing()
+  for item in l.shows:
+    title = hp.unescape("%s - %s" % (item['tl'], item['tea']))
+    addLink(title, item['vid'], 'playVideo', "")
+  xbmcplugin.endOfDirectory(pluginhandle)
+    
+def listCategories(url):
+  l = plus7.Listing()
+  if url == "":
+    # List categories
+    categories = set()
+    for item in l.shows:
+      ct = item['ct'].strip()
+      if ct:
+        categories.add(ct)
+    for cat in categories:
+      addDir(hp.unescape(cat), escape_unicode(cat), "listCategories", "")
+  else:
+    # List videos of a given category
+    for item in l.shows:
+      cat = escape_unicode(item['ct'])
+      if cat == url:
+        title = hp.unescape("%s - %s" % (item['tl'], item['tea']))
+        addLink(title, item['vid'], 'playVideo', "")
+  xbmcplugin.endOfDirectory(pluginhandle)
+
+def listPrograms(url):
+  l = plus7.Listing()
+  if url == "":
+    # List programs
+    programs = set()
+    for item in l.shows:
+      tl = item['tl'].strip()
+      if tl:
+        programs.add(tl)
+    for tl in programs:
+      addDir(hp.unescape(tl), escape_unicode(tl), "listPrograms", "")
+  else:
+    # List videos of a given program
+    for item in l.shows:
+      tl = escape_unicode(item['tl'])
+      if tl == url:
+        addLink(hp.unescape(item['tea']), item['vid'], 'playVideo', "")
+  xbmcplugin.endOfDirectory(pluginhandle)
 
 def playVideo(url):
-        url=url.replace("/videos/","/do_delegate/videos/").replace(".html",",view,asPlayerXml.xml")
-        content = getUrl(url)
-        match=re.compile('<video lang="'+language+'" ref="(.+?)"', re.DOTALL).findall(content)
-        url=match[0]
-        content = getUrl(url)
-        match1=re.compile('<url quality="hd">(.+?)</url>', re.DOTALL).findall(content)
-        match2=re.compile('<url quality="sd">(.+?)</url>', re.DOTALL).findall(content)
-        urlNew=""
-        if len(match1)==1:
-          urlNew=match1[0]
-        elif len(match2)==1:
-          urlNew=match2[0]
-        listitem = xbmcgui.ListItem(path=urlNew+" swfVfy=1 swfUrl=http://videos.arte.tv/blob/web/i18n/view/player_23-3188338-data-4993762.swf")
-        return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
-
-def getUrl(url,data=None,cookie=None):
-        if data!=None:
-          req = urllib2.Request(url,data)
-          req.add_header('Content-Type', 'application/x-www-form-urlencoded')
-        else:
-          req = urllib2.Request(url)
-        req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:11.0) Gecko/20100101 Firefox/11.0')
-        if cookie!=None:
-          req.add_header('Cookie',cookie)
-        try:
-          response = urllib2.urlopen(req,timeout=30)
-          link=response.read()
-          response.close()
-          return link
-        except:
-          return ""
-
-def parameters_string_to_dict(parameters):
-        ''' Convert parameters encoded in a URL to a dict. '''
-        paramDict = {}
-        if parameters:
-            paramPairs = parameters[1:].split("&")
-            for paramsPair in paramPairs:
-                paramSplits = paramsPair.split('=')
-                if (len(paramSplits)) == 2:
-                    paramDict[paramSplits[0]] = paramSplits[1]
-        return paramDict
-
-def addLink(name,url,mode,iconimage):
-        u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)
-        ok=True
-        liz=xbmcgui.ListItem(name, iconImage="DefaultVideo.png", thumbnailImage=iconimage)
-        liz.setInfo( type="Video", infoLabels={ "Title": name } )
-        liz.setProperty('IsPlayable', 'true')
-        ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz)
-        return ok
-
-def addDir(name,url,mode,iconimage):
-        u=sys.argv[0]+"?url="+urllib.quote_plus(url)+"&mode="+str(mode)
-        ok=True
-        liz=xbmcgui.ListItem(name, iconImage="DefaultFolder.png", thumbnailImage=iconimage)
-        liz.setInfo( type="Video", infoLabels={ "Title": name } )
-        ok=xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
-        return ok
+  listitem = xbmcgui.ListItem(path=url)
+  return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
+
+def addLink(name, url, mode, iconimage):
+  u = sys.argv[0] + "?url=" + urllib.quote_plus(url) + "&mode=" + str(mode)
+  ok = True
+  liz = xbmcgui.ListItem(name, iconImage="DefaultVideo.png", thumbnailImage=iconimage)
+  liz.setInfo( type="Video", infoLabels={ "Title": name } )
+  liz.setProperty('IsPlayable', 'true')
+  ok = xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz)
+  return ok
+
+def addDir(name, url, mode, iconimage):
+  u = sys.argv[0] + "?url=" + urllib.quote_plus(url) + "&mode=" + str(mode)
+  ok = True
+  liz = xbmcgui.ListItem(name, iconImage="DefaultFolder.png", thumbnailImage=iconimage)
+  liz.setInfo( type="Video", infoLabels={ "Title": name } )
+  ok = xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=liz,isFolder=True)
+  return ok
          
-params=parameters_string_to_dict(sys.argv[2])
-mode=params.get('mode')
-url=params.get('url')
-if type(url)==type(str()):
-  url=urllib.unquote_plus(url)
-
-if mode == 'listVideos':
-    listVideos(url)
-elif mode == 'playVideo':
-    playVideo(url)
-elif mode == 'showSortList':
-    showSortList(url)
-elif mode == 'listShows':
-    listShows(url)
-elif mode == 'search':
-    search()
+def parameters_string_to_dict(parameters):
+  ''' Convert parameters encoded in a URL to a dict. '''
+  paramDict = {}
+  if parameters:
+    paramPairs = parameters[1:].split("&")
+    for paramsPair in paramPairs:
+      paramSplits = paramsPair.split('=')
+      if (len(paramSplits)) == 2:
+        paramDict[paramSplits[0]] = paramSplits[1]
+  return paramDict
+
+_params = parameters_string_to_dict(sys.argv[2])
+_mode = _params.get('mode')
+_url = _params.get('url')
+if type(_url)==type(str()):
+  _url = urllib.unquote_plus(_url)
+
+if _mode == 'listAll':
+  listAll(_url)
+elif _mode == 'listCategories':
+  listCategories(_url)
+elif _mode == 'listPrograms':
+  listPrograms(_url)
+elif _mode == 'playVideo':
+  playVideo(_url)
+elif _mode == 'search':
+  search()
 else:
-    index()
+  index()
diff --git a/plus7.py b/plus7.py
new file mode 100644
index 0000000..5e2e646
--- /dev/null
+++ b/plus7.py
@@ -0,0 +1,263 @@
+"""
+plus7: arte+7 lib
+"""
+
+import httplib
+import time
+import glob
+import sys
+import json
+import os.path
+import urlparse
+from threading import Thread
+
+USER_AGENT = 'ARTE 1.1.0 (iPad; iPhone OS 5.0; de_DE)'
+LISTING_FILE = '.xbmc/temp/plus7.json'
+UPDATE_FREQUENCY = 30 # minutes
+CHUNK = 16384
+LANG = "fr"           # try one of fr, en, de. content might change.
+
+class Listing(object):
+    """Listing: includes methods to download, print and store the
+    program listing, and to show details and download content from
+    this listing."""
+    def __init__(self):
+        self.shows = self._load_listing()
+        if self.shows is None:
+            self.shows = self._download_listing()
+            self._store_listing()
+        
+    def _load_listing(self):
+        """Loads the listing from the file, or downloads a new one, if
+        the stored version is too old."""
+        path = self._get_listing_filename()
+        if not os.path.exists(path):
+            return None
+        if time.time() - os.path.getmtime(path) > UPDATE_FREQUENCY * 60:
+            return None
+        f = open(path)
+        data = f.read()
+        f.close()
+        try:
+            j = json.loads(data)
+            return j
+        except:
+            return None
+
+    def _get_listing_filename(self):
+        """Returns the full path of the listing file."""
+        upath = '~/' + LISTING_FILE
+        epath = os.path.expanduser(upath)
+        if upath == epath:
+            epath = LISTING_FILE
+        return epath
+
+    def _store_listing(self):
+        """Stores the program listing in a JSON file."""
+        f = open(self._get_listing_filename(), 'w')
+        f.write(json.dumps(self.shows, indent=4))
+        f.flush()
+        f.close()
+        
+    def _download_listing(self):
+        """Downloads and returns the whole program listing."""
+        print "Downloading listing..."
+        lang = LANG
+        ts = time.strftime('%Y%m%d')
+        page = 1
+        programs = list()
+        while True:
+            content = self._download_listing_page(lang, ts, page)
+            if len(content['prs']) == 0:
+                break
+            programs = programs + content['prs']
+            page = page + 1
+        return programs
+
+    def _download_listing_page(self, lang, ts, page):
+        """Downloads one page of the program listing."""
+        path = "/rest/programs/search?criteria=&language=%s&currentDate=%s&sort=1&pageNumber=%s&programCountByPage=14&deviceType=iPad" % (lang, ts, page)
+        data = self._http_get("programs.arte.tv", path)
+        return json.loads(data)
+
+    def _item_short(self, item):
+        """Prints a short description of a content item."""
+        title = self._decode_entities(item['tl'])
+        cat = item['ct']
+        id = item['id']
+        dstruct = time.strptime(item['dt'], "%Y%m%d%H%M")
+        date = time.strftime("%a %d-%m-%y %H:%M", dstruct)
+        return "%s\t%s\n\t%s\t%s" % (id, title, date, cat)
+
+    def print_short(self):
+        """Prints a list of available content."""
+        print "id\ttitle"
+        for item in self.shows:
+            print self._item_short(item).encode('UTF-8')
+
+    def _get_content_with_id(self, content_id):
+        """Returns the json data for the given content id, or None, if
+        not available."""
+        item = None
+        for it in self.shows:
+            if str(it['id']) == content_id:
+                item = it
+                break
+        return item
+
+    def download(self, content_id):
+        """Downloads the content with the given id."""
+        item = self._get_content_with_id(content_id)
+        if item is None:
+            print "Unknown id: %s" % (content_id)
+            return
+        uri = item['vid']
+        filename = (self._decode_entities(item['tl']).replace(' ',
+            '_').replace('/', '_')
+            + '_' + str(item['id']) + '.mp4')
+        (finished, max_part, precommit) = self._download_status(filename)
+        if finished:
+            print "Download of %s was already finished." % (filename)
+            sys.exit(1)
+        if precommit:
+            self._rollback(filename)
+            self._commit(filename, filename+".part"+str(max_part))
+            max_part = max_part + 1
+        (host, path, bandwidth_list) = self._split_uri(uri)
+        playlist = self._get_playlist_filename(host, path, bandwidth_list)
+        self._download_files(host, path, playlist, filename, max_part)
+
+    def _download_status(self, filename):
+        """Returns a tuple of (is_finished, max_part, pre_commit),
+        which represents the download status. This method is used to
+        find out where to resume the download. If is_finished is True,
+        no part files were found and the download is considered as
+        finished. max_part indicates the number of the download part
+        from which to resume. If pre_commit is True, the download part
+        given in max_part has finished downloading, and was about to
+        be appended to the content file. The size of the content file
+        before the "commit" can be found inside the precommit file."""
+        if os.path.exists(filename):
+            partfiles = glob.glob(filename+".part*")
+            if len(partfiles) == 0:
+                return (True, 1, False)
+            max_part = 1
+            for f in partfiles:
+                this_part = int(f[len(filename+".part"):])
+                if this_part > max_part:
+                    max_part = this_part
+            if os.path.exists(filename+".precommit"):
+                precommit = True
+            else:
+                precommit = False
+            return (False, max_part, precommit)
+        else:
+            return (False, 1, False)
+        
+    def _download_files(self, host, path, playlist_file, filename, start_part):
+        files = list()
+        playlist = self._http_get(host, path + playlist_file)
+        for line in playlist.split('\n'):
+            if line != '#':
+                files.append(line)
+
+        start_ts = time.time()
+        i = start_part 
+        if i > 1:
+            resuming = ", resuming from part %s" % (i)
+        else:
+            resuming = ""
+        print "Downloading %s%s" % (filename, resuming)
+        rcvd = 0
+        if not os.path.exists(filename):
+            self._touch(filename)
+        while i-1 < len(files):
+            f = files[i-1]
+            partfile = "%s.part%s" % (filename, i)
+            d = Download(host, path+f, partfile, start_ts, i, len(files), rcvd)
+            d.start()
+            self._commit(filename, partfile)
+            rcvd = os.path.getsize(filename)
+            i = i + 1
+        print ""
+
+    def _rollback(self, filename):
+        # get size from precommit file
+        pcfile = filename+".precommit"
+        pc = open(pcfile, 'r')
+        size = pc.read()
+        pc.close()
+        try:
+            isize = int(size)
+        except:
+            print "Erroneous precommit file. Delete download files and try again."
+            sys.exit(1)
+        f = open(filename, 'ab')
+        f.truncate(isize)
+        f.close()
+        os.unlink(pcfile)
+            
+    def _commit(self, filename, partfile):
+        # read part
+        pf = open(partfile, 'rb')
+        part = pf.read()
+        pf.close()
+        # store current file size in precommit file
+        pcfile = filename+".precommit"
+        try:
+            size = os.path.getsize(filename)
+        except:
+            size = 0
+        precommit = open(pcfile, 'w')
+        precommit.write(str(size))
+        precommit.flush()
+        precommit.close()
+        # write part to file
+        f = open(filename, 'ab')
+        f.write(part)
+        f.flush()
+        f.close()
+        # remove part and precommit file
+        os.unlink(partfile)
+        os.unlink(pcfile)
+
+    def _touch(self, filename):
+        """Sets atime and mtime of filename, and creates it, if
+        necessary. Taken from
+        http://stackoverflow.com/questions/1158076/implement-touch-using-python.""" 
+        with file(filename, 'a'):
+            os.utime(filename, None)
+
+    def _get_playlist_filename(self, host, path, bandwidth_list):
+        """Downloads the multi-bandwidth playlist, returns the last
+        line, which contains the filename of the playlist with the
+        highest bandwidth."""
+        data = self._http_get(host, path + bandwidth_list)
+        last_line = ''
+        for line in data.split('\n'):
+            if line != "":
+                last_line = line
+        return last_line
+
+    def _http_get(self, host, path):
+        """Returns the response body of a HTTP GET request to
+        http://host/path."""
+        conn = httplib.HTTPConnection(host)
+        headers = {'User-Agent': USER_AGENT, 
+            'Accept-Encoding': 'gzip'}
+        conn.request("GET", path, headers=headers)
+        response = conn.getresponse()
+        data = response.read()
+        conn.close()
+        return data
+
+    def _split_uri(self, uri):
+        """Splits a uri, returns a tuple of (host, path_prefix,
+        file_suffix), where file_suffix is the "file name" of the uri
+        (what's after the last '/'), and path_prefix is the
+        "directory" of the uri (up to the last '/')."""
+        usplit = urlparse.urlsplit(uri)
+        psplit = usplit.path.split('/')
+        uri_file = psplit[-1:][0]
+        path_prefix = "/".join(psplit[:-1]) + "/"
+        return (usplit.netloc, path_prefix, uri_file)
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 61a241e..638b430 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -10,6 +10,7 @@
   <string id="30008">by Votes</string>
   <string id="30009">by Hits</string>
   <string id="30010">Next Page</string>
+  <string id="30011">Categories</string>
   <string id="30101">Language (Videos)</string>
   <string id="30102">Videos per Page</string>
 </strings>
diff --git a/resources/language/French/strings.xml b/resources/language/French/strings.xml
index f7dc1a5..e36aa5b 100644
--- a/resources/language/French/strings.xml
+++ b/resources/language/French/strings.xml
@@ -10,6 +10,7 @@
   <string id="30008">Les mieux notées</string>
   <string id="30009">Les plus vues</string>
   <string id="30010">Suivant</string>
+  <string id="30011">Catégories</string>
   <string id="30101">Langue (Videos)</string>
   <string id="30102">Videos par page</string>
 </strings>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 4117ef0..713aa92 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -10,6 +10,7 @@
   <string id="30008">nach Bewertung</string>
   <string id="30009">nach Aufrufen</string>
   <string id="30010">Nächste Seite</string>
+  <string id="30011">Kategorie</string>
   <string id="30101">Sprache (Videos)</string>
   <string id="30102">Videos pro Seite</string>
 </strings>