--- a/plugin.audio.vorleser_net/default.py
+++ b/plugin.audio.vorleser_net/default.py
@@ -3,32 +3,65 @@
 import urllib,urllib2,re,xbmcplugin,xbmcgui,sys,xbmcaddon,base64
 
 pluginhandle = int(sys.argv[1])
+addon = xbmcaddon.Addon(id='plugin.audio.vorleser_net')
+translation = addon.getLocalizedString
 
 def index():
-        content = getUrl("http://www.vorleser.net/html/autoren.html")
-        content = content[content.find("Autoren</B></P>"):]
-        content = content[:content.find('<TR STYLE="height: 32px;">')]
-        spl=content.split('<TR VALIGN="TOP"')
-        for i in range(1,len(spl),1):
-          entry=spl[i]
-          match=re.compile('<A HREF="(.+?)">(.+?)</A>', re.DOTALL).findall(entry)
-          for url, author in match:
-            if url.find("../")==0:
-              addDir(cleanTitle(author),url.replace("../","http://www.vorleser.net/"),'listAuthor',"")
+        addDir(translation(30001),"","listAllAuthors","")
+        addDir("Krimi & Spannung","Krimi_kUND_Spannung","listCatBooks","")
+        addDir("Kinder & Jugendliche","Kinder_kUND_Jugendliche","listCatBooks","")
+        addDir("Romane & Erz��hlungen","Romane_kUND_Erzaehlungen","listCatBooks","")
+        addDir("Philosophie & Religion","Philosophie_kUND_Religion","listCatBooks","")
+        addDir("H��rspiele & B��hne","Hoerspiel_kUND_Buehne","listCatBooks","")
+        addDir("Lyrik & Musik","Lyrik_kUND_Poesie","listCatBooks","")
+        addDir("Sachtexte & Essays","Sachtexte_kUND_Essays","listCatBooks","")
         xbmcplugin.endOfDirectory(pluginhandle)
 
-def listAuthor(url):
-        content = getUrl(url)
-        match=re.compile('HREF="http://xoup.de/audio/(.+?).mp3"', re.DOTALL).findall(content)
-        for url in match:
-          spl=url.split('/')
-          title=spl[len(spl)-1]
-          url="http://xoup.de/audio/"+url+".mp3"
-          addLink(title,url,'playAudio',"")
+def listAllAuthors():
+        content = getUrl("http://www.vorleser.net/alle_autoren.php")
+        match=re.compile('<a href="autor.php\\?id=(.+?)" name="(.+?)" class="rel pointer" onclick="setDetail\\(this\\)">(.+?)<br></a>', re.DOTALL).findall(content)
+        for id, temp, author in match:
+          addDir(cleanTitle(author),id,'listBooks',"")
         xbmcplugin.endOfDirectory(pluginhandle)
 
-def playAudio(url):
-        listitem = xbmcgui.ListItem(path=url)
+def listCatBooks(id):
+        content = getUrl("http://www.vorleser.net/hoerbuch.php?kat="+id)
+        spl=content.split('<div class="box news')
+        for i in range(1,len(spl),1):
+            entry=spl[i]
+            match=re.compile('<div class="autor">(.+?)</div>', re.DOTALL).findall(entry)
+            author=match[0]
+            match=re.compile('<div class="h2 orange fieldH2">(.+?)</div>', re.DOTALL).findall(entry)
+            title=author+": "+match[0]
+            title=cleanTitle(title)
+            match=re.compile('<a href="hoerbuch.php\\?id=(.+?)"', re.DOTALL).findall(entry)
+            id=match[0]
+            match=re.compile('background-image:url\\((.+?)\\)', re.DOTALL).findall(entry)
+            thumb=""
+            if len(match)>0:
+              thumb="http://www.vorleser.net/"+match[0]
+            addLink(title,id,'playAudio',thumb)
+        xbmcplugin.endOfDirectory(pluginhandle)
+
+def listBooks(id):
+        content = getUrl("http://www.vorleser.net/autor.php?id="+id)
+        spl=content.split('<div class="box news"')
+        for i in range(1,len(spl),1):
+            entry=spl[i]
+            match=re.compile('<div class="h2 orange" style="(.+?)">(.+?)</div>', re.DOTALL).findall(entry)
+            title=match[0][1]
+            title=cleanTitle(title)
+            match=re.compile('<a href="hoerbuch.php\\?id=(.+?)"', re.DOTALL).findall(entry)
+            id=match[0]
+            match=re.compile('background-image:url\\((.+?)\\)', re.DOTALL).findall(entry)
+            thumb=""
+            if len(match)>0:
+              thumb="http://www.vorleser.net/"+match[0]
+            addLink(title,id,'playAudio',thumb)
+        xbmcplugin.endOfDirectory(pluginhandle)
+
+def playAudio(id):
+        listitem = xbmcgui.ListItem(path="http://www.vorleser.net/audio/"+id+".mp3")
         return xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
 
 def cleanTitle(title):
@@ -80,10 +113,12 @@
 if type(url)==type(str()):
   url=urllib.unquote_plus(url)
 
-if mode == 'listAuthors':
-    listAuthors(url)
-elif mode == 'listAuthor':
-    listAuthor(url)
+if mode == 'listBooks':
+    listBooks(url)
+elif mode == 'listCatBooks':
+    listCatBooks(url)
+elif mode == 'listAllAuthors':
+    listAllAuthors()
 elif mode == 'playAudio':
     playAudio(url)
 else: