--- anidb.xml   Wed Apr 25 12:37:41 2012
+++ anidb.xml   Sun May 13 15:22:36 2012
@@ -653,21 +653,30 @@
         <expression clear="yes"/>
       </RegExp>
       <RegExp conditional="Fanarts" input="$$18" output="\1" dest="16">
-        <expression noclean="1">(?i)(&lt;fanart.*?&lt;/fanart&gt;)</expression>
+        <expression noclean="1">(?i)&lt;fanart&gt;(.*)&lt;/fanart&gt;</expression>
       </RegExp>
       <RegExp input="$$20" output="&lt;episodeguide&gt;&lt;url gzip=&quot;yes&quot; cache=&quot;$$20.xml&quot;&gt;http://api.anidb.net:9001/httpapi?request=anime&amp;client=xbmcscrap&amp;clientver=1&amp;protover=1&amp;aid=$$20&lt;/url&gt;&lt;/episodeguide&gt;" dest="8+">
         <expression/>
       </RegExp>
-      <RegExp input="$$20" output="&lt;url function=&quot;GetTVDBLookupAPI&quot; cache=&quot;$$20.xml&quot;&gt;&amp;&lt;/url&gt;" dest="6">
-        <expression clear="yes"/>
+      <RegExp input="$$19" output="" dest="12">
+        <expression clear="yes">(?i)imdbid=&quot;([^&quot;]*)&quot;</expression>
+      </RegExp>
+      <RegExp input="$$19" output="" dest="12">
+        <expression>(?i)tmdbid=&quot;([^&quot;]*)&quot;</expression>
       </RegExp>
       <RegExp input="$$19" output="\1" dest="19">
         <expression clear="yes">(?i)tvdbid=&quot;([^&quot;]*)&quot;</expression>
       </RegExp>
-      <RegExp input="$$19" output="&lt;url function=&quot;GetFanartDataAPI&quot; cache=&quot;tvdb-$$20.xml&quot;&gt;http://www.thetvdb.com/api/1D62F2F90030C444/series//all/en.zip&lt;/url&gt;" dest="6">
+      <RegExp input="$$12$$19" output="&lt;url function=&quot;GetTVDBLookupAPI&quot; cache=&quot;$$20.xml&quot;&gt;&amp;&lt;/url&gt;" dest="6">
+        <expression clear="yes">(?!.)</expression>
+      </RegExp>
+      <RegExp conditional="Fanarts" input="$$12" output="&lt;url function=&quot;GetTMDBFanartAPI&quot; cache=&quot;tmdb-images-$$20-.json&quot;&gt;http://api.themoviedb.org/3/movie//images?api_key=57983e31fb435df4df77afb854740ea9&lt;/url&gt;" dest="6">
+        <expression repeat="yes">((?:tt)?\d+),?</expression>
+      </RegExp>
+      <RegExp input="$$19" output="&lt;url function=&quot;GetFanartDataAPI&quot; cache=&quot;tvdb-$$20.xml&quot;&gt;http://www.thetvdb.com/api/1D62F2F90030C444/series//all/en.zip&lt;/url&gt;" dest="6+">
         <expression>(\d+)</expression>
       </RegExp>
-      <RegExp input="$$19" output="&lt;url function=&quot;GetFanartDataReturnAPI&quot; cache=&quot;$$20.xml&quot;&gt;&amp;&lt;/url&gt;" dest="6">
+      <RegExp input="$$19" output="&lt;url function=&quot;GetFanartDataReturnAPI&quot; cache=&quot;$$20.xml&quot;&gt;&amp;&lt;/url&gt;" dest="6+">
         <expression>[^\d]+</expression>
       </RegExp>
       <RegExp input="$$6" output="\1" dest="8+">
@@ -693,6 +702,7 @@
     $$15 ... List of thumbs
     $$14 ... List of banners
     $$13 ... Direct call to GetFanartDataAPI (true/false)
+    $$12 ... IMDb/TMDb anime id
   -->

   <GetTVDBLookupAPI clearbuffers="no" dest="4">
@@ -838,7 +848,7 @@
   </GetFanartAPI>

   <GetFanartDataReturnAPI clearbuffers="no" dest="4">
-    <RegExp input="$$6$$5$$16" output="&lt;details&gt;&lt;/details&gt;" dest="4">
+    <RegExp input="$$6$$5&lt;fanart&gt;$$16&lt;/fanart&gt;" output="&lt;details&gt;&lt;/details&gt;" dest="4">
       <RegExp input="$INFO[IdFrom]-$$19" output="&lt;id&gt;\1&lt;/id&gt;" dest="6">
         <expression clear="yes">TheTVDB\.com-(\d+)</expression>
       </RegExp>
@@ -863,8 +873,8 @@
       <RegExp input="$$1" output="\1" dest="5">
         <expression clear="yes" noclean="1">(?i)&lt;Banners&gt;(.*?)&lt;/Banners&gt;</expression>
       </RegExp>
-      <RegExp conditional="Fanarts" input="$$6" output="&lt;fanart url=&quot;http://thetvdb.com/banners/&quot;&gt;&lt;/fanart&gt;" dest="16+">
-        <RegExp input="$$5" output="&lt;thumb dim=&quot;\2&quot; colors=&quot;\3&quot; preview=&quot;_cache/&quot;&gt;&lt;/thumb&gt;" dest="6">
+      <RegExp conditional="Fanarts" input="$$6" output="" dest="16+">
+        <RegExp input="$$5" output="&lt;thumb dim=&quot;\2&quot; colors=&quot;\3&quot; preview=&quot;http://thetvdb.com/banners/_cache/&quot;&gt;http://thetvdb.com/banners/&lt;/thumb&gt;" dest="6">
           <expression clear="yes" repeat="yes">(?i)&lt;BannerPath&gt;([^&lt;]*)&lt;/BannerPath&gt;[^&lt;]*&lt;BannerType&gt;fanart&lt;/BannerType&gt;[^&lt;]*&lt;BannerType2&gt;([^&lt;]*)&lt;/BannerType2&gt;[^&lt;]*&lt;Colors&gt;([^&lt;]*)&lt;/Colors&gt;</expression>
         </RegExp>
         <expression noclean="1">(.+)</expression>
@@ -908,6 +918,21 @@
       <expression noclean="1"/>
     </RegExp>
   </GetFanartDataAPI>
+
+  <GetTMDBFanartAPI clearbuffers="no" dest="4">
+    <RegExp input="" output="&lt;details&gt;&lt;details&gt;" dest="4">
+      <RegExp input="$$9" output="" dest="16+">
+        <RegExp input="$$1" output="" dest="7">
+          <expression clear="yes" noclean="1">&quot;backdrops&quot;:\[{([^\]]*)</expression>
+        </RegExp>
+        <RegExp input="$$7" output="&lt;thumb preview=&quot;http://cf2.imgobject.com/t/p/w780&quot;&gt;http://cf2.imgobject.com/t/p/original&lt;/thumb&gt;" dest="9">
+          <expression repeat="yes" noclean="1">&quot;file_path&quot;:&quot;([^&quot;]*)</expression>
+        </RegExp>
+        <expression noclean="1">(.+)</expression>
+      </RegExp>
+     <expression/>
+    </RegExp>
+  </GetTMDBFanartAPI>

   <GetEpisodeList clearbuffers="yes" dest="4">
     <RegExp input="$$8" output="&lt;episodeguide&gt;\1&lt;/episodeguide&gt;" dest="4">