New __authors__ key replaces __author_name__ and __author_mail__ + Whitespaces and EOF fixup

72 files changed, 127 insertions, 144 deletions

diff --git a/module/plugins/crypter/BitshareComFolder.py b/module/plugins/crypter/BitshareComFolder.py
index f6a74bcad..59226b7bb 100644
--- a/module/plugins/crypter/BitshareComFolder.py
+++ b/module/plugins/crypter/BitshareComFolder.py
@@ -11,8 +11,8 @@ class BitshareComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?bitshare\.com/\?d=\w+'
 
     __description__ = """Bitshare.com folder decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<a href="(http://bitshare.com/files/.+)">.+</a></td>'
     TITLE_PATTERN = r'View public folder "(.+)"</h1>'
diff --git a/module/plugins/crypter/C1neonCom.py b/module/plugins/crypter/C1neonCom.py
index 829ed63d6..40692d0d1 100644
--- a/module/plugins/crypter/C1neonCom.py
+++ b/module/plugins/crypter/C1neonCom.py
@@ -11,5 +11,4 @@ class C1neonCom(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?c1neon.com/.*?'
 
     __description__ = """C1neon.com decrypter plugin"""
-    __author_name__ = "godofdream"
-    __author_mail__ = "soilfiction@gmail.com"
+    __authors__ = [("godofdream", "soilfiction@gmail.com")]
diff --git a/module/plugins/crypter/ChipDe.py b/module/plugins/crypter/ChipDe.py
index e545efa54..9aac1efa4 100644
--- a/module/plugins/crypter/ChipDe.py
+++ b/module/plugins/crypter/ChipDe.py
@@ -12,8 +12,7 @@ class ChipDe(Crypter):
     __pattern__ = r'http://(?:www\.)?chip.de/video/.*\.html'
 
     __description__ = """Chip.de decrypter plugin"""
-    __author_name__ = "4Christopher"
-    __author_mail__ = "4Christopher@gmx.de"
+    __authors__ = [("4Christopher", "4Christopher@gmx.de")]
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/CrockoComFolder.py b/module/plugins/crypter/CrockoComFolder.py
index 56abeac29..dae536dd0 100644
--- a/module/plugins/crypter/CrockoComFolder.py
+++ b/module/plugins/crypter/CrockoComFolder.py
@@ -11,7 +11,7 @@ class CrockoComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?crocko.com/f/.*'
 
     __description__ = """Crocko.com folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     LINK_PATTERN = r'<td class="last"><a href="([^"]+)">download</a>'
diff --git a/module/plugins/crypter/CryptItCom.py b/module/plugins/crypter/CryptItCom.py
index 66c5e7ca7..a248a92d1 100644
--- a/module/plugins/crypter/CryptItCom.py
+++ b/module/plugins/crypter/CryptItCom.py
@@ -11,5 +11,4 @@ class CryptItCom(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?crypt-it\.com/(s|e|d|c)/[\w]+'
 
     __description__ = """Crypt-it.com decrypter plugin"""
-    __author_name__ = "jeix"
-    __author_mail__ = "jeix@hasnomail.de"
+    __authors__ = [("jeix", "jeix@hasnomail.de")]
diff --git a/module/plugins/crypter/CzshareComFolder.py b/module/plugins/crypter/CzshareComFolder.py
index 64affc867..3762cbf10 100644
--- a/module/plugins/crypter/CzshareComFolder.py
+++ b/module/plugins/crypter/CzshareComFolder.py
@@ -12,8 +12,8 @@ class CzshareComFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*'
 
     __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     FOLDER_PATTERN = r'<tr class="subdirectory">\s*<td>\s*<table>(.*?)</table>'
     LINK_PATTERN = r'<td class="col2"><a href="([^"]+)">info</a></td>'
diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index 9d76bf11a..c0b137992 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -15,8 +15,7 @@ class DDLMusicOrg(Crypter):
     __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
 
     __description__ = """Ddl-music.org decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
 
 
     def setup(self):
diff --git a/module/plugins/crypter/DailymotionBatch.py b/module/plugins/crypter/DailymotionBatch.py
index e43d4e1fd..cc97910af 100644
--- a/module/plugins/crypter/DailymotionBatch.py
+++ b/module/plugins/crypter/DailymotionBatch.py
@@ -17,8 +17,7 @@ class DailymotionBatch(Crypter):
     __pattern__ = r'https?://(?:www\.)?dailymotion\.com/((playlists/)?(?P<TYPE>playlist|user)/)?(?P<ID>[\w^_]+)(?(TYPE)|#)'
 
     __description__ = """Dailymotion.com channel & playlist decrypter"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, ref, req=None):
diff --git a/module/plugins/crypter/DataHuFolder.py b/module/plugins/crypter/DataHuFolder.py
index 31e71944f..405945f58 100644
--- a/module/plugins/crypter/DataHuFolder.py
+++ b/module/plugins/crypter/DataHuFolder.py
@@ -13,8 +13,9 @@ class DataHuFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?data.hu/dir/\w+'
 
     __description__ = """Data.hu folder decrypter plugin"""
-    __author_name__ = ("crash", "stickell")
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("crash", None),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r"<a href='(http://data\.hu/get/.+)' target='_blank'>\1</a>"
     TITLE_PATTERN = ur'<title>(.+) Let\xf6lt\xe9se</title>'
diff --git a/module/plugins/crypter/DdlstorageComFolder.py b/module/plugins/crypter/DdlstorageComFolder.py
index 3b1dc6dd6..87719cb26 100644
--- a/module/plugins/crypter/DdlstorageComFolder.py
+++ b/module/plugins/crypter/DdlstorageComFolder.py
@@ -11,8 +11,8 @@ class DdlstorageComFolder(DeadCrypter):
     __pattern__ = r'https?://(?:www\.)?ddlstorage\.com/folder/\w+'
 
     __description__ = """DDLStorage.com folder decrypter plugin"""
-    __author_name__ = ("godofdream", "stickell")
-    __author_mail__ = ("soilfiction@gmail.com", "l.stickell@yahoo.it")
+    __authors__ = [("godofdream", "soilfiction@gmail.com"),
+                   ("stickell", "l.stickell@yahoo.it")]
 
 
 getInfo = create_getInfo(SpeedLoadOrg)
diff --git a/module/plugins/crypter/DepositfilesComFolder.py b/module/plugins/crypter/DepositfilesComFolder.py
index b7c273f0b..3c4a95a38 100644
--- a/module/plugins/crypter/DepositfilesComFolder.py
+++ b/module/plugins/crypter/DepositfilesComFolder.py
@@ -11,7 +11,7 @@ class DepositfilesComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?depositfiles.com/folders/\w+'
 
     __description__ = """Depositfiles.com folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     LINK_PATTERN = r'<div class="progressName"[^>]*>\s*<a href="([^"]+)" title="[^"]*" target="_blank">'
diff --git a/module/plugins/crypter/Dereferer.py b/module/plugins/crypter/Dereferer.py
index 21529ddfd..215fb52fa 100644
--- a/module/plugins/crypter/Dereferer.py
+++ b/module/plugins/crypter/Dereferer.py
@@ -15,8 +15,7 @@ class Dereferer(Crypter):
     __pattern__ = r'https?://([^/]+)/.*?(?P<url>(ht|f)tps?(://|%3A%2F%2F).*)'
 
     __description__ = """Crypter for dereferers"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/DevhostStFolder.py b/module/plugins/crypter/DevhostStFolder.py
index 049f1dabc..b79d9f264 100644
--- a/module/plugins/crypter/DevhostStFolder.py
+++ b/module/plugins/crypter/DevhostStFolder.py
@@ -18,8 +18,8 @@ class DevhostStFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?d-h\.st/users/(?P<USER>\w+)(/\?fld_id=(?P<ID>\d+))?'
 
     __description__ = """d-h.st folder decrypter plugin"""
-    __author_name_ = ("zapp-brannigan", "Walter Purcaro")
-    __author_mail_ = ("fuerst.reinje@web.de", "vuolter@gmail.com")
+    __authors__ = [("zapp-brannigan", "fuerst.reinje@web.de"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     LINK_PATTERN = r'(?:/> |;">)<a href="(.+?)"(?!>Back to \w+<)'
diff --git a/module/plugins/crypter/DlProtectCom.py b/module/plugins/crypter/DlProtectCom.py
index 4c958437a..f748b5e62 100644
--- a/module/plugins/crypter/DlProtectCom.py
+++ b/module/plugins/crypter/DlProtectCom.py
@@ -16,8 +16,8 @@ class DlProtectCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?dl-protect\.com/((en|fr)/)?(?P<ID>\w+)'
 
     __description__ = """Dl-protect.com decrypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
 
     OFFLINE_PATTERN = r'>Unfortunately, the link you are looking for is not found'
 
diff --git a/module/plugins/crypter/DontKnowMe.py b/module/plugins/crypter/DontKnowMe.py
index 23fbb8d52..4f2b70aaf 100644
--- a/module/plugins/crypter/DontKnowMe.py
+++ b/module/plugins/crypter/DontKnowMe.py
@@ -15,8 +15,8 @@ class DontKnowMe(Crypter):
     __pattern__ = r'http://(?:www\.)?dontknow.me/at/\?.+$'
 
     __description__ = """DontKnow.me decrypter plugin"""
-    __author_name__ = "selaux"
-    __author_mail__ = None
+    __authors__ = [("selaux", None)]
+
 
     LINK_PATTERN = r'http://dontknow.me/at/\?(.+)$'
 
diff --git a/module/plugins/crypter/DuckCryptInfo.py b/module/plugins/crypter/DuckCryptInfo.py
index b278f2248..8c5c344f6 100644
--- a/module/plugins/crypter/DuckCryptInfo.py
+++ b/module/plugins/crypter/DuckCryptInfo.py
@@ -15,8 +15,8 @@ class DuckCryptInfo(Crypter):
     __pattern__ = r'http://(?:www\.)?duckcrypt.info/(folder|wait|link)/(\w+)/?(\w*)'
 
     __description__ = """DuckCrypt.info decrypter plugin"""
-    __author_name__ = "godofdream"
-    __author_mail__ = "soilfiction@gmail.com"
+    __authors__ = [("godofdream", "soilfiction@gmail.com")]
+
 
     TIMER_PATTERN = r'<span id="timer">(.*)</span>'
 
diff --git a/module/plugins/crypter/DuploadOrgFolder.py b/module/plugins/crypter/DuploadOrgFolder.py
index 6f764f687..406a7a850 100644
--- a/module/plugins/crypter/DuploadOrgFolder.py
+++ b/module/plugins/crypter/DuploadOrgFolder.py
@@ -11,7 +11,7 @@ class DuploadOrgFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?dupload\.org/folder/\d+/'
 
     __description__ = """Dupload.org folder decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<td style="[^"]+"><a href="(http://[^"]+)" target="_blank">[^<]+</a></td>'
diff --git a/module/plugins/crypter/EasybytezComFolder.py b/module/plugins/crypter/EasybytezComFolder.py
index 2a261e709..565ee0745 100644
--- a/module/plugins/crypter/EasybytezComFolder.py
+++ b/module/plugins/crypter/EasybytezComFolder.py
@@ -11,8 +11,7 @@ class EasybytezComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?easybytez\.com/users/(?P<ID>\d+/\d+)'
 
     __description__ = """Easybytez.com folder decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
     URL_REPLACEMENTS = [(__pattern__, r"http://www.easybytez.com/users/\g<ID>?per_page=10000")]
diff --git a/module/plugins/crypter/EmbeduploadCom.py b/module/plugins/crypter/EmbeduploadCom.py
index 6b876ed7f..f23ae5101 100644
--- a/module/plugins/crypter/EmbeduploadCom.py
+++ b/module/plugins/crypter/EmbeduploadCom.py
@@ -15,8 +15,8 @@ class EmbeduploadCom(Crypter):
                   ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
 
     __description__ = """EmbedUpload.com decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     LINK_PATTERN = r'<div id="([^"]+)"[^>]*>\s*<a href="([^"]+)" target="_blank" (?:class="DownloadNow"|style="color:red")>'
 
diff --git a/module/plugins/crypter/FilebeerInfoFolder.py b/module/plugins/crypter/FilebeerInfoFolder.py
index 0743dcb0f..9c0599742 100644
--- a/module/plugins/crypter/FilebeerInfoFolder.py
+++ b/module/plugins/crypter/FilebeerInfoFolder.py
@@ -11,5 +11,4 @@ class FilebeerInfoFolder(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?filebeer\.info/(\d+~f).*'
 
     __description__ = """Filebeer.info folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/module/plugins/crypter/FilecloudIoFolder.py b/module/plugins/crypter/FilecloudIoFolder.py
index eb6aaa847..eccf293d7 100644
--- a/module/plugins/crypter/FilecloudIoFolder.py
+++ b/module/plugins/crypter/FilecloudIoFolder.py
@@ -11,8 +11,8 @@ class FilecloudIoFolder(SimpleCrypter):
     __pattern__ = r'https?://(?:www\.)?(filecloud\.io|ifile\.it)/_\w+'
 
     __description__ = """Filecloud.io folder decrypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
 
     LINK_PATTERN = r'href="(http://filecloud.io/\w+)" title'
     TITLE_PATTERN = r'>(.+?) - filecloud.io<'
diff --git a/module/plugins/crypter/FilefactoryComFolder.py b/module/plugins/crypter/FilefactoryComFolder.py
index 08978c032..a17451941 100644
--- a/module/plugins/crypter/FilefactoryComFolder.py
+++ b/module/plugins/crypter/FilefactoryComFolder.py
@@ -11,8 +11,8 @@ class FilefactoryComFolder(SimpleCrypter):
     __pattern__ = r'https?://(?:www\.)?filefactory\.com/(?:f|folder)/\w+'
 
     __description__ = """Filefactory.com folder decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<td><a href="([^"]+)">'
     TITLE_PATTERN = r'<h1>Files in <span>(.+)</span></h1>'
diff --git a/module/plugins/crypter/FilerNetFolder.py b/module/plugins/crypter/FilerNetFolder.py
index 0195b8af9..b5f59677d 100644
--- a/module/plugins/crypter/FilerNetFolder.py
+++ b/module/plugins/crypter/FilerNetFolder.py
@@ -11,8 +11,9 @@ class FilerNetFolder(SimpleCrypter):
     __pattern__ = r'https?://filer\.net/folder/\w{16}'
 
     __description__ = """Filer.net decrypter plugin"""
-    __author_name_ = ("nath_schwarz", "stickell")
-    __author_mail_ = ("nathan.notwhite@gmail.com", "l.stickell@yahoo.it")
+    __authors__ = [("nath_schwarz", "nathan.notwhite@gmail.com"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'href="(/get/\w{16})">(?!<)'
     TITLE_PATTERN = r'<h3>(.+?) - <small'
diff --git a/module/plugins/crypter/FileserveComFolder.py b/module/plugins/crypter/FileserveComFolder.py
index 2db6baf0e..1fac3eeee 100644
--- a/module/plugins/crypter/FileserveComFolder.py
+++ b/module/plugins/crypter/FileserveComFolder.py
@@ -13,8 +13,8 @@ class FileserveComFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?fileserve.com/list/\w+'
 
     __description__ = """FileServe.com folder decrypter plugin"""
-    __author_name__ = "fionnc"
-    __author_mail__ = "fionnc@gmail.com"
+    __authors__ = [("fionnc", "fionnc@gmail.com")]
+
 
     FOLDER_PATTERN = r'<table class="file_list">(.*?)</table>'
     LINK_PATTERN = r'<a href="([^"]+)" class="sheet_icon wbold">'
diff --git a/module/plugins/crypter/FilestubeCom.py b/module/plugins/crypter/FilestubeCom.py
index 3caee9e62..6bd081894 100644
--- a/module/plugins/crypter/FilestubeCom.py
+++ b/module/plugins/crypter/FilestubeCom.py
@@ -11,8 +11,8 @@ class FilestubeCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?filestube\.(?:com|to)/\w+'
 
     __description__ = """Filestube.com decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<a class=\"file-link-main(?: noref)?\" [^>]* href=\"(http://[^\"]+)'
     TITLE_PATTERN = r'<h1\s*> (.+)  download\s*</h1>'
diff --git a/module/plugins/crypter/FiletramCom.py b/module/plugins/crypter/FiletramCom.py
index 6125914ff..5717df47e 100644
--- a/module/plugins/crypter/FiletramCom.py
+++ b/module/plugins/crypter/FiletramCom.py
@@ -11,8 +11,9 @@ class FiletramCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?filetram.com/[^/]+/.+'
 
     __description__ = """Filetram.com decrypter plugin"""
-    __author_name__ = ("igel", "stickell")
-    __author_mail__ = ("igelkun@myopera.com", "l.stickell@yahoo.it")
+    __authors__ = [("igel", "igelkun@myopera.com"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'\s+(http://.+)'
     TITLE_PATTERN = r'<title>(.+?) - Free Download'
diff --git a/module/plugins/crypter/FiredriveComFolder.py b/module/plugins/crypter/FiredriveComFolder.py
index 4831101cc..c41c2f933 100644
--- a/module/plugins/crypter/FiredriveComFolder.py
+++ b/module/plugins/crypter/FiredriveComFolder.py
@@ -13,8 +13,8 @@ class FiredriveComFolder(SimpleCrypter):
     __pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/share/.+'
 
     __description__ = """Firedrive.com folder decrypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
 
     LINK_PATTERN = r'<div class="pf_item pf_(file|folder).+?public=\'(.+?)\''
     TITLE_PATTERN = r'>Shared Folder "(.+)" | Firedrive<'
diff --git a/module/plugins/crypter/FourChanOrg.py b/module/plugins/crypter/FourChanOrg.py
index c497fa799..8b2c74b44 100644
--- a/module/plugins/crypter/FourChanOrg.py
+++ b/module/plugins/crypter/FourChanOrg.py
@@ -15,8 +15,7 @@ class FourChanOrg(Crypter):
     __pattern__ = r'http://(?:www\.)?boards\.4chan.org/\w+/res/(\d+)'
 
     __description__ = """4chan.org folder decrypter plugin"""
-    __author_name__ = None
-    __author_mail__ = None
+    __authors__ = []
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/FreakhareComFolder.py b/module/plugins/crypter/FreakhareComFolder.py
index 5036a8842..34b64bc4a 100644
--- a/module/plugins/crypter/FreakhareComFolder.py
+++ b/module/plugins/crypter/FreakhareComFolder.py
@@ -13,8 +13,8 @@ class FreakhareComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?freakshare\.com/folder/.+'
 
     __description__ = """Freakhare.com folder decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<a href="(http://freakshare.com/files/[^"]+)" target="_blank">'
     TITLE_PATTERN = r'Folder:</b> (.+)'
diff --git a/module/plugins/crypter/FreetexthostCom.py b/module/plugins/crypter/FreetexthostCom.py
index bd8a90ce5..c91ee6d10 100644
--- a/module/plugins/crypter/FreetexthostCom.py
+++ b/module/plugins/crypter/FreetexthostCom.py
@@ -13,8 +13,7 @@ class FreetexthostCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?freetexthost\.com/\w+'
 
     __description__ = """Freetexthost.com decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
 
 
     def getLinks(self):
diff --git a/module/plugins/crypter/FshareVnFolder.py b/module/plugins/crypter/FshareVnFolder.py
index 5976ff6d5..1aa8bb3ea 100644
--- a/module/plugins/crypter/FshareVnFolder.py
+++ b/module/plugins/crypter/FshareVnFolder.py
@@ -11,7 +11,7 @@ class FshareVnFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?fshare.vn/folder/.*'
 
     __description__ = """Fshare.vn folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     LINK_PATTERN = r'<li class="w_80pc"><a href="([^"]+)" target="_blank">'
diff --git a/module/plugins/crypter/GooGl.py b/module/plugins/crypter/GooGl.py
index b4f6c3ea7..8b0c2ac91 100644
--- a/module/plugins/crypter/GooGl.py
+++ b/module/plugins/crypter/GooGl.py
@@ -12,8 +12,8 @@ class GooGl(Crypter):
     __pattern__ = r'https?://(?:www\.)?goo\.gl/\w+'
 
     __description__ = """Goo.gl decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     API_URL = "https://www.googleapis.com/urlshortener/v1/url"
 
diff --git a/module/plugins/crypter/HoerbuchIn.py b/module/plugins/crypter/HoerbuchIn.py
index a283ff823..6774cd72e 100644
--- a/module/plugins/crypter/HoerbuchIn.py
+++ b/module/plugins/crypter/HoerbuchIn.py
@@ -15,8 +15,9 @@ class HoerbuchIn(Crypter):
     __pattern__ = r'http://(?:www\.)?hoerbuch\.in/(wp/horbucher/\d+/.+/|tp/out.php\?.+|protection/folder_\d+\.html)'
 
     __description__ = """Hoerbuch.in decrypter plugin"""
-    __author_name__ = ("spoob", "mkaay")
-    __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de")
+    __authors__ = [("spoob", "spoob@pyload.org"),
+                   ("mkaay", "mkaay@mkaay.de")]
+
 
     article = re.compile("http://(?:www\.)?hoerbuch\.in/wp/horbucher/\d+/.+/")
     protection = re.compile("http://(?:www\.)?hoerbuch\.in/protection/folder_\d+.html")
diff --git a/module/plugins/crypter/HotfileFolderCom.py b/module/plugins/crypter/HotfileFolderCom.py
index 16fa604c9..e97d2ca91 100644
--- a/module/plugins/crypter/HotfileFolderCom.py
+++ b/module/plugins/crypter/HotfileFolderCom.py
@@ -11,5 +11,4 @@ class HotfileFolderCom(DeadCrypter):
     __pattern__ = r'https?://(?:www\.)?hotfile\.com/list/\w+/\w+'
 
     __description__ = """Hotfile.com folder decrypter plugin"""
-    __author_name__ = "RaNaN"
-    __author_mail__ = "RaNaN@pyload.org"
+    __authors__ = [("RaNaN", "RaNaN@pyload.org")]
diff --git a/module/plugins/crypter/ILoadTo.py b/module/plugins/crypter/ILoadTo.py
index d7818570a..c1dbab836 100644
--- a/module/plugins/crypter/ILoadTo.py
+++ b/module/plugins/crypter/ILoadTo.py
@@ -11,5 +11,4 @@ class ILoadTo(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?iload\.to/go/\d+-[\w\.-]+/'
 
     __description__ = """Iload.to decrypter plugin"""
-    __author_name__ = "hzpz"
-    __author_mail__ = None
+    __authors__ = [("hzpz", None)]
diff --git a/module/plugins/crypter/ImgurComAlbum.py b/module/plugins/crypter/ImgurComAlbum.py
index 72674a8fb..d4e6b13ab 100644
--- a/module/plugins/crypter/ImgurComAlbum.py
+++ b/module/plugins/crypter/ImgurComAlbum.py
@@ -12,8 +12,8 @@ class ImgurComAlbum(SimpleCrypter):
     __pattern__ = r'https?://(?:www\.|m\.)?imgur\.com/(a|gallery|)/?\w{5,7}'
 
     __description__ = """Imgur.com decrypter plugin"""
-    __author_name_ = "nath_schwarz"
-    __author_mail_ = "nathan.notwhite@gmail.com"
+    __authors__ = [("nath_schwarz", "nathan.notwhite@gmail.com")]
+
 
     TITLE_PATTERN = r'(.+?) - Imgur'
     LINK_PATTERN = r'i\.imgur\.com/\w{7}s?\.(?:jpeg|jpg|png|gif|apng)'
diff --git a/module/plugins/crypter/LetitbitNetFolder.py b/module/plugins/crypter/LetitbitNetFolder.py
index 0297d2007..3ca24195d 100644
--- a/module/plugins/crypter/LetitbitNetFolder.py
+++ b/module/plugins/crypter/LetitbitNetFolder.py
@@ -12,8 +12,9 @@ class LetitbitNetFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?letitbit.net/folder/\w+'
 
     __description__ = """Letitbit.net folder decrypter plugin"""
-    __author_name__ = ("DHMH", "z00nx")
-    __author_mail__ = ("webmaster@pcProfil.de", "z00nx0@gmail.com")
+    __authors__ = [("DHMH", "webmaster@pcProfil.de"),
+                   ("z00nx", "z00nx0@gmail.com")]
+
 
     FOLDER_PATTERN = r'<table>(.*)</table>'
     LINK_PATTERN = r'<a href="([^"]+)" target="_blank">'
diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py
index 8b2b02ea6..9c0bbdeac 100644
--- a/module/plugins/crypter/LinkSaveIn.py
+++ b/module/plugins/crypter/LinkSaveIn.py
@@ -21,8 +21,7 @@ class LinkSaveIn(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?linksave.in/(?P<id>\w+)$'
 
     __description__ = """LinkSave.in decrypter plugin"""
-    __author_name__ = "fragonib"
-    __author_mail__ = "fragonib[AT]yahoo[DOT]es"
+    __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
     COOKIES = [(".linksave.in", "Linksave_Language", "english")]
diff --git a/module/plugins/crypter/LinkdecrypterCom.py b/module/plugins/crypter/LinkdecrypterCom.py
index f9f29d5f5..cc688cd8e 100644
--- a/module/plugins/crypter/LinkdecrypterCom.py
+++ b/module/plugins/crypter/LinkdecrypterCom.py
@@ -12,8 +12,9 @@ class LinkdecrypterCom(Crypter):
     __pattern__ = None
 
     __description__ = """Linkdecrypter.com"""
-    __author_name__ = ("zoidberg", "flowlee")
-    __author_mail__ = ("zoidberg@mujmail.cz", "")
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz"),
+                   ("flowlee", None)]
+
 
     TEXTAREA_PATTERN = r'<textarea name="links" wrap="off" readonly="1" class="caja_des">(.+)</textarea>'
     PASSWORD_PATTERN = r'<input type="text" name="password"'
diff --git a/module/plugins/crypter/LixIn.py b/module/plugins/crypter/LixIn.py
index 7aedda686..af4f182b4 100644
--- a/module/plugins/crypter/LixIn.py
+++ b/module/plugins/crypter/LixIn.py
@@ -13,8 +13,8 @@ class LixIn(Crypter):
     __pattern__ = r'http://(?:www\.)?lix\.in/(?P<ID>.+)'
 
     __description__ = """Lix.in decrypter plugin"""
-    __author_name__ = "spoob"
-    __author_mail__ = "spoob@pyload.org"
+    __authors__ = [("spoob", "spoob@pyload.org")]
+
 
     CAPTCHA_PATTERN = r'<img src="(?P<image>captcha_img.php\?.*?)"'
     SUBMIT_PATTERN = r"value='continue.*?'"
diff --git a/module/plugins/crypter/LofCc.py b/module/plugins/crypter/LofCc.py
index 8a5cd86ee..5fc04000f 100644
--- a/module/plugins/crypter/LofCc.py
+++ b/module/plugins/crypter/LofCc.py
@@ -11,5 +11,4 @@ class LofCc(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?lof.cc/(.*)'
 
     __description__ = """Lof.cc decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
diff --git a/module/plugins/crypter/MBLinkInfo.py b/module/plugins/crypter/MBLinkInfo.py
index 4fc066e57..edd846cf9 100644
--- a/module/plugins/crypter/MBLinkInfo.py
+++ b/module/plugins/crypter/MBLinkInfo.py
@@ -11,5 +11,5 @@ class MBLinkInfo(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?mblink\.info/?\?id=(\d+)'
 
     __description__ = """MBLink.info decrypter plugin"""
-    __author_name__ = ("Gummibaer", "stickell")
-    __author_mail__ = ("Gummibaer@wiki-bierkiste.de", "l.stickell@yahoo.it")
+    __authors__ = [("Gummibaer", "Gummibaer@wiki-bierkiste.de"),
+                   ("stickell", "l.stickell@yahoo.it")]
diff --git a/module/plugins/crypter/MediafireComFolder.py b/module/plugins/crypter/MediafireComFolder.py
index 45078c4ba..2a4de5272 100644
--- a/module/plugins/crypter/MediafireComFolder.py
+++ b/module/plugins/crypter/MediafireComFolder.py
@@ -14,8 +14,8 @@ class MediafireComFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?mediafire\.com/(folder/|\?sharekey=|\?\w{13}($|[/#]))'
 
     __description__ = """Mediafire.com folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     FOLDER_KEY_PATTERN = r"var afI= '(\w+)';"
     FILE_URL_PATTERN = r'<meta property="og:url" content="http://www.mediafire.com/\?(\w+)"/>'
diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py
index ba201621f..3a1701923 100644
--- a/module/plugins/crypter/Movie2kTo.py
+++ b/module/plugins/crypter/Movie2kTo.py
@@ -11,5 +11,4 @@ class Movie2kTo(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
 
     __description__ = """Movie2k.to decrypter plugin"""
-    __author_name__ = "4Christopher"
-    __author_mail__ = "4Christopher@gmx.de"
+    __authors__ = [("4Christopher", "4Christopher@gmx.de")]
diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index cd0ec33ad..0cb3048aa 100644
--- a/module/plugins/crypter/MultiUpOrg.py
+++ b/module/plugins/crypter/MultiUpOrg.py
@@ -14,8 +14,8 @@ class MultiUpOrg(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
 
     __description__ = """MultiUp.org crypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
 
     TITLE_PATTERN = r'<title>.*(?:Project|Projet|ownload|élécharger) (.+?) (?:\(|- )'
 
diff --git a/module/plugins/crypter/MultiloadCz.py b/module/plugins/crypter/MultiloadCz.py
index 7d43ec729..8f43e5796 100644
--- a/module/plugins/crypter/MultiloadCz.py
+++ b/module/plugins/crypter/MultiloadCz.py
@@ -14,8 +14,8 @@ class MultiloadCz(Crypter):
                   ("ignoredHoster", "str", "Ignored hoster list (bar-separated) ", "")]
 
     __description__ = """Multiload.cz decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     FOLDER_PATTERN = r'<form action="" method="get"><textarea[^>]*>([^>]*)</textarea></form>'
     LINK_PATTERN = r'<p class="manager-server"><strong>([^<]+)</strong></p><p class="manager-linky"><a href="([^"]+)">'
diff --git a/module/plugins/crypter/MultiuploadCom.py b/module/plugins/crypter/MultiuploadCom.py
index 398d33b5d..653c9a169 100644
--- a/module/plugins/crypter/MultiuploadCom.py
+++ b/module/plugins/crypter/MultiuploadCom.py
@@ -11,5 +11,4 @@ class MultiuploadCom(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?multiupload\.(com|nl)/\w+'
 
     __description__ = """ MultiUpload.com decrypter plugin """
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 3937299d0..1a6757006 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -18,8 +18,9 @@ class NCryptIn(Crypter):
     __pattern__ = r'http://(?:www\.)?ncrypt.in/(?P<type>folder|link|frame)-([^/\?]+)'
 
     __description__ = """NCrypt.in decrypter plugin"""
-    __author_name__ = ("fragonib", "stickell")
-    __author_mail__ = ("fragonib[AT]yahoo[DOT]es", "l.stickell@yahoo.it")
+    __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     JK_KEY = "jk"
     CRYPTED_KEY = "crypted"
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index 7baffb25e..1e60fa583 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -13,8 +13,9 @@ class NetfolderIn(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?netfolder.in/((?P<id1>\w+)/\w+|folder.php\?folder_id=(?P<id2>\w+))'
 
     __description__ = """NetFolder.in decrypter plugin"""
-    __author_name__ = ("RaNaN", "fragonib")
-    __author_mail__ = ("RaNaN@pyload.org", "fragonib[AT]yahoo[DOT]es")
+    __authors__ = [("RaNaN", "RaNaN@pyload.org"),
+                   ("fragonib", "fragonib[AT]yahoo[DOT]es")]
+
 
     TITLE_PATTERN = r'<div class="Text">Inhalt des Ordners <span.*>(.+)</span></div>'
 
diff --git a/module/plugins/crypter/NosvideoCom.py b/module/plugins/crypter/NosvideoCom.py
index ce8e2b372..fd065d571 100644
--- a/module/plugins/crypter/NosvideoCom.py
+++ b/module/plugins/crypter/NosvideoCom.py
@@ -11,8 +11,8 @@ class NosvideoCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?nosvideo\.com/\?v=\w+'
 
     __description__ = """Nosvideo.com decrypter plugin"""
-    __author_name__ = "igel"
-    __author_mail__ = "igelkun@myopera.com"
+    __authors__ = [("igel", "igelkun@myopera.com")]
+
 
     LINK_PATTERN = r'href="(http://(?:w{3}\.)?nosupload.com/\?d=\w+)"'
     TITLE_PATTERN = r'<[tT]itle>Watch (.+?)<'
diff --git a/module/plugins/crypter/OneKhDe.py b/module/plugins/crypter/OneKhDe.py
index 4b22432f8..2e6daf25d 100644
--- a/module/plugins/crypter/OneKhDe.py
+++ b/module/plugins/crypter/OneKhDe.py
@@ -14,8 +14,7 @@ class OneKhDe(Crypter):
     __pattern__ = r'http://(?:www\.)?1kh.de/f/'
 
     __description__ = """1kh.de decrypter plugin"""
-    __author_name__ = "spoob"
-    __author_mail__ = "spoob@pyload.org"
+    __authors__ = [("spoob", "spoob@pyload.org")]
 
 
     def __init__(self, parent):
diff --git a/module/plugins/crypter/OronComFolder.py b/module/plugins/crypter/OronComFolder.py
index f0b2f943c..b651c0041 100755
--- a/module/plugins/crypter/OronComFolder.py
+++ b/module/plugins/crypter/OronComFolder.py
@@ -11,5 +11,4 @@ class OronComFolder(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?oron.com/folder/\w+'
 
     __description__ = """Oron.com folder decrypter plugin"""
-    __author_name__ = "DHMH"
-    __author_mail__ = "webmaster@pcProfil.de"
+    __authors__ = [("DHMH", "webmaster@pcProfil.de")]
diff --git a/module/plugins/crypter/PastebinCom.py b/module/plugins/crypter/PastebinCom.py
index 9c114a56b..285110138 100644
--- a/module/plugins/crypter/PastebinCom.py
+++ b/module/plugins/crypter/PastebinCom.py
@@ -11,8 +11,8 @@ class PastebinCom(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?pastebin\.com/\w+'
 
     __description__ = """Pastebin.com decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<div class="de\d+">(https?://[^ <]+)(?:[^<]*)</div>'
     TITLE_PATTERN = r'<div class="paste_box_line1" title="([^"]+)">'
diff --git a/module/plugins/crypter/QuickshareCzFolder.py b/module/plugins/crypter/QuickshareCzFolder.py
index 9840b84df..a74772641 100644
--- a/module/plugins/crypter/QuickshareCzFolder.py
+++ b/module/plugins/crypter/QuickshareCzFolder.py
@@ -12,8 +12,8 @@ class QuickshareCzFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?quickshare.cz/slozka-\d+.*'
 
     __description__ = """Quickshare.cz folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     FOLDER_PATTERN = r'<textarea[^>]*>(.*?)</textarea>'
     LINK_PATTERN = r'(http://www.quickshare.cz/\S+)'
diff --git a/module/plugins/crypter/RSLayerCom.py b/module/plugins/crypter/RSLayerCom.py
index 7dda0beab..0013b7b6d 100644
--- a/module/plugins/crypter/RSLayerCom.py
+++ b/module/plugins/crypter/RSLayerCom.py
@@ -11,5 +11,4 @@ class RSLayerCom(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?rs-layer.com/directory-'
 
     __description__ = """RS-Layer.com decrypter plugin"""
-    __author_name__ = "hzpz"
-    __author_mail__ = None
+    __authors__ = [("hzpz", None)]
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 1c1afea25..4d0132ac4 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -17,8 +17,8 @@ class RelinkUs(Crypter):
     __pattern__ = r'http://(?:www\.)?relink.us/(f/|((view|go).php\?id=))(?P<id>.+)'
 
     __description__ = """Relink.us decrypter plugin"""
-    __author_name__ = "fragonib"
-    __author_mail__ = "fragonib[AT]yahoo[DOT]es"
+    __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
+
 
     # Constants
     PREFERRED_LINK_SOURCES = ["cnl2", "dlc", "web"]
diff --git a/module/plugins/crypter/SafelinkingNet.py b/module/plugins/crypter/SafelinkingNet.py
index d548bdf89..ca21fe907 100644
--- a/module/plugins/crypter/SafelinkingNet.py
+++ b/module/plugins/crypter/SafelinkingNet.py
@@ -19,8 +19,8 @@ class SafelinkingNet(Crypter):
     __pattern__ = r'https?://(?:www\.)?safelinking.net/([pd])/\w+'
 
     __description__ = """Safelinking.net decrypter plugin"""
-    __author_name__ = "quareevo"
-    __author_mail__ = "quareevo@arcor.de"
+    __authors__ = [("quareevo", "quareevo@arcor.de")]
+
 
     SOLVEMEDIA_PATTERN = "solvemediaApiKey = '([\w\.\-_]+)';"
 
diff --git a/module/plugins/crypter/SecuredIn.py b/module/plugins/crypter/SecuredIn.py
index 0b558c688..f94fae700 100644
--- a/module/plugins/crypter/SecuredIn.py
+++ b/module/plugins/crypter/SecuredIn.py
@@ -11,5 +11,4 @@ class SecuredIn(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?secured\.in/download-[\d]+-[\w]{8}\.html'
 
     __description__ = """Secured.in decrypter plugin"""
-    __author_name__ = "mkaay"
-    __author_mail__ = "mkaay@mkaay.de"
+    __authors__ = [("mkaay", "mkaay@mkaay.de")]
diff --git a/module/plugins/crypter/ShareLinksBiz.py b/module/plugins/crypter/ShareLinksBiz.py
index fa9739711..e8615d8bc 100644
--- a/module/plugins/crypter/ShareLinksBiz.py
+++ b/module/plugins/crypter/ShareLinksBiz.py
@@ -16,8 +16,7 @@ class ShareLinksBiz(Crypter):
     __pattern__ = r'http://(?:www\.)?(share-links|s2l)\.biz/(?P<ID>_?\w+)'
 
     __description__ = """Share-Links.biz decrypter plugin"""
-    __author_name__ = "fragonib"
-    __author_mail__ = "fragonib[AT]yahoo[DOT]es"
+    __authors__ = [("fragonib", "fragonib[AT]yahoo[DOT]es")]
 
 
     def setup(self):
diff --git a/module/plugins/crypter/ShareRapidComFolder.py b/module/plugins/crypter/ShareRapidComFolder.py
index fd12ff96f..43814bccb 100644
--- a/module/plugins/crypter/ShareRapidComFolder.py
+++ b/module/plugins/crypter/ShareRapidComFolder.py
@@ -11,7 +11,7 @@ class ShareRapidComFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?((share(-?rapid\.(biz|com|cz|info|eu|net|org|pl|sk)|-(central|credit|free|net)\.cz|-ms\.net)|(s-?rapid|rapids)\.(cz|sk))|(e-stahuj|mediatack|premium-rapidshare|rapidshare-premium|qiuck)\.cz|kadzet\.com|stahuj-zdarma\.eu|strelci\.net|universal-share\.com)/(slozka/.+)'
 
     __description__ = """Share-Rapid.com folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     LINK_PATTERN = r'<td class="soubor"[^>]*><a href="([^"]+)">'
diff --git a/module/plugins/crypter/SpeedLoadOrgFolder.py b/module/plugins/crypter/SpeedLoadOrgFolder.py
index 092d3efe4..79b79308d 100644
--- a/module/plugins/crypter/SpeedLoadOrgFolder.py
+++ b/module/plugins/crypter/SpeedLoadOrgFolder.py
@@ -11,5 +11,4 @@ class SpeedLoadOrgFolder(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?speedload\.org/(\d+~f$|folder/\d+/)'
 
     __description__ = """Speedload decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
diff --git a/module/plugins/crypter/StealthTo.py b/module/plugins/crypter/StealthTo.py
index 402724e89..a2f7b04af 100644
--- a/module/plugins/crypter/StealthTo.py
+++ b/module/plugins/crypter/StealthTo.py
@@ -11,5 +11,4 @@ class StealthTo(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?stealth\.to/folder/.+'
 
     __description__ = """Stealth.to decrypter plugin"""
-    __author_name__ = "spoob"
-    __author_mail__ = "spoob@pyload.org"
+    __authors__ = [("spoob", "spoob@pyload.org")]
diff --git a/module/plugins/crypter/TnyCz.py b/module/plugins/crypter/TnyCz.py
index e0b92ae22..1e406072d 100644
--- a/module/plugins/crypter/TnyCz.py
+++ b/module/plugins/crypter/TnyCz.py
@@ -13,8 +13,8 @@ class TnyCz(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?tny\.cz/\w+'
 
     __description__ = """Tny.cz decrypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
 
     TITLE_PATTERN = r'<title>(.+) - .+</title>'
 
diff --git a/module/plugins/crypter/TrailerzoneInfo.py b/module/plugins/crypter/TrailerzoneInfo.py
index 42e45a819..4ed08a634 100644
--- a/module/plugins/crypter/TrailerzoneInfo.py
+++ b/module/plugins/crypter/TrailerzoneInfo.py
@@ -11,5 +11,4 @@ class TrailerzoneInfo(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?trailerzone.info/.*?'
 
     __description__ = """TrailerZone.info decrypter plugin"""
-    __author_name__ = "godofdream"
-    __author_mail__ = "soilfiction@gmail.com"
+    __authors__ = [("godofdream", "soilfiction@gmail.com")]
diff --git a/module/plugins/crypter/TurbobitNetFolder.py b/module/plugins/crypter/TurbobitNetFolder.py
index ec0fd157d..d0b42ab2a 100644
--- a/module/plugins/crypter/TurbobitNetFolder.py
+++ b/module/plugins/crypter/TurbobitNetFolder.py
@@ -14,8 +14,9 @@ class TurbobitNetFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?turbobit\.net/download/folder/(?P<ID>\w+)'
 
     __description__ = """Turbobit.net folder decrypter plugin"""
-    __author_name__ = ("stickell", "Walter Purcaro")
-    __author_mail__ = ("l.stickell@yahoo.it", "vuolter@gmail.com")
+    __authors__ = [("stickell", "l.stickell@yahoo.it"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
+
 
     TITLE_PATTERN = r"src='/js/lib/grid/icon/folder.png'> <span>(.+?)</span>"
 
diff --git a/module/plugins/crypter/TusfilesNetFolder.py b/module/plugins/crypter/TusfilesNetFolder.py
index 7ce636d2d..a295189fd 100644
--- a/module/plugins/crypter/TusfilesNetFolder.py
+++ b/module/plugins/crypter/TusfilesNetFolder.py
@@ -15,8 +15,9 @@ class TusfilesNetFolder(SimpleCrypter):
     __pattern__ = r'https?://(?:www\.)?tusfiles\.net/go/(?P<ID>\w+)/?'
 
     __description__ = """Tusfiles.net folder decrypter plugin"""
-    __author_name__ = ("Walter Purcaro", "stickell")
-    __author_mail__ = ("vuolter@gmail.com", "l.stickell@yahoo.it")
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com"),
+                   ("stickell", "l.stickell@yahoo.it")]
+
 
     LINK_PATTERN = r'<TD align=left><a href="(.*?)">'
     TITLE_PATTERN = r'<Title>.*?\: (.+) folder</Title>'
diff --git a/module/plugins/crypter/UlozToFolder.py b/module/plugins/crypter/UlozToFolder.py
index 06d30099c..0977addcd 100644
--- a/module/plugins/crypter/UlozToFolder.py
+++ b/module/plugins/crypter/UlozToFolder.py
@@ -12,8 +12,8 @@ class UlozToFolder(Crypter):
     __pattern__ = r'http://(?:www\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(m|soubory)/.*'
 
     __description__ = """Uloz.to folder decrypter plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __authors__ = [("zoidberg", "zoidberg@mujmail.cz")]
+
 
     FOLDER_PATTERN = r'<ul class="profile_files">(.*?)</ul>'
     LINK_PATTERN = r'<br /><a href="/([^"]+)">[^<]+</a>'
diff --git a/module/plugins/crypter/UploadableChFolder.py b/module/plugins/crypter/UploadableChFolder.py
index 867a699c2..0d672acf5 100644
--- a/module/plugins/crypter/UploadableChFolder.py
+++ b/module/plugins/crypter/UploadableChFolder.py
@@ -11,8 +11,8 @@ class UploadableChFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?uploadable\.ch/list/\w+'
 
     __description__ = """ Uploadable.ch folder decrypter plugin """
-    __author_name__ = ("guidobelix", "Walter Purcaro")
-    __author_mail__ = ("guidobelix@hotmail.it", "vuolter@gmail.com")
+    __authors__ = [("guidobelix", "guidobelix@hotmail.it"),
+                   ("Walter Purcaro", "vuolter@gmail.com")]
 
 
     LINK_PATTERN = r'"(.+?)" class="icon_zipfile">'
diff --git a/module/plugins/crypter/UploadedToFolder.py b/module/plugins/crypter/UploadedToFolder.py
index d33dc91a0..b58162dd3 100644
--- a/module/plugins/crypter/UploadedToFolder.py
+++ b/module/plugins/crypter/UploadedToFolder.py
@@ -13,8 +13,8 @@ class UploadedToFolder(SimpleCrypter):
     __pattern__ = r'http://(?:www\.)?(uploaded|ul)\.(to|net)/(f|folder|list)/(?P<id>\w+)'
 
     __description__ = """UploadedTo decrypter plugin"""
-    __author_name__ = "stickell"
-    __author_mail__ = "l.stickell@yahoo.it"
+    __authors__ = [("stickell", "l.stickell@yahoo.it")]
+
 
     PLAIN_PATTERN = r'<small class="date"><a href="(?P<plain>[\w/]+)" onclick='
     TITLE_PATTERN = r'<title>(.+?)<'
diff --git a/module/plugins/crypter/WiiReloadedOrg.py b/module/plugins/crypter/WiiReloadedOrg.py
index cb02fbd2d..12863cf75 100644
--- a/module/plugins/crypter/WiiReloadedOrg.py
+++ b/module/plugins/crypter/WiiReloadedOrg.py
@@ -11,5 +11,4 @@ class WiiReloadedOrg(DeadCrypter):
     __pattern__ = r'http://(?:www\.)?wii-reloaded\.org/protect/get\.php\?i=.+'
 
     __description__ = """Wii-Reloaded.org decrypter plugin"""
-    __author_name__ = "hzpz"
-    __author_mail__ = None
+    __authors__ = [("hzpz", None)]
diff --git a/module/plugins/crypter/XupPl.py b/module/plugins/crypter/XupPl.py
index 5e5f511a8..e24c242e4 100644
--- a/module/plugins/crypter/XupPl.py
+++ b/module/plugins/crypter/XupPl.py
@@ -11,8 +11,7 @@ class XupPl(Crypter):
     __pattern__ = r'https?://(?:[^/]*\.)?xup\.pl/.*'
 
     __description__ = """Xup.pl decrypter plugin"""
-    __author_name__ = "z00nx"
-    __author_mail__ = "z00nx0@gmail.com"
+    __authors__ = [("z00nx", "z00nx0@gmail.com")]
 
 
     def decrypt(self, pyfile):
diff --git a/module/plugins/crypter/YoutubeBatch.py b/module/plugins/crypter/YoutubeBatch.py
index 1caca16bd..b33554673 100644
--- a/module/plugins/crypter/YoutubeBatch.py
+++ b/module/plugins/crypter/YoutubeBatch.py
@@ -22,8 +22,7 @@ class YoutubeBatch(Crypter):
                   ("uploads", "bool", "Grab channel unplaylisted videos", True)]
 
     __description__ = """Youtube.com channel & playlist decrypter plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     def api_response(self, ref, req):