diff --git a/disposable_email_blacklist.conf b/disposable_email_blacklist.conf
index e66475f..872e2ab 100644
--- a/disposable_email_blacklist.conf
+++ b/disposable_email_blacklist.conf
@@ -1,69 +1,116 @@
+
+0-mail.com
 0815.ru
 0815.su
+0845.ru
 0clickemail.com
-0-mail.com
 0wnd.net
 0wnd.org
+10mail.com
 10mail.org
 10minut.com.pl
+10minutemail.cf
+10minutemail.co.za
 10minutemail.com
 10minutemail.de
+10minutemail.ga
+10minutemail.gq
+10minutemail.ml
+10minutemail.net
+10minutesmail.com
 123-m.com
-126.com
-139.com
-163.com
+12houremail.com
+12minutemail.com
+12minutemail.net
 1chuan.com
+1fsdfdsfsdf.tk
+1mail.ml
 1pad.de
 1zhuan.com
 20mail.it
 20minutemail.com
 21cn.com
+2fdgdfgdfgdf.tk
 2prong.com
 30minutemail.com
 33mail.com
 3d-painting.com
+3mail.ga
+3trtretgfrfe.tk
+4gfdsgfdgfd.tk
+4mail.cf
+4mail.ga
 4warding.com
 4warding.net
 4warding.org
+5ghgfhfghfgh.tk
+5mail.cf
+5mail.ga
 60minutemail.com
 675hosting.com
 675hosting.net
 675hosting.org
+6hjgjhgkilkj.tk
+6mail.cf
+6mail.ga
+6mail.ml
 6paq.com
 6url.com
 75hosting.com
 75hosting.net
 75hosting.org
 7days-printing.com
+7mail.ga
+7mail.ml
 7tags.com
+8127ep.com
+8mail.cf
+8mail.ga
+8mail.ml
 99experts.com
+9mail.cf
 9ox.net
-a45.in
 a-bc.net
+a.vztc.com
+a45.in
 abyssmail.com
 afrobacon.com
-agedmail.com
 ag.us.to
+agedmail.com
 ajaxapp.net
+akapost.com
+akerd.com
 alivance.com
+ama-trade.de
+ama-trans.de
 amilegit.com
-amiriindustries.com
 amiri.net
+amiriindustries.com
 anappthat.com
 ano-mail.net
+anon-mail.de
 anonbox.net
+anonmails.de
 anonymail.dk
 anonymbox.com
+antireg.ru
 antispam.de
+antispam24.de
+antispammail.de
 armyspy.com
+artman-conception.com
+asdasd.ru
 azmeil.tk
+b2cmail.de
 baxomale.ht.cx
 beddly.com
 beefmilk.com
 bigprofessor.so
 bigstring.com
 binkmail.com
+bio-muesli.info
 bio-muesli.net
+blackmarket.to
 bladesmail.net
 blogmyway.org
 bobmail.info
@@ -74,27 +121,37 @@ boun.cr
 bouncr.com
 boxformail.in
 boximail.com
+br.mintemail.com
+breakthru.com
 brefmail.com
 brennendesreich.de
 broadbandninja.com
 bsnow.net
-buffemail.com
-bugmenot.com
+bspamfree.org
 bu.mintemail.com
+buffemail.com
+bugmenever.com
+bugmenot.com
 bumpymail.com
-bundes-li.ga
 bund.us
+bundes-li.ga
 burnthespam.info
+burstmail.info
+buymoreplays.com
 buyusedlibrarybooks.org
 byom.de
 c2.hu
 cachedot.net
+cam4you.cc
+card.zp.ua
 casualdx.com
+cek.pm
 cellurl.com
 centermail.com
 centermail.net
 chammy.info
 cheatmail.de
+childsavetrust.org
 chogmail.com
 choicemail1.com
 chong-mail.com
@@ -105,6 +162,8 @@ clrmail.com
 cmail.com
 cmail.net
 cmail.org
+coieo.com
+coldemail.info
 consumerriot.com
 cool.fr.nf
 correo.blogos.net
@@ -117,31 +176,48 @@ cubiclink.com
 curryworld.de
 cust.in
 cuvox.de
+d3p.dk
 dacoolest.com
 dandikmail.com
 dayrep.com
 dbunker.com
 dcemail.com
 deadaddress.com
+deadfake.cf
+deadfake.ga
+deadfake.ml
+deadfake.tk
 deadspam.com
 deagot.com
 dealja.com
+delikkt.de
 despam.it
 despammed.com
 devnullmail.com
 digitalsanctuary.com
 dingbone.com
+discard.cf
 discard.email
+discard.ga
+discard.gq
+discard.ml
+discard.tk
 discardmail.com
 discardmail.de
+disposable-email.ml
+disposable.cf
+disposable.ga
+disposable.ml
 disposableaddress.com
 disposableemailaddresses.com
+disposableemailaddresses:emailmiser.com
 disposableinbox.com
-disposeamail.com
 dispose.it
+disposeamail.com
 disposemail.com
 dispostable.com
 divermail.com
+dm.w3internet.co.uk
 dm.w3internet.co.ukexample.com
 dodgeit.com
 dodgit.com
@@ -151,25 +227,41 @@ domozmail.com
 donemail.ru
 dontreg.com
 dontsendmespam.de
+dotman.de
 dotmsg.com
 drdrb.com
 drdrb.net
+dropcake.de
 dropmail.me
 dudmail.com
-dumpandjunk.com
 dump-email.info
+dumpandjunk.com
 dumpmail.de
 dumpyemail.com
 duskmail.com
+e-mail.com
+e-mail.org
 e4ward.com
 easytrashmail.com
+edv.to
 ee1.pl
 ee2.pl
 eelmail.com
+einmalmail.de
 einrot.com
 einrot.de
+eintagsmail.de
+email-fake.cf
+email-fake.ga
+email-fake.gq
+email-fake.ml
+email-fake.tk
 email60.com
-e-mail.com
+emailage.cf
+emailage.ga
+emailage.gq
+emailage.ml
+emailage.tk
 emaildienst.de
 emailgo.de
 emailias.com
@@ -177,31 +269,63 @@ emailigo.de
 emailinfive.com
 emaillime.com
 emailmiser.com
-e-mail.org
+emails.ga
 emailsensei.com
-emailtemporario.com.br
+emailspam.cf
+emailspam.ga
+emailspam.gq
+emailspam.ml
+emailspam.tk
+emailtemporanea.com
+emailtemporanea.net
 emailtemporar.ro
+emailtemporario.com.br
 emailthe.net
 emailtmp.com
 emailto.de
 emailwarden.com
 emailx.at.hm
 emailxfer.com
+emailz.cf
+emailz.ga
+emailz.gq
+emailz.ml
 emeil.in
 emeil.ir
+emkei.cf
+emkei.ga
+emkei.gq
+emkei.ml
+emkei.tk
 emz.net
 enterto.com
 ephemail.net
+ero-tube.org
 etranquil.com
 etranquil.net
 etranquil.org
 evopo.com
 example.com
 explodemail.com
+express.net.ua
 eyepaste.com
+facebook-email.cf
+facebook-email.ga
+facebook-email.ml
+facebookmail.gq
+facebookmail.ml
+fake-mail.cf
+fake-mail.ga
+fake-mail.ml
+fakedemail.com
+fakeinbox.cf
 fakeinbox.com
+fakeinbox.ga
+fakeinbox.ml
+fakeinbox.tk
 fakeinformation.com
 fakemail.fr
+fakemailgenerator.com
 fakemailz.com
 fammix.com
 fansworldwide.de
@@ -220,34 +344,59 @@ fastyamaha.com
 fatflap.com
 fdfdsfds.com
 fightallspam.com
+film-blog.biz
 filzmail.com
+fivemail.de
 fixmail.tk
 fizmail.com
 fleckens.hu
 flurred.com
+fly-ts.de
 flyspam.com
 footard.com
 forgetmail.com
 fr33mail.info
 frapmail.com
+free-email.cf
+free-email.ga
+freemails.cf
+freemails.ga
+freemails.ml
 freundin.ru
 friendlymail.co.uk
 front14.org
 fuckingduh.com
 fudgerub.com
 fux0ringduh.com
+fyii.de
+garbagemail.org
 garliclife.com
+gehensiemirnichtaufdensack.de
 gelitik.in
+geschent.biz
+get-mail.cf
+get-mail.ga
+get-mail.ml
+get-mail.tk
 get1mail.com
 get2mail.fr
+getairmail.cf
 getairmail.com
+getairmail.ga
+getairmail.gq
+getairmail.ml
+getairmail.tk
 getmails.eu
 getonemail.com
 getonemail.net
 ghosttexter.de
+giantmail.de
 girlsundertheinfluence.com
 gishpuppy.com
+gmal.com
+gmial.com
 goemailgo.com
+gomail.in
 gorillaswithdirtyarmpits.com
 gotmail.com
 gotmail.net
@@ -273,45 +422,66 @@ guerillamail.com
 guerillamail.net
 guerillamail.org
 guerrillamail.biz
-guerrillamailblock.com
 guerrillamail.com
 guerrillamail.de
+guerrillamail.info
 guerrillamail.net
 guerrillamail.org
+guerrillamailblock.com
 gustr.com
+h.mintemail.com
 h8s.org
 hacccc.com
 haltospam.com
+harakirimail.com
 hartbot.de
+hat-geld.de
 hatespam.org
 herp.in
 hidemail.de
 hidzz.com
-h.mintemail.com
+hmamail.com
 hochsitze.com
+hopemail.biz
+hot-mail.cf
+hot-mail.ga
+hot-mail.gq
+hot-mail.ml
+hot-mail.tk
+hotmai.com
+hotmial.com
 hotpop.com
 hulapla.de
+humaility.com
 hushmail.com
 ieatspam.eu
 ieatspam.info
 ieh-mail.de
+ignoremail.com
 ihateyoualot.info
 iheartspam.org
+ikbenspamvrij.nl
 imails.info
 imgof.com
 imstations.com
 inbax.tk
+inbox.si
 inboxalias.com
 inboxclean.com
 inboxclean.org
-inbox.si
+inboxed.im
+inboxed.pw
 incognitomail.com
 incognitomail.net
 incognitomail.org
+infocom.zp.ua
 insorg-mail.info
 instant-mail.de
+iozak.com
+ip6.li
 ipoo.org
 irish2me.com
+is.af
 iwi.net
 jetable.com
 jetable.fr.nf
@@ -320,7 +490,10 @@ jetable.org
 jnxjn.com
 jourrapide.com
 jsrsolutions.com
+junk.to
 junk1e.com
+junkmail.ga
+junkmail.gq
 kasmail.com
 kaspop.com
 keepmymail.com
@@ -330,6 +503,7 @@ kir.ch.tc
 klassmaster.com
 klassmaster.net
 klzlk.com
+kostenlosemailadresse.de
 koszmail.pl
 kulturbetrieb.info
 kurzepost.de
@@ -338,67 +512,115 @@ lackmail.net
 landmail.co
 lastmail.co
 lavabit.com
+lawlita.com
 letthemeatspam.com
 lhsdv.com
 lifebyfood.com
 link2mail.net
+linuxmail.so
 litedrop.com
+llogin.ru
 loadby.us
+login-email.cf
+login-email.ga
+login-email.ml
+login-email.tk
 lol.ovpn.to
+lolfreak.net
 lookugly.com
 lopl.co.cc
 lortemail.dk
+losemymail.com
 lovemeleaveme.com
 lr78.com
 lroid.com
+luckymail.org
+lukop.dk
+m21.cc
 m4ilweb.info
 maboard.com
+mail-filter.com
+mail-temporaire.fr
+mail.by
+mail.mezimages.net
+mail.zp.ua
 mail114.net
+mail1a.de
+mail21.cc
 mail2rss.org
 mail333.com
 mail4trash.com
 mailbidon.com
+mailbiz.biz
 mailblocks.com
 mailbucket.org
-mail.by
+mailcat.biz
 mailcatch.com
+mailde.de
+mailde.info
 maildrop.cc
+maildrop.cf
+maildrop.ga
+maildrop.gq
+maildrop.ml
+maildu.de
 maileater.com
+maileimer.de
 mailexpire.com
 mailfa.tk
-mail-filter.com
+mailforspam.com
+mailfree.ga
+mailfree.gq
+mailfree.ml
 mailfreeonline.com
 mailguard.me
 mailimate.com
 mailin8r.com
 mailinater.com
-mailinator2.com
 mailinator.com
+mailinator.gq
 mailinator.net
 mailinator.org
 mailinator.us
+mailinator2.com
 mailincubator.com
 mailismagic.com
+mailita.tk
+mailjunk.cf
+mailjunk.ga
+mailjunk.gq
+mailjunk.ml
+mailjunk.tk
+mailme.gq
 mailme.ir
 mailme.lv
+mailme24.com
 mailmetrash.com
-mail.mezimages.net
 mailmoat.com
+mailms.com
 mailnator.com
 mailnesia.com
 mailnull.com
+mailorg.org
+mailpick.biz
 mailquack.com
+mailrock.biz
 mailscrap.com
+mailseal.de
 mailshell.com
 mailsiphon.com
 mailslapping.com
 mailslite.com
 mailtemp.info
-mail-temporaire.fr
+mailtome.de
 mailtothis.com
+mailtrash.net
+mailtv.net
+mailtv.tv
 mailzilla.com
 mailzilla.org
 makemetheking.com
+malahov.de
 manifestgenerator.com
 manybrain.com
 mbx.cc
@@ -410,21 +632,26 @@ mezimages.net
 mierdamail.com
 migmail.pl
 migumail.com
+ministry-of-silly-walks.de
 mintemail.com
+misterpinball.de
 mjukglass.nu
 moakt.com
-mobileninja.co.uk
 mobi.web.id
+mobileninja.co.uk
 moburl.com
 moncourrier.fr.nf
 monemail.fr.nf
 monmail.fr.nf
 monumentmail.com
 msa.minsmail.com
+msb.minsmail.com
 mt2009.com
 mt2014.com
 mt2015.com
 mx0.wwwnew.eu
+my10minutemail.com
+mycard.net.ua
 mycleaninbox.net
 myemailboxy.com
 mymail-in.net
@@ -432,13 +659,16 @@ mynetstore.de
 mypacks.net
 mypartyclip.de
 myphantomemail.com
+mysamp.de
 myspaceinc.com
 myspaceinc.net
 myspaceinc.org
 myspacepimpedup.com
 myspamless.com
 mytempemail.com
+mytempmail.com
 mytrashmail.com
+nabuma.com
 neomailbox.com
 nepwk.com
 nervmich.net
@@ -446,21 +676,30 @@ nervtmich.net
 netmails.com
 netmails.net
 netzidiot.de
+nevermail.de
 nice-4u.com
+nincsmail.hu
+nmail.cf
+nnh.com
+no-spam.ws
+noblepioneer.com
+nobugmail.com
 nobulk.com
+nobuma.com
 noclickemail.com
 nogmailspam.info
-nomail2me.com
+nomail.pw
 nomail.xl.cx
+nomail2me.com
 nomorespamemails.com
 nonspam.eu
 nonspammer.de
 noref.in
+nospam.ze.tc
 nospam4.us
 nospamfor.us
+nospammail.net
 nospamthanks.info
-no-spam.ws
-nospam.ze.tc
 notmailinator.com
 notsharingmy.info
 nowhere.org
@@ -471,9 +710,13 @@ nwldx.com
 objectmail.com
 obobbo.com
 odaymail.com
+odnorazovoe.ru
+ohaaa.de
+omail.pro
 oneoffemail.com
 oneoffmail.com
 onewaymail.com
+onlatedotcom.info
 online.ms
 oopi.org
 opayq.com
@@ -495,24 +738,36 @@ poczta.onet.pl
 politikerclub.de
 poofy.org
 pookmail.com
+powered.name
 privacy.net
+privatdemail.net
 privy-mail.com
+privy-mail.de
 privymail.de
 proxymail.eu
 prtnx.com
 prtz.eu
 punkass.com
+put2.net
 putthisinyourspamdatabase.com
 pwrby.com
-qq.com
+qasti.com
+qisdo.com
+qisoa.com
+qoika.com
 quickinbox.com
 rcpt.at
 reallymymail.com
+realtyalerts.ca
+receiveee.com
 recode.me
 recyclemail.dk
 regbypass.com
 regbypass.comsafe-mail.net
 rejectmail.com
+reliable-mail.com
+remail.cf
+remail.ga
 rhyta.com
 rklips.com
 rmqkr.net
@@ -527,20 +782,35 @@ safetypost.de
 sandelf.de
 saynotospams.com
 schafmail.de
+schmeissweg.tk
+schrott-email.de
+secmail.pw
+secretemail.de
+secure-mail.biz
+secure-mail.cc
 selfdestructingmail.com
 selfdestructingmail.org
-SendSpamHere.com
+sendspamhere.com
+senseless-entertainment.com
+server.ms
+services391.com
 sharklasers.com
 shieldedmail.com
+shieldemail.com
 shiftmail.com
 shitmail.me
 shitmail.org
 shitware.nl
+shmeriously.com
 shortmail.net
+shut.name
+shut.ws
 sibmail.com
 sinnlos-mail.de
 siteposter.net
 skeefmail.com
+sky-ts.de
+slapsfromlastnight.com
 slaskpost.se
 slopsbox.com
 slushmail.com
@@ -548,13 +818,20 @@ smashmail.de
 smellfear.com
 snakemail.com
 sneakemail.com
+sneakmail.de
 snkmail.com
 sofimail.com
 sofort-mail.de
+sofortmail.de
 sogetthis.com
 sohu.com
+solvemail.info
 soodonims.com
+spam.la
+spam.su
 spam4.me
+spamail.de
+spamarrest.com
 spamavert.com
 spambob.com
 spambob.net
@@ -574,21 +851,26 @@ spamcowboy.net
 spamcowboy.org
 spamday.com
 spamex.com
+spamfighter.cf
+spamfighter.ga
+spamfighter.gq
+spamfighter.ml
+spamfighter.tk
+spamfree.eu
 spamfree24.com
 spamfree24.de
 spamfree24.eu
 spamfree24.info
 spamfree24.net
 spamfree24.org
-spamfree.eu
 spamgoes.in
-SpamHereLots.com
-SpamHerePlease.com
+spamgourmet.com
+spamherelots.com
+spamhereplease.com
 spamhole.com
 spamify.com
 spaminator.de
 spamkill.info
-spam.la
 spaml.com
 spaml.de
 spammotel.com
@@ -598,7 +880,6 @@ spamsalad.in
 spamslicer.com
 spamspot.com
 spamstack.net
-spam.su
 spamthis.co.uk
 spamthisplease.com
 spamtrail.com
@@ -606,10 +887,18 @@ spamtroll.net
 speed.1s.fr
 spoofmail.de
 squizzy.de
+sry.li
+ssoia.com
 startkeys.com
 stinkefinger.net
+stop-my-spam.cf
 stop-my-spam.com
+stop-my-spam.ga
+stop-my-spam.ml
+stop-my-spam.tk
 stuffmail.de
+suioe.com
+super-auswahl.de
 supergreatmail.com
 supermailer.jp
 superplatyna.com
@@ -624,18 +913,24 @@ tapchicuoihoi.com
 teewars.org
 teleworm.com
 teleworm.us
-tempalias.com
-tempemail.biz
-tempe-mail.com
-tempemail.com
-tempemail.co.za
-TempEMail.net
+temp-mail.org
+temp-mail.ru
 temp.emeraldwebmail.com
-tempinbox.com
+tempail.com
+tempalias.com
+tempe-mail.com
+tempemail.biz
+tempemail.co.za
+tempemail.com
+tempemail.net
 tempinbox.co.uk
+tempinbox.com
+tempmail.eu
+tempmail.it
 tempmail2.com
 tempmaildemo.com
-tempmail.it
+tempmailer.com
+tempmailer.de
 tempomail.fr
 temporarily.de
 temporarioemail.com.br
@@ -643,40 +938,56 @@ temporaryemail.net
 temporaryemail.us
 temporaryforwarding.com
 temporaryinbox.com
+temporarymailaddress.com
 tempthe.net
 tempymail.com
 thanksnospam.info
 thankyou2010.com
+thc.st
 thecloudindex.com
+thelimestones.com
 thisisnotmyrealemail.com
+thismail.net
 throam.com
 throwawayemailaddress.com
 tilien.com
 tittbit.in
+tizi.com
 tmailinator.com
 toiea.com
+tokem.co
+toomail.biz
+topranklist.de
+tormail.org
 tradermail.info
+trash-amil.com
+trash-mail.at
+trash-mail.cf
+trash-mail.com
+trash-mail.de
+trash-mail.ga
+trash-mail.gq
+trash-mail.ml
+trash-mail.tk
 trash2009.com
 trash2010.com
 trash2011.com
-trash-amil.com
 trashdevil.com
 trashdevil.de
 trashemail.de
-trash-mail.at
+trashinbox.com
 trashmail.at
-trash-mail.com
 trashmail.com
-trash-mail.de
 trashmail.de
-trashmailer.com
 trashmail.me
 trashmail.net
 trashmail.org
 trashmail.ws
+trashmailer.com
 trashymail.com
 trashymail.net
 trbvm.com
+trialmail.de
 trickmail.net
 trillianpro.com
 tryalert.com
@@ -689,6 +1000,8 @@ umail.net
 upliftnow.com
 uplipht.com
 uroid.com
+us.af
+uyhip.com
 valemail.net
 venompen.com
 veryrealemail.com
@@ -697,18 +1010,34 @@ viditag.com
 viewcastmedia.com
 viewcastmedia.net
 viewcastmedia.org
+vipmail.name
+vipmail.pw
+viralplays.com
 vomoto.com
+vpn.st
+vsimcard.com
 vubby.com
+vztc.com
 walala.org
 walkmail.net
+wasteland.rfc822.org
+watch-harry-potter.com
+watchfull.net
 webemail.me
 webm4il.info
 webuser.in
-wegwerfadresse.de
-wegwerf-email-addressen.de
 weg-werf-email.de
-wegwerfemail.de
+wegwerf-email-addressen.de
+wegwerf-email-adressen.de
+wegwerf-email.de
+wegwerf-email.net
 wegwerf-emails.de
+wegwerfadresse.de
+wegwerfemail.com
+wegwerfemail.de
+wegwerfemail.net
+wegwerfemail.org
+wegwerfemailadresse.com
 wegwerfmail.de
 wegwerfmail.info
 wegwerfmail.net
@@ -723,12 +1052,20 @@ whopy.com
 whyspam.me
 wickmail.net
 wilemail.com
+willhackforfood.biz
 willselfdestruct.com
 winemaven.info
+wmail.cf
+wolfsmail.tk
+writeme.us
 wronghead.com
-wuzupmail.net
 wuzup.net
+wuzupmail.net
+www.e4ward.com
+www.gishpuppy.com
+www.mailinator.com
 wwwnew.eu
+x.ip6.li
 xagloo.com
 xemaps.com
 xents.com
@@ -736,18 +1073,25 @@ xmaily.com
 xyzfree.net
 yahoo.com.ph
 yahoo.com.vn
+yanet.me
 yapped.net
-yeah.net
 yep.it
 yogamaven.com
 yomail.info
 yopmail.com
 yopmail.fr
+yopmail.gq
 yopmail.net
 you-spam.com
+youmail.ga
+youmailr.com
+yourdomain.com
 ypmail.webarnak.fr.eu.org
 yuurok.com
+yxzx.net
+z1p.biz
 za.com
+zehnminuten.de
 zehnminutenmail.de
 zetmail.com
 zippymail.info
diff --git a/whitelist.conf b/whitelist.conf
index 6a079ac..e6f36d4 100644
--- a/whitelist.conf
+++ b/whitelist.conf
@@ -1,10 +1,16 @@
-spamgourmet.net
-spamgourmet.org
-spamcannon.com
-spamcannon.net
+126.com
+139.com
+163.com
 antichef.com
 antichef.net
+bluewin.ch
+dfgh.net
+qq.com
 neverbox.com
 recursor.net
-dfgh.net
+spamcannon.com
+spamcannon.net
+spamgourmet.net
+spamgourmet.org
 xoxy.net
+yeah.net