diff --git a/shows/examples/basic.xml b/shows/examples/basic.xml
index f387376..619745e 100644
--- a/shows/examples/basic.xml
+++ b/shows/examples/basic.xml
@@ -1,15 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?xml-stylesheet type="text/xsl" href="https://boyska.degenerazione.xyz/radiomanifest/shows-table.xsl"?>
-<shows>
-    <show>
-        <name>Learn to cook in C++</name>
-        <website>http://radioexample.com/shows/learn-cook</website>
-        <feed>http://radioexample.com/shows/learn-cook/feed</feed>
-        <schedule>http://radioexample.com/shows/learn-cook.ics</schedule>
-    </show>
-    <show>
-        <name>Uncensored information</name>
-        <website>http://radioexample.com/shows/info</website>
-        <feed>http://radioexample.com/shows/info/feed</feed>
-    </show>
-</shows>
+<?xml version="1.0" encoding="UTF-8"?>
+<xbel version="1.0"
+      xmlns:show="https://radiomanifest.degenerazione.xyz/v0.2/shows/"
+>
+  <bookmark href="http://radioexample.com/shows/learn-cook">
+    <title>Learn to cook in C++</title>
+    <info>
+      <metadata owner="https://radiomanifest.degenerazione.xyz/">
+        <show:name>Learn to cook in C++</show:name>
+        <show:id>learn-C++</show:id>
+        <show:description>A podcast about C++, templates, and nouvelle cuisine</show:description>
+        <show:website>http://radioexample.com/shows/learn-cook</show:website>
+        <show:feed>http://radioexample.com/shows/learn-cook/feed</show:feed>
+        <show:schedule>http://radioexample.com/shows/learn-cook.ics</show:schedule>
+      </metadata>
+    </info>
+  </bookmark>
+  <folder>
+    <title>Information</title>
+    <bookmark href="http://radioexample.com/shows/learn-cook">
+      <title>Uncensored information</title>
+      <info>
+        <metadata owner="https://radiomanifest.degenerazione.xyz/">
+          <show:name>Uncensored information</show:name>
+          <show:id>uncensored</show:id>
+          <show:description>News, news & more news</show:description>
+          <show:website>http://radioexample.com/shows/uncensored</show:website>
+          <show:feed type="application/rss+xml">http://radioexample.com/shows/uncensored/feed</show:feed>
+          <show:schedule type="text/calendar">http://radioexample.com/shows/uncensored.ics</show:schedule>
+          <show:schedule type="application/calendar+json">http://radioexample.com/shows/uncensored.json</show:schedule>
+        </metadata>
+      </info>
+    </bookmark>
+  </folder>
+</xbel>
diff --git a/shows/failing/noname.xml b/shows/failing/noname.xml
index 04dd3df..a493e96 100644
--- a/shows/failing/noname.xml
+++ b/shows/failing/noname.xml
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<shows>
-    <show>
-        <website>http://radioexample.com/shows/learn-cook</website>
-        <feed>http://radioexample.com/shows/learn-cook/feed</feed>
-        <schedule>http://radioexample.com/shows/learn-cook.ics</schedule>
-    </show>
-</shows>
+<?xml version="1.0" encoding="UTF-8"?>
+<xbel version="1.0"
+      xmlns:show="https://radiomanifest.degenerazione.xyz/v0.2/shows/"
+>
+  <bookmark href="http://radioexample.com/shows/learn-cook">
+    <info>
+      <metadata owner="https://radiomanifest.degenerazione.xyz/">
+        <show:id>learn-C++</show:id>
+        <show:feed>http://radioexample.com/shows/learn-cook/feed</show:feed>
+      </metadata>
+    </info>
+  </bookmark>
+</xbel>