diff --git a/miku/bot.lua b/miku/bot.lua
index 7f0b9de..e6c69e5 100644
--- a/miku/bot.lua
+++ b/miku/bot.lua
@@ -3,7 +3,7 @@ local bot = {}
 bindings = require('miku.bindings')
 utilities = require('miku.utilities')
 
-bot.version = '160816'
+bot.version = '160823'
 
 function bot:init(config) -- The function run when the bot is started or reloaded.
 	cred_data = load_cred()
diff --git a/miku/plugins/plex.lua b/miku/plugins/plex.lua
index f7c5fa9..69f2893 100644
--- a/miku/plugins/plex.lua
+++ b/miku/plugins/plex.lua
@@ -57,6 +57,12 @@ function plex:get_plex(query)
 	episode = ''
   end
 	
+  if data.parentTitle then
+	artist = '<b>'..data.parentTitle..'</b>'
+  else
+	artist = ''
+  end
+	
   if data.grandparentTitle then
 	from = ' (aus <i>'..data.grandparentTitle..'</i> ['..string.gsub(season..episode, 'S0E', 'SP')..']'..') '
   else
@@ -76,9 +82,9 @@ function plex:get_plex(query)
   end
 	
   if data.originallyAvailableAt then
-	date = '\n<b>Ausstrahlung:</b> '..makeOurDate(data.originallyAvailableAt)
+	date = makeOurDate(data.originallyAvailableAt)
   elseif data.year then
-	date = '\n<b>Ausstrahlung:</b> '..data.year
+	date = data.year
   else
 	date = ''
   end
@@ -128,7 +134,17 @@ function plex:get_plex(query)
     pic = nil
   end
 
-  local text = title..tag..from..origtitle..studio..date..episodes..fsk..duration..rating..desc
+  if data.librarySectionTitle == 'Animes' then
+    text = title..from..studio..'\n<b>Ausstrahlung:</b> '..date..episodes..fsk..duration..rating..desc
+  elseif data.librarySectionTitle == 'Cartoons' then
+    text = title..from..studio..'\n<b>Ausstrahlung:</b> '..date..episodes..fsk..duration..rating..desc
+  elseif data.librarySectionTitle == 'Filme' then
+    text = title..tag..origtitle..studio..'\n<b>Veröffentlicht:</b> '..date..fsk..duration..rating..desc
+  elseif data.librarySectionTitle == 'Musik' then
+    text = title..' von '..artist..'\n<b>Veröffentlicht:</b> '..date
+  elseif data.librarySectionTitle == 'Serien' then
+    text = title..from..studio..'\n<b>Ausstrahlung:</b> '..date..episodes..fsk..duration..rating..desc
+  end
 
   if string.match(title, 'Local Network') then
     return 'Nichts gefunden!'