diff --git a/data/applications/data/backup.yml b/data/applications/data/backup.yml
index 6d9410b..a17b707 100644
--- a/data/applications/data/backup.yml
+++ b/data/applications/data/backup.yml
@@ -4,7 +4,7 @@ websites:
     tfa: Yes
     software: Yes
     img: aerofs.png
-    doc: https://blog.aerofs.com/two-factor-authentication-for-hybrid-and-private-cloud/
+    doc: https://www.aerofs.com/blog/two-factor-authentication-for-hybrid-and-private-cloud-md/
 
   - name: Apple iCloud
     url: https://www.icloud.com
@@ -13,8 +13,8 @@ websites:
     sms: Yes
     software: Yes
     exceptions:
-        text: "See http://support.apple.com/kb/HT5593 for a list of supported SMS carriers."
-    doc: http://support.apple.com/kb/ht5570
+        text: "See https://support.apple.com/HT202656 for a list of supported SMS carriers."
+    doc: https://support.apple.com/HT204152
 
   - name: Backblaze
     url: https://www.backblaze.com
@@ -41,12 +41,14 @@ websites:
     twitter: cloudapp
     img: cloudapp.png
     tfa: No
+    facebook: getcloudapp
 
   - name: CrashPlan
-    url: http://www.crashplan.com
+    url: https://www.crashplan.com
     twitter: crashplan
     img: crashplan.png
     tfa: No
+    facebook: CrashPlan
 
   - name: Dropbox
     url: https://www.dropbox.com
@@ -70,6 +72,7 @@ websites:
     twitter: FileThisCompany
     img: filethis.png
     tfa: No
+    facebook: FileThis
 
   - name: Frostbox
     url: http://frostbox.com
@@ -99,12 +102,14 @@ websites:
     twitter: IDriveBackup
     img: idrive.png
     tfa: No
+    facebook: IDriveBackup
 
   - name: JustCloud
     url: https://www.justcloud.com
     twitter: justcloudcom
     img: justcloud.png
     tfa: No
+    facebook: JustCloudStorage
 
   - name: Mega
     url: https://mega.co.nz/
@@ -148,12 +153,14 @@ websites:
     twitter: spideroak
     img: spideroak.png
     tfa: No
+    facebook: SpiderOak
 
   - name: SugarSync
     twitter: SugarSync
     url: https://www.sugarsync.com/
     img: sugarsync.png
     tfa: No
+    facebook: SugarSync
 
   - name: Sync
     url: https://sync.com
@@ -195,6 +202,7 @@ websites:
     img: xxlcloud.png
     tfa: No
     status: https://xxlcloud.com/en/blog/2factorauthentication
+    facebook: xxlcloud
 
   - name: Yandex.Disk
     url: https://disk.yandex.com
diff --git a/data/applications/data/banking.yml b/data/applications/data/banking.yml
index cf63368..71b58bb 100644
--- a/data/applications/data/banking.yml
+++ b/data/applications/data/banking.yml
@@ -1,10 +1,18 @@
 websites:
     - name: Actors Federal Credit Union
-      url: http://www.actorsfcu.com/
+      url: https://www.actorsfcu.com/
       twitter: ActorsFCU
+      facebook: ActorsFCU
       img: actorsfcu.png
       tfa: No
 
+    - name: Alliant Credit Union
+      url: https://www.alliantcreditunion.org/
+      twitter: AlliantCU
+      facebook: alliantcreditunion
+      img: alliantcreditunion.png
+      tfa: No
+
     - name: Ally Bank
       url: http://www.ally.com/
       img: allybank.png
@@ -16,26 +24,54 @@ websites:
     - name: Altra Federal Credit Union
       url: https://www.altra.org/
       twitter: AltraCU
+      facebook: altra.org
       img: altrafcu.png
       tfa: No
 
-    - name: American Express
-      url: https://www.americanexpress.com/
-      twitter: AmericanExpress
-      img: americanexpress.png
-      tfa: No
-
     - name: America First Credit Union
       url: https://www.americafirst.com/
       twitter: AFCU
+      facebook: americafirstfb
       img: americafirstcu.png
       tfa: No
 
+    - name: American Express
+      url: https://www.americanexpress.com/
+      twitter: AmericanExpress
+      facebook: AmericanExpressUS
+      img: americanexpress.png
+      tfa: No
+
+    - name: America’s Christian Credit Union
+      url: https://www.americaschristiancu.com
+      img: accu.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      email: Yes
+      doc: https://www.americaschristiancu.com/business/services/online-banking-bill-pay.html
+
+    - name: Andrews Federal Credit Union
+      url: https://www.andrewsfcu.org/
+      twitter: AndrewsFederal
+      facebook: AndrewsFederal
+      img: andrewsfederalcu.png
+      tfa: No
+
+    - name: Australia and New Zealand Banking Group
+      url: https://www.anz.com/personal/
+      twitter: ANZ_AU
+      facebook: ANZAustralia
+      img: anz.png
+      tfa: No
+
     - name: Banca Mediolanum
       url: https://www.bmedonline.it
       img: mediolanum.png
       tfa: No
       twitter: BancaMediolanum
+      facebook: BancaMediolanum
+      lang: it
 
     - name: Bank Central Asia (BCA)
       url: http://www.bca.co.id/en/individual/individual.jsp
@@ -85,30 +121,43 @@ websites:
     - name: BMO Harris Bank
       url: https://www.bmoharris.com/
       twitter: BMOHarrisBank
+      facebook: BMOHarrisBank
       img: bmo.png
       tfa: No
 
     - name: Boeing Employee Credit Union
       url: https://www.becu.org/
       twitter: BECU
+      facebook: becu
       img: becu.png
       tfa: No
 
+    - name: BofI Federal Bank
+      url: https://www.bofifederalbank.com/
+      twitter: BofIFederalBank
+      facebook: BofiFederalBank
+      email_address: customerservice@bofifederalbank.com
+      img: bofifederalbank.png
+      tfa: No
+
     - name: Capital One
       url: https://www.capitalone.com/
       twitter: CapitalOne
+      facebook: capitalone
       img: capitalone.png
       tfa: No
 
     - name: Capital One 360
       url: https://home.capitalone360.com/
       twitter: CapitalOne360
+      facebook: CapitalOne360
       img: capitalone360.png
       tfa: No
 
     - name: CDC Federal Credit Union
       url: https://www.cdcfcu.com
       twitter: CDCCreditUnion
+      facebook: CDCFederalCreditUnion
       img: cdcfcu.png
       tfa: No
 
@@ -122,14 +171,16 @@ websites:
       doc: /notes/chase/
 
     - name: CIBC
-      url: http://www.cibc.ca
+      url: https://www.cibc.ca
       twitter: cibc
+      facebook: CIBC
       img: cibc.png
       tfa: No
 
     - name: Citibank
-      url: https://online.citibank.com/US/Welcome.c
+      url: https://online.citi.com/
       twitter: Citibank
+      facebook: citibank
       img: citibank.png
       tfa: No
 
@@ -144,14 +195,17 @@ websites:
     - name: Citizens Bank
       url: https://www.citizensbank.com
       twitter: citizensbank
+      facebook: citizensbank
       img: citizensbank.png
       tfa: No
 
     - name: comdirect
       url: https://www.comdirect.de/
       twitter: comdirect
+      facebook: comdirect
       img: comdirect.png
       tfa: No
+      lang: de
 
     - name: Commonwealth Bank of Australia
       url: https://www.commbank.com.au/
@@ -160,11 +214,43 @@ websites:
       sms: Yes
       doc: https://www.commbank.com.au/security-privacy/netcode.html
 
+    - name: Credit Union Australia
+      url: https://www.cua.com.au/
+      img: cua.png
+      tfa: No
+      twitter: cua_connect
+      facebook: CUA
+
+    - name: Desjardins
+      url: https://www.desjardins.com/
+      twitter: mvtdesjardins
+      facebook: desjardins
+      img: desjardins.png
+      tfa: No
+      lang: fr
+
+    - name: Deutsche Kreditbank (DKB)
+      url: https://www.dkb.de/
+      img: dkb.png
+      tfa: No
+      facebook: Deutsche.Kreditbank
+      lang: de
+
+    - name: Digital Federal Credit Union
+      url: https://www.dcu.org
+      img: dcu.png
+      tfa: Yes
+      phone: Yes
+      sms: Yes
+      email: Yes
+      doc: https://www.dcu.org/online-banking/online-banking-enhancements.html
+
     - name: Discover
       url: https://www.discover.com/
       img: discover.png
       tfa: no
       twitter: Discover
+      facebook: discover
 
     - name: DNB
       url: https://www.dnb.no/
@@ -193,9 +279,16 @@ websites:
     - name: Fifth Third Bank
       url: https://www.53.com/
       twitter: fifththird
+      facebook: FifthThirdBank
       img: fifththird.png
       tfa: No
 
+    - name: Final
+      url: https://getfinal.com/
+      img: final.png
+      tfa: Yes
+      sms: Yes
+
     - name: First Direct
       url: http://www1.firstdirect.com/
       img: firstdirect.png
@@ -224,12 +317,14 @@ websites:
     - name: GE Capital Bank
       url: https://www.gecapitalbank.com
       twitter: GECapital
+      facebook: GECapitalOfficial
       img: GECapitalBank.png
       tfa: No
 
     - name: Halifax
-      url: http://www.halifax.co.uk
+      url: https://www.halifax.co.uk
       twitter: AskHalifaxBank
+      facebook: halifax
       img: halifax.png
       tfa: No
 
@@ -252,9 +347,17 @@ websites:
     - name: Huntington National Bank
       url: https://www.huntington.com
       twitter: Huntington_Bank
+      facebook: HuntingtonBank
       img: huntingtonnationalbank.png
       tfa: No
 
+    - name: ING (Luxembourg)
+      url: https://www.ing.lu
+      img: ing.png
+      tfa: Yes
+      hardware: Yes
+      doc: https://www.ing.lu/web/ING/EN/Personal/Customerservices/FAQ/MYING_FAQ_EN
+
     - name: Intesa Sanpaolo
       url: https://www.intesasanpaolo.com
       img: intesasanpaolo.png
@@ -265,12 +368,14 @@ websites:
     - name: LendingClub
       url: https://www.lendingclub.com/
       twitter: lendingclub
+      facebook: LendingClubTeam
       img: lendingclub.png
       tfa: No
 
     - name: Lloyds Bank
-      url: http://www.lloydsbank.com/
+      url: https://www.lloydsbank.com/
       twitter: AskLloydsBank
+      facebook: lloydsbank
       img: lloydsbank.png
       tfa: No
 
@@ -279,17 +384,27 @@ websites:
       img: mtbank.png
       tfa: No
       twitter: MandT_Help
+      facebook: MandTBank
 
     - name: MBNA Canada
-      url: http://www.mbna.ca
+      url: https://www.mbna.ca
       img: mbnacanada.png
       tfa: No
       twitter: mbna_canada
+      facebook: MBNACanada
 
     - name: Meridian Credit Union
       url: https://www.meridiancu.ca
       img: meridian.png
       twitter: meridiancu
+      facebook: MeridianCreditUnion
+      tfa: No
+
+    - name: N26
+      url: https://n26.com
+      img: n26.png
+      twitter: n26
+      facebook: N26
       tfa: No
 
     - name: Nationwide Building Society
@@ -311,6 +426,7 @@ websites:
       img: navyfederal.png
       tfa: No
       twitter: NavyFederal
+      facebook: NavyFederal
 
     - name: Nordea Sverige
       url: https://www.nordea.se/
@@ -358,20 +474,24 @@ websites:
     - name: PenFed
       url: https://www.penfed.org/
       twitter: PenFed
+      facebook: PenFed
       img: penfed.png
       tfa: No
 
     - name: PNC Bank
       url: https://www.pnc.com/
       twitter: pncnews
+      facebook: pncbank
       img: pncbank.png
       tfa: No
 
     - name: Postbank
-      url: https://www.postbank.com/
+      url: https://www.postbank.de/
       twitter: postbank
+      facebook: postbank
       img: postbank.png
       tfa: No
+      lang: de
 
     - name: Raiffeisen Bank CZ
       url: http://www.rb.cz/
@@ -383,24 +503,28 @@ websites:
     - name: RBC Royal Bank
       url: http://www.rbcroyalbank.com
       twitter: RBC_Canada
+      facebook: rbc
       img: rbc.png
       tfa: No
 
     - name: Regions Bank
       url: https://www.regions.com
       twitter: askRegions
+      facebook: RegionsBank
       img: RegionsBank.png
       tfa: No
 
     - name: San Diego County Credit Union
       url: https://www.sdccu.com
       twitter: sdccu
+      facebook: SDCCU
       img: sdccu.png
       tfa: No
 
     - name: San Francisco Fire Credit Union
       url: https://www.sffirecu.org
       twitter: SFFireCU
+      facebook: sffirecu
       img: sffirecu.png
       tfa: No
       status: https://twitter.com/sffirecu/status/577532435228991488
@@ -408,15 +532,24 @@ websites:
     - name: Santa Clara County Federal Credit Union
       url: https://www.sccfcu.org/
       twitter: SCCFCU
+      facebook: SCCFCU
       img: sccfcu.png
       tfa: No
 
     - name: SchoolsFirst FCU
       url: https://www.schoolsfirstfcu.org/
       twitter: SchoolsFirstFCU
+      facebook: SchoolsFirstFCU
       img: schoolsfirst.png
       tfa: No
 
+    - name: Scotiabank
+      url: http://www.scotiabank.com
+      img: scotiabank.png
+      tfa: No
+      twitter: ScotiabankHelps
+      facebook: scotiabank
+
     - name: SEB
       url: http://www.seb.se/pow/default.asp
       img: seb.png
@@ -428,13 +561,24 @@ websites:
       url: https://www.servicecu.org/
       img: service_cu.png
       tfa: No
+      facebook: ServiceCreditUnion
 
     - name: Simple
       url: https://www.simple.com/
       twitter: simple
+      facebook: simple
       img: simple.png
       tfa: No
 
+    - name: Sparkasse
+      url: https://www.sparkasse.de/
+      twitter: sparkasse
+      facebook: sparkasse
+      email_address: sparkasse@sparkassen-finanzportal.de
+      img: sparkasse.png
+      tfa: No
+      lang: de
+
     - name: State Bank of India
       url: https://www.onlinesbi.com/
       img: sbi.png
@@ -446,6 +590,7 @@ websites:
     - name: SunTrust
       url: https://www.suntrust.com/
       twitter: SunTrust
+      facebook: suntrust
       img: suntrust.png
       tfa: No
 
@@ -458,8 +603,9 @@ websites:
       doc: https://hjalp.swedbank.se/logga-in/index.htm
 
     - name: Tangerine
-      url: http://www.tangerine.ca/
+      url: https://www.tangerine.ca/
       twitter: tangerinebank
+      facebook: TangerineBank
       img: tangerine.png
       tfa: No
 
@@ -468,6 +614,8 @@ websites:
       img: targobank.png
       tfa: No
       twitter: TARGOBANK
+      facebook: targobank
+      lang: de
 
     - name: TBC Bank
       url: http://www.tbcbank.ge
@@ -480,6 +628,7 @@ websites:
     - name: TD Bank
       url: https://www.tdbank.com
       twitter: TDBank_US
+      facebook: TDBank
       img: tdbank.png
       tfa: No
 
@@ -492,24 +641,36 @@ websites:
     - name: Triodos Bank Deutschland
       url: https://www.triodos.de
       twitter: triodosde
+      facebook: triodos.de
       img: triodosbank.png
       tfa: No
+      lang: de
+
+    - name: TSB Bank
+      url: http://www.tsb.co.uk
+      twitter: TSB
+      facebook: TSBbankUK
+      img: tsb.png
+      tfa: No
 
     - name: Umpqua Bank
       url: https://www.umpquabank.com/
       twitter: askumpquabank
+      facebook: umpquabank
       img:  umpqua.png
       tfa: No
 
     - name: Union Bank
       url: https://www.unionbank.com/
       twitter: UnionBank
+      facebook: UnionBank
       img: unionbank.png
       tfa: No
 
     - name: US Bank
       url: https://www.usbank.com/
       twitter: usbank
+      facebook: usbank
       img: usbank.png
       tfa: No
 
@@ -531,12 +692,18 @@ websites:
       phone: Yes
       doc: https://www.uwcu.org/OnlineBanking/OnlineSecurity/VerifyU.aspx
 
+    - name: VyStar Credit Union
+      url: https://vystarcu.org/
+      twitter: OfficialVyStar
+      facebook: VyStarCU
+      img: vystar.png
+      tfa: No
+
     - name: Wells Fargo
       url: https://www.wellsfargo.com/
       img: wellsfargo.png
       tfa: Yes
       sms: Yes
-      software: Yes
       phone: Yes
       hardware: Yes
       doc: https://www.wellsfargo.com/privacy-security/advanced-access
@@ -544,18 +711,21 @@ websites:
     - name: Wescom Credit Union
       url: https://www.wescom.org/
       twitter: Liz_Wescom
+      facebook: WescomCreditUnion
       img: wescom.png
       tfa: No
 
     - name: Zag Bank
       url: https://www.zagbank.ca/
       twitter: zagbank
+      facebook: zagbank
       img: zagbank.png
       tfa: No
 
     - name: ZenBanx
-      url: http://zenbanx.ca/
+      url: https://zenbanx.ca/
       twitter: ZenBanx
+      facebook: Zenbanx
       img: zenbanx.png
       tfa: No
 
@@ -569,4 +739,3 @@ websites:
       software: Yes
       hardware: Yes
       doc: https://www.zkb.ch/de/pr/pk/efinance/ebanking/login-verfahren.html
-
diff --git a/data/applications/data/cloud.yml b/data/applications/data/cloud.yml
index b6be265..3b19860 100644
--- a/data/applications/data/cloud.yml
+++ b/data/applications/data/cloud.yml
@@ -1,10 +1,4 @@
 websites:
-    - name: appFog
-      url: https://www.appfog.com/
-      twitter: appfog
-      img: appfog.png
-      tfa: No
-
     - name: Amazon Web Services
       url: https://aws.amazon.com
       img: aws.png
@@ -14,6 +8,20 @@ websites:
       hardware: Yes
       doc: https://aws.amazon.com/iam/details/mfa/
 
+    - name: appFog
+      url: https://www.appfog.com/
+      twitter: appfog
+      img: appfog.png
+      tfa: No
+
+    - name: Brightbox
+      url: https://www.brightbox.com/
+      twitter: brightbox
+      facebook: brightbox
+      email_address: support@brightbox.com
+      img: brightbox.png
+      tfa: No
+
     - name: Cloud 66
       url: https://www.cloud66.com
       img: cloud66.png
@@ -49,9 +57,7 @@ websites:
       img: engineyard.png
       tfa: Yes
       software: Yes
-      exceptions:
-          text: "Currently in beta as of June 5th 2014. Create a support ticket to request 2FA added to your organization"
-      doc: https://support.cloud.engineyard.com/entries/40538256-Two-factor-authentication
+      doc: https://blog.engineyard.com/2015/engine-yards-two-factor-authentication
 
     - name: fortrabbit
       url: https://www.fortrabbit.com/
@@ -68,7 +74,7 @@ websites:
       software: Yes
       phone: Yes
       hardware: Yes
-      doc: http://www.google.com/intl/en-US/landing/2step/features.html
+      doc: https://www.google.com/intl/en-US/landing/2step/features.html
 
     - name: Heroku
       url: https://www.heroku.com/
@@ -77,11 +83,19 @@ websites:
       software: Yes
       doc: https://devcenter.heroku.com/articles/two-factor-authentication
 
+    - name: Hyper.sh
+      url: https://www.hyper.sh
+      img: hypersh.png
+      tfa: No
+      twitter: hyper_sh
+      email_address: contact@hyper.sh
+
     - name: IBM BlueMix
       url: https://bluemix.net
       img: ibmbluemix.png
       tfa: No
       twitter: IBMBluemix
+      facebook: ibmbluemix
 
     - name: Joyent
       url: https://www.joyent.com/
@@ -95,8 +109,6 @@ websites:
       img: leaseweb.png
       tfa: Yes
       sms: Yes
-      exceptions:
-          text: "As of February 23, 2016, only for CDN customer accounts; dedicated/virtual server accounts not included, but in development."
       doc: https://kb.leaseweb.com/display/KB/Two+factor+authentication%3A+Cyber+Security
 
     - name: Linode
@@ -107,7 +119,7 @@ websites:
       doc: https://www.linode.com/docs/security/linode-manager-security-controls
 
     - name: Microsoft Azure
-      url: http://azure.microsoft.com/
+      url: https://azure.microsoft.com/
       img: microsoftazure.png
       tfa: Yes
       sms: Yes
@@ -118,6 +130,7 @@ websites:
     - name: OpenShift
       url: https://www.openshift.com/
       twitter: openshift
+      facebook: openshift
       img: openshift.png
       tfa: No
 
@@ -134,22 +147,24 @@ websites:
       tfa: Yes
       sms: Yes
       software: Yes
-      doc: http://www.rackspace.com/knowledge_center/article/multi-factor-authentication-from-the-cloud-control-panel
+      doc: https://support.rackspace.com/how-to/multi-factor-authentication-from-the-cloud-control-panel/
 
     - name: RightScale
       url: https://www.rightscale.com/
       img: rightscale.png
       tfa: No
       twitter: RightScale
+      facebook: RightScale
 
     - name: Scaleway
       url: https://www.scaleway.com
       twitter: scaleway
+      facebook: scaleway
       img: scaleway.png
       tfa: No
 
     - name: Scalr
-      url: http://www.scalr.com
+      url: https://www.scalr.com
       img: scalr.png
       tfa: Yes
       software: Yes
diff --git a/data/applications/data/communication.yml b/data/applications/data/communication.yml
index 2662a4c..b4d0b42 100644
--- a/data/applications/data/communication.yml
+++ b/data/applications/data/communication.yml
@@ -13,11 +13,19 @@ websites:
       sms: Yes
       doc: https://help.37signals.com/sign-in/questions/460-how-do-i-set-up-and-use-phone-verification-for-logging-in
 
+    - name: Carbon Black Community Exchange
+      url: https://community.carbonblack.com/
+      img: carbonblack.png
+      tfa: No
+      twitter: CarbonBlack_Inc
+      facebook: carbonblackinc
+
     - name: Customer.io
       url: https://customer.io
-      twitter: customerio
       img: customerio.png
-      tfa: No
+      tfa: Yes
+      software: Yes
+      doc: https://customer.io/docs/two-factor-auth.html
 
     - name: Discord
       url: https://discordapp.com/
@@ -30,6 +38,7 @@ websites:
     - name: Disqus
       url: https://disqus.com
       twitter: disqus
+      facebook: disqus
       img: disqus.png
       tfa: No
 
@@ -42,15 +51,24 @@ websites:
     - name: Fleep
       url: https://fleep.io
       twitter: fleepio
+      facebook: fleepio
       img: fleep.png
       tfa: No
 
     - name: Flowdock
       url: https://www.flowdock.com
       twitter: flowdock
+      facebook: flowdock
       img: flowdock.png
       tfa: No
 
+    - name: Front App
+      url: https://frontapp.com
+      img: front_app.png
+      tfa: Yes
+      software: Yes
+      doc: https://faq.frontapp.com/11695-security/how-to-activate-2fa
+
     - name: Grape
       url: https://chatgrape.com/
       img: grape.png
@@ -62,6 +80,7 @@ websites:
     - name: HipChat
       url: https://www.hipchat.com
       twitter: HipChat
+      facebook: HipChat
       img: hipchat.png
       tfa: No
 
@@ -74,8 +93,9 @@ websites:
       doc: http://kb.mailchimp.com/accounts/login/set-up-two-factor-authentication-with-sms
 
     - name: Mailgun
-      url: https://mailgun.com
+      url: http://mailgun.com
       twitter: Mail_Gun
+      facebook: mailgun
       img: mailgun.png
       tfa: No
 
@@ -94,9 +114,10 @@ websites:
       doc: https://peerio.zendesk.com/hc/en-us/articles/202933829-How-do-I-setup-two-factor-authentication-
 
     - name: Ryver
-      url: http://www.ryver.com/
+      url: https://ryver.com/
       img: ryver.png
       twitter: ryverapp
+      facebook: RyverApp
       tfa: No
 
     - name: Salesforce
@@ -113,7 +134,8 @@ websites:
       img: sendgrid.png
       tfa: Yes
       sms: Yes
-      doc: https://sendgrid.com/docs/User_Guide/two_factor_authentication.html
+      software: Yes
+      doc: https://sendgrid.com/docs/User_Guide/Settings/two_factor_authentication.html
 
     - name: Sendloop
       url: https://app.sendloop.com
@@ -130,7 +152,7 @@ websites:
       software: Yes
       doc: http://windows.microsoft.com/en-au/windows/two-step-verification-faq
       exceptions:
-            text: "Two-factor authentication is available only when logging in using Microsoft Account, not Skype's stand-alone account."
+            text: "Two-factor authentication is available only when logging in using a Microsoft account. If you have setup your account using a Skype password, 2FA through Microsoft is essentially useless."
 
     - name: Slack
       url: https://slack.com/
@@ -155,6 +177,13 @@ websites:
       software: Yes
       doc: https://support.sparkpost.com/customer/portal/articles/1948449
 
+    - name: Stackfield
+      url: https://www.stackfield.com/
+      img: stackfield.png
+      tfa: Yes
+      software: Yes
+      doc: http://en.stackfield.help/article/92-activating-deactivating-the-two-factor-authentication
+
     - name: Telegram
       url: https://telegram.org/
       img: telegram.png
@@ -166,17 +195,20 @@ websites:
     - name: ToutApp
       url: https://www1.toutapp.com/
       twitter: toutapp
+      facebook: toutapp
       img: toutapp.png
       tfa: No
 
     - name: WhatsApp
       url: https://www.whatsapp.com/
       twitter: whatsapp
+      facebook: WhatsApp
       img: whatsapp.png
       tfa: No
 
     - name: Yammer
-      url: https://yammer.com
+      url: https://www.yammer.com
       twitter: yammer
+      facebook: Yammer
       img: yammer.png
       tfa: No
diff --git a/data/applications/data/cryptocurrencies.yml b/data/applications/data/cryptocurrencies.yml
index 1318266..7bb61b0 100644
--- a/data/applications/data/cryptocurrencies.yml
+++ b/data/applications/data/cryptocurrencies.yml
@@ -1,17 +1,19 @@
 websites:
     - name: BitBay
-      url: http://bitbay.net
+      url: https://bitbay.net/
       img: bitbay.png
       tfa: Yes
       sms: Yes
       software: Yes
       doc: https://www.youtube.com/watch?v=KFvoNHgl9Pw
 
-    - name: Bitcoins Norway
-      url: https://bitcoinsnorway.com
-      img: bitcoinsnorway.png
+    - name: Bitcoin-Central
+      url: https://bitcoin-central.net
+      img: bitcoincentral.png
       tfa: Yes
       software: Yes
+      hardware: Yes
+      doc: https://bitcoin-central.net/page/profile/security
 
     - name: Bitcoin.de
       url: https://bitcoin.de
@@ -21,13 +23,11 @@ websites:
       hardware: Yes
       doc: https://www.bitcoin.de/de/faq/was-ist-die-2-step-verification-2-faktor-authentifizierung/46.html
 
-    - name: Bitcoin-Central
-      url: https://bitcoin-central.net
-      img: bitcoincentral.png
+    - name: Bitcoins Norway
+      url: https://bitcoinsnorway.com
+      img: bitcoinsnorway.png
       tfa: Yes
       software: Yes
-      hardware: Yes
-      doc: https://bitcoin-central.net/page/profile/security
 
     - name: BitGo
       url: https://www.bitgo.com
@@ -67,20 +67,6 @@ websites:
       software: Yes
       doc: https://www.bitstamp.net/s/documents/bitstamp_2_factor_authentication_guide.pdf
 
-    - name: BTC-E
-      url: https://btc-e.com
-      img: btc-e.png
-      tfa: Yes
-      software: Yes
-      doc: https://support.btc-e.com/index.php?/Knowledgebase/Article/View/97/25/how-do-i-set-2-factor-authentication-to-my-btc-e-account
-
-    - name: BTCJam
-      url: https://www.btcjam.com
-      img: btcjam.png
-      tfa: Yes
-      software: Yes
-      doc: http://help.btcjam.com/customer/portal/articles/1987686
-
     - name: Blockchain
       url: https://blockchain.info/
       img: blockchain.png
@@ -91,6 +77,20 @@ websites:
       hardware: Yes
       doc: https://blockchain.info/wallet/support-pages
 
+    - name: BTC-E
+      url: https://btc-e.com
+      img: btc-e.png
+      tfa: Yes
+      software: Yes
+      doc: https://support.btc-e.com/index.php?/Knowledgebase/Article/View/97/25/how-do-i-set-2-factor-authentication-to-my-btc-e-account
+
+    - name: BTCJam
+      url: https://btcjam.com/
+      img: btcjam.png
+      tfa: Yes
+      software: Yes
+      doc: http://help.btcjam.com/customer/portal/articles/1987686
+
     - name: CampBX
       url: https://campbx.com/
       img: campbx.png
@@ -128,6 +128,14 @@ websites:
       tfa: Yes
       software: Yes
 
+    - name: Coin Cafe
+      url: https://coincafe.com
+      img: coincafe.png
+      tfa: Yes
+      software: Yes
+      email: Yes
+      doc: https://blog.coincafe.com/2016/01/08/2fa/
+
     - name: Coinapult
       url: https://coinapult.com
       img: coinapult.png
@@ -136,21 +144,13 @@ websites:
       doc: https://coinapult.com/faq
 
     - name: Coinbase
-      url: https://coinbase.com/
+      url: https://www.coinbase.com/
       img: coinbase.png
       tfa: Yes
       sms: Yes
       software: Yes
       phone: Yes
-      doc: http://blog.coinbase.com/post/25677574019/coinbase-now-offers-two-factor-authentication
-
-    - name: Coin Cafe
-      url: https://coincafe.com
-      img: coincafe.png
-      tfa: Yes
-      software: Yes
-      email: Yes
-      doc: http://blog.coincafe.com/2016/01/08/2fa/
+      doc: https://support.coinbase.com/customer/en/portal/articles/1658338-how-do-i-set-up-2-factor-authentication-with-authy-
 
     - name: Coinfloor
       url: https://www.coinfloor.co.uk/
@@ -187,13 +187,6 @@ websites:
       hardware: Yes
       doc: https://coinkite.com/settings/pws
 
-    - name: Coinsetter
-      url: https://www.coinsetter.com
-      img: coinsetter.png
-      tfa: Yes
-      software: Yes
-      doc: https://www.coinsetter.com/my/security
-
     - name: Coins.ph
       url: https://coins.ph/
       img: coinsph.png
@@ -201,6 +194,13 @@ websites:
       software: Yes
       doc: https://coinsph.zendesk.com/hc/en-us/sections/200557900-Two-factor-authentication
 
+    - name: Coinsetter
+      url: https://www.coinsetter.com
+      img: coinsetter.png
+      tfa: Yes
+      software: Yes
+      doc: https://www.coinsetter.com/my/security
+
     - name: Cryptsy
       url: https://cryptsy.com/
       img: cryptsy.png
@@ -235,7 +235,7 @@ websites:
       img: localbitcoins.png
       tfa: Yes
       software: Yes
-      doc: http://localbitcoins.blogspot.fi/2013/05/using-two-factor-authentication-on.html
+      doc: https://localbitcoins.blogspot.com.au/2013/05/using-two-factor-authentication-on.html
 
     - name: Uphold
       url: https://uphold.com/
diff --git a/data/applications/data/developer.yml b/data/applications/data/developer.yml
index fb80c89..2dd2a76 100644
--- a/data/applications/data/developer.yml
+++ b/data/applications/data/developer.yml
@@ -12,6 +12,7 @@ websites:
     - name: Airbrake
       url: https://airbrake.io
       twitter: airbrake
+      facebook: airbrake.io
       img: airbrake.png
       tfa: No
 
@@ -22,6 +23,13 @@ websites:
       software: Yes
       doc: https://www.algolia.com/doc/security/best-security-practices#two-factor-authentication
 
+    - name: AppVeyor
+      url: https://www.appveyor.com
+      img: appveyor.png
+      tfa: No
+      twitter: appveyor
+      email_address: team@appveyor.com
+
     - name: aTech Media
       url: https://atechmedia.com
       img: atechmedia.png
@@ -33,6 +41,7 @@ websites:
     - name: Balsamiq
       url: https://balsamiq.com
       twitter: balsamiq
+      facebook: BalsamiqMockups
       img: balsamiq.png
       tfa: No
 
@@ -56,6 +65,7 @@ websites:
       img: cedexis.png
       tfa: No
       twitter: Cedexis
+      facebook: Cedexis
 
     - name: Cloud9
       url: https://c9.io
@@ -92,8 +102,9 @@ websites:
           text: "Only available on paid accounts at $7/10 per month (annual/monthly) or more."
 
     - name: Codeship
-      url: https://codeship.io/
+      url: https://codeship.com/
       twitter: codeship
+      facebook: codeship
       img: codeship.png
       tfa: No
 
@@ -112,8 +123,9 @@ websites:
       tfa: No
 
     - name: Docker
-      url: https://docker.com/
+      url: https://www.docker.com/
       twitter: docker
+      facebook: docker.run
       img: docker.png
       tfa: No
 
@@ -163,6 +175,13 @@ websites:
       sms: Yes
       doc: http://www.infobip.com/messaging/enterprise/2_factor_authentication/
 
+    - name: JetBrains
+      url: https://jetbrains.com
+      img: jetbrains.png
+      tfa: No
+      twitter: jetbrains
+      facebook: JetBrains
+
     - name: Jidoteki
       url: https://jidoteki.com
       img: jidoteki.png
@@ -211,6 +230,7 @@ websites:
     - name: New Relic
       url: https://newrelic.com
       twitter: newrelic
+      facebook: NewRelic
       img: newrelic.png
       tfa: No
 
@@ -236,12 +256,14 @@ websites:
     - name: Pivotal Tracker
       url: https://www.pivotaltracker.com
       twitter: pivotaltracker
+      facebook: pivotaltracker
       img: pivotaltracker.png
       tfa: No
 
     - name: Plivo
       url: https://www.plivo.com
       twitter: plivo
+      facebook: Plivo
       img: plivo.png
       tfa: No
 
@@ -253,9 +275,9 @@ websites:
 
     - name: PythonAnywhere
       url: https://www.pythonanywhere.com
-      twitter: pythonanywhere
       img: pythonanywhere.png
-      tfa: No
+      tfa: Yes
+      software: Yes
 
     - name: RBCommons
       url: https://rbcommons.com
@@ -272,6 +294,21 @@ websites:
       software: Yes
       doc: https://rollbar.com/docs/two-factor-authentication/
 
+    - name: RubyGems.org
+      url: https://rubygems.org
+      img: rubygems.png
+      tfa: No
+      twitter: rubygems
+      email_address: security@rubygems.org
+
+    - name: Sauce Labs
+      url: https://saucelabs.com
+      img: saucelabs.png
+      tfa: No
+      twitter: saucelabs
+      facebook: saucelabs
+      email_address: support@saucelabs.com
+
     - name: Semaphore
       url: https://semaphoreci.com
       img: semaphore.png
@@ -279,11 +316,21 @@ websites:
       doc: https://semaphoreci.com/docs/two-step-verification.html
       software: Yes
 
+    - name: Sentry
+      url: https://getsentry.com
+      img: sentry.png
+      tfa: Yes
+      sms: Yes
+      hardware: Yes
+      software: Yes
+      doc: https://blog.getsentry.com/2016/06/22/introducing-2fa.html
+
     - name: SourceForge
-      url: http://sourceforge.net/
-      twitter: sourceforge
+      url: https://sourceforge.net/
       img: sourceforge.png
-      tfa: No
+      tfa: Yes
+      software: Yes
+      doc: https://sourceforge.net/blog/introducing-multifactor-authentication-on-sourceforge/
 
     - name: Status.io
       url: https://status.io/
@@ -301,12 +348,14 @@ websites:
     - name: StatusPage.io
       url: https://www.statuspage.io
       twitter: statuspageio
+      facebook: statuspageio
       img: statuspageio.png
       tfa: No
 
     - name: Taiga.io
       url: https://taiga.io
       twitter: taigaio
+      facebook: taigaio
       img: taigaio.png
       tfa: No
 
@@ -329,6 +378,7 @@ websites:
     - name: Uptime Robot
       url: https://uptimerobot.com
       twitter: uptimerobot
+      facebook: UptimeRobot
       img: uptimerobot.png
       tfa: No
 
@@ -341,7 +391,8 @@ websites:
       doc: http://windows.microsoft.com/en-us/windows/two-step-verification-faq
 
     - name: Zapier
-      url: https://www.zapier.com
+      url: https://zapier.com
       twitter: zapier
+      facebook: ZapierApp
       img: zapier.png
       tfa: No
diff --git a/data/applications/data/domains.yml b/data/applications/data/domains.yml
index 495afbe..9057db9 100644
--- a/data/applications/data/domains.yml
+++ b/data/applications/data/domains.yml
@@ -18,13 +18,22 @@ websites:
       url: https://10dollar.ca/
       img: 10dollar.png
       twitter: 10dollar_ca
+      facebook: 10dollar.ca
       tfa: No
 
+    - name: 123 Reg
+      url: https://www.123-reg.co.uk
+      img: 123reg.png
+      tfa: No
+      twitter: 123reg
+      facebook: 123regfans
+
     - name: 1and1
       url: https://www.1and1.com/
       img: 1and1.png
       tfa: No
       twitter: 1and1
+      facebook: 1and1
 
     - name: Above.com
       url: https://www.above.com
@@ -33,13 +42,7 @@ websites:
       software: Yes
       doc: http://domains.above.com/manual-two-step-authentication.html
 
-    - name: Badger
-      url: http://badger.com
-      img: badger.png
-      tfa: No
-      twitter: badger
-
-    - name: CloudFlare
+    - name: Cloudflare
       url: https://cloudflare.com
       img: cloudflare.png
       tfa: Yes
@@ -51,12 +54,14 @@ websites:
       img: cloudns.png
       tfa: No
       twitter: ClouDNS
+      facebook: cloudns
 
     - name: Crazy Domains
       url: https://www.crazydomains.com
       img: crazydomains.png
       tfa: No
       twitter: CrazyDomains
+      facebook: crazydomains
 
     - name: Directnic
       url: https://directnic.com
@@ -84,11 +89,13 @@ websites:
       url: https://www.domainmonster.com/
       img: domainmonster.png
       twitter: domainmonster
+      facebook: Domainmonster
       tfa: No
 
     - name: Domain.com
       url: https://www.domain.com/
       twitter: DomainDotCom
+      facebook: Domaindotcom
       img: domaindotcom.png
       tfa: No
 
@@ -96,11 +103,21 @@ websites:
       url: https://www.df.eu
       img: domainfactory.png
       twitter: domainfactory
+      facebook: domainfactory.GmbH
       tfa: No
+      lang: de
+
+    - name: Domains4Bitcoins.com
+      url: https://www.domains4bitcoins.com
+      img: domains4bitcoins.png
+      tfa: Yes
+      sms: Yes
+      doc: http://my.domains4bitcoins.com/kb/answer/2692
 
     - name: DomainsAtCost
       url: https://www.domainsatcost.ca/
       twitter: domainsatcost
+      facebook: domainsatcost
       img: domainsatcost.png
       tfa: No
 
@@ -141,7 +158,7 @@ websites:
       img: enom.png
       tfa: Yes
       software: Yes
-      doc: http://www.enom.com/news/article.aspx?p=978&
+      doc: http://www.enom.com/kb/kb/kb_1687-setup-2-factor.htm
 
     - name: EuroDNS
       url: https://www.eurodns.com
@@ -160,9 +177,16 @@ websites:
     - name: Fasthosts
       url: https://www.fasthosts.co.uk/
       twitter: Fasthosts
+      facebook: fasthostsinternet
       img: fasthosts.png
       tfa: No
 
+    - name: FreeDNS
+      url: https://freedns.afraid.org/
+      email_address: dnsadmin@afraid.org
+      img: freedns.png
+      tfa: No
+
     - name: Gandi
       url: https://gandi.net
       img: gandi.png
@@ -192,6 +216,14 @@ websites:
       img: heartinternet.png
       tfa: No
       twitter: HeartInternet
+      facebook: heartinternet
+
+    - name: Hexonet
+      url: https://www.hexonet.net/
+      img: hexonet.png
+      tfa: Yes
+      software: Yes
+      doc: https://cp.hexonet.net/cp2/downloads/2FA.pdf
 
     - name: Hover.com
       img: hover.png
@@ -266,10 +298,12 @@ websites:
       img: moniker.png
       tfa: No
       twitter: monikersnap
+      facebook: MonikerLLC
 
     - name: MyDomain
       url: https://www.mydomain.com/
       twitter: mydomaindotcom
+      facebook: mydomain
       img: mydomain.png
       tfa: No
 
@@ -297,8 +331,9 @@ websites:
       doc: https://www.namesilo.com/Support/2~Factor-Authentication
 
     - name: NamesPro.ca
-      url: http://www.namespro.ca/
+      url: https://www.namespro.ca/
       twitter: namespro
+      facebook: namespro
       img: namespro.png
       tfa: No
 
@@ -313,24 +348,28 @@ websites:
     - name: Netfirms
       url: https://www.netfirms.com
       twitter: netfirms
+      facebook: netfirmsfans
       img: netfirms.png
       tfa: No
 
     - name: Netim
       url: https://www.netim.com/
       twitter: Netim_com
+      facebook: netimcom
       img: netim.png
       tfa: No
 
     - name: Netregistry
       url: http://www.netregistry.com.au/
       twitter: netregistry
+      facebook: netregistry
       img: netregistry.png
       tfa: No
 
     - name: Network Solutions
       url: https://www.networksolutions.com/
       twitter: netsolcares
+      facebook: Web.com
       img: networksolutions.png
       tfa: No
 
@@ -339,6 +378,7 @@ websites:
       img: noip.png
       tfa: No
       twitter: NoIPcom
+      facebook: noipdns
 
     - name: Nominet
       url: http://www.nominet.uk/
@@ -366,6 +406,7 @@ websites:
       url: https://www.pairnic.com/
       img: pairnic.png
       tfa: Yes
+      software: Yes
       sms: Yes
       doc: https://www.pairnic.com/faq_security.html
 
@@ -375,6 +416,13 @@ websites:
       img: pointdns.png
       tfa: No
 
+    - name: porkbun
+      url: https://porkbun.com
+      img: porkbunBuns.png
+      tfa: Yes
+      software: Yes
+      doc: https://porkbun.com/products/two_factor_authentication
+
     - name: Register4Less
       url: https://register4less.com/
       img: register4less.png
@@ -393,8 +441,17 @@ websites:
     - name: STRATO
       url: https://www.strato.de/
       twitter: STRATO_AG
+      facebook: strato
       img: strato.png
       tfa: No
+      lang: de
+
+    - name: Uniregistry
+      url: https://uniregistry.com/
+      img: uniregistry.png
+      tfa: Yes
+      software: Yes
+      doc: https://uniregistry.help/my-account-en/what-is-two-step-verification/
 
     - name: Verio
       url: https://www.verio.com/
diff --git a/data/applications/data/education.yml b/data/applications/data/education.yml
index ce4080e..bf1f964 100644
--- a/data/applications/data/education.yml
+++ b/data/applications/data/education.yml
@@ -1,7 +1,15 @@
 websites:
+    - name: (ISC)2
+      url: https://www.isc2.org
+      img: isc2.png
+      tfa: No
+      twitter: ISC2
+      facebook: isc2fb
+
     - name: Academic Earth
       url: http://academicearth.org/
       twitter: academicearth
+      facebook: academicearth
       img: academicearth.png
       tfa: No
 
@@ -11,6 +19,14 @@ websites:
       twitter: antagningse
       tfa: No
 
+    - name: Certified Wireless Network Professional (CWNP)
+      url: https://www.cwnp.com
+      img: cwnp.png
+      tfa: No
+      twitter: CWNP
+      facebook: OfficialCWNP
+      email_address: customercare@cwnp.com
+
     - name: Clever
       url: https://www.clever.com
       img: clever.png
@@ -22,18 +38,36 @@ websites:
     - name: Code School
       url: https://www.codeschool.com/
       twitter: codeschool
+      facebook: CodeSchool
       img: codeschool.png
       tfa: No
 
     - name: Codecademy
       url: https://www.codecademy.com/
       twitter: codecademy
+      facebook: codecademy
       img: codecademy.png
       tfa: No
 
+    - name: College Of DuPage
+      url: https://www.cod.edu/
+      twitter: collegedupage
+      facebook: collegeofdupage
+      email_address: studenthelp@dupage.edu
+      img: CoD.png
+      tfa: No
+
+    - name: CompTIA
+      url: https://certification.comptia.org/
+      img: CompTIA.png
+      tfa: No
+      twitter: comptia
+      facebook: CompTIA
+
     - name: Coursera
       url: https://www.coursera.org/
       twitter: coursera
+      facebook: Coursera
       img: coursera.png
       tfa: No
 
@@ -49,20 +83,56 @@ websites:
       url: https://www.duolingo.com
       img: duolingo.png
       twitter: duolingo
+      facebook: duolingo
       tfa: No
 
+    - name: EC-Council
+      url: https://www.eccouncil.org
+      img: eccouncil.png
+      tfa: Yes
+      sms: Yes
+      email: Yes
+      doc: https://aspen.eccouncil.org/aspen/Help/2FactorAuthentication-User_Manual.pdf
+
     - name: Edmodo
       url: https://www.edmodo.com/
       twitter: edmodo
+      facebook: edmodo
       img: edmodo.png
       tfa: No
 
     - name: edX
       url: https://www.edx.org/
       twitter: edXOnline
+      facebook: edX
       img: edx.png
       tfa: No
 
+    - name: Global Information Assurance Certification (GIAC)
+      url: https://www.giac.org
+      img: giac.png
+      tfa: No
+      twitter: CertifyGIAC
+      facebook: GIAC.org
+      email_address: info@giac.org
+
+    - name: Illinois Institute Of Technology
+      url: https://web.iit.edu/
+      twitter: illinoistech
+      facebook: illinoistech
+      email_address: supportdesk@iit.edu
+      img: iit.png
+      tfa: No
+      exceptions:
+          text: "Illinois Tech uses Google Apps for Eductation for their email; so they could very easily add tfa to their email, but at the time of this commit, they have it disabled and do not plan to implement it any time soon."
+
+    - name: ISACA
+      url: https://www.isaca.org
+      img: isaca.png
+      tfa: No
+      twitter: ISACANews
+      facebook: ISACAHQ
+
     - name: Montclair State University
       url: https://www.montclair.edu/employee-services/
       twitter: montclairstateu
@@ -72,6 +142,7 @@ websites:
     - name: My Study Life
       url: https://www.mystudylife.com/
       twitter: mystudylife
+      facebook: mystudylife
       img: mystudylife.png
       tfa: No
 
@@ -93,32 +164,56 @@ websites:
     - name: Robert Morris University
       url: https://sentry.rmu.edu/login
       twitter: rmu
+      facebook: RMUpgh
       img: rmu.png
       tfa: No
 
     - name: Royal Roads University
       url: http://www.royalroads.ca
       twitter: RoyalRoads
+      facebook: royalroadsu
       img: royalroads.png
       tfa: No
 
     - name: SchoolSoft
       url: http://schoolsoft.se/
       img: schoolsoft.png
+      email_address: support@schoolsoft.se
       tfa: No
 
+    - name: Temple University
+      url: https://www.temple.edu/
+      img: templeuniversity.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      software: Yes
+      doc: https://computerservices.temple.edu/two-step-verification
+
     - name: Udacity
       url: https://www.udacity.com/
       twitter: udacity
+      facebook: Udacity
       img: udacity.png
       tfa: No
 
     - name: Udemy
       url: https://www.udemy.com/
       twitter: udemy
+      facebook: udemy
       img: udemy.png
       tfa: No
 
+    - name: University of Michigan
+      url: https://www.umich.edu
+      img: umich.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      hardware: Yes
+      software: Yes
+      doc: http://its.umich.edu/accounts-access/uniqnames-passwords/two-factor-authentication
+
     - name: Virginia Tech
       url: https://www.vt.edu/
       img: virginiatech.png
@@ -127,4 +222,4 @@ websites:
       phone: Yes
       software: Yes
       hardware: Yes
-      doc: http://it.vt.edu/2factor/index.php
+      doc: http://www.tech.it.vt.edu/2factor/
diff --git a/data/applications/data/email.yml b/data/applications/data/email.yml
index 21bf19e..823a344 100644
--- a/data/applications/data/email.yml
+++ b/data/applications/data/email.yml
@@ -5,18 +5,23 @@ websites:
       tfa: Yes
       sms: Yes
       phone: Yes
-      exceptions:
-        text: "Currently U.S. only. International support coming soon."
-      doc: https://help.aol.com/articles/2-factor-authentication-stronger-than-your-password-alone
+      software: Yes
+      doc: https://help.aol.com/articles/2-step-verification-stronger-than-your-password-alone
 
     - name: FastMail
-      url: https://www.fastmail.fm/
+      url: https://www.fastmail.com/
       img: fastmail.png
       tfa: Yes
       sms: Yes
       software: Yes
       hardware: Yes
-      doc: https://www.fastmail.fm/help/features_alternative_logins.html
+      doc: https://www.fastmail.com/help/account/2fa.html
+
+    - name: Freenet
+      url: https://www.freenet.de/
+      img: freenet.png
+      tfa: No
+      facebook: freenet
 
     - name: Gmail
       url: https://gmail.com
@@ -46,6 +51,7 @@ websites:
     - name: Mail.com
       url: https://www.mail.com/
       twitter: maildotcom
+      facebook: mail.com
       img: maildotcom.png
       tfa: No
 
@@ -58,11 +64,12 @@ websites:
       doc: https://help.mail.ru/enmail-help/settings/2auth
 
     - name: mailbox.org
-      url: https://www.mailbox.org/
+      url: https://mailbox.org/
       img: mailbox.png
       tfa: Yes
+      software: Yes
       hardware: Yes
-      doc: https://mailbox.org/en/one-time-passwords-for-secure-login-to-our-webmailer/
+      doc: https://support-en.mailbox.org/knowledge-base/article/is-there-a-two-factor-authentication
 
     - name: Mailstache
       url: https://mailstache.io
@@ -96,6 +103,7 @@ websites:
     - name: ProtonMail
       url: https://protonmail.com/
       twitter: ProtonMail
+      facebook: protonmail
       img: protonmail.png
       tfa: No
 
@@ -111,6 +119,14 @@ websites:
       img: runbox.png
       tfa: No
 
+    - name: T-Online
+      url: http://email.t-online.de
+      twitter: Telekom_hilft
+      facebook: tonline.de
+      img: tonline.png
+      lang: de
+      tfa: No
+
     - name: Thexyz
       url: https://www.thexyz.com/
       img: thexyz.png
@@ -119,6 +135,14 @@ websites:
       hardware: Yes
       doc: https://www.thexyz.com/account/knowledgebase/15/Enabling-two-factor-authentication.html
 
+    - name: Web.de
+      url: https://web.de
+      twitter: WEBDE
+      facebook: WEB.DE
+      img: webde.png
+      lang: de
+      tfa: No
+
     - name: Yahoo Japan Mail
       url: https://mail.yahoo.co.jp/
       img: yahoojapanmail.png
diff --git a/data/applications/data/entertainment.yml b/data/applications/data/entertainment.yml
index 7eaa053..f3c657e 100644
--- a/data/applications/data/entertainment.yml
+++ b/data/applications/data/entertainment.yml
@@ -2,12 +2,20 @@ websites:
     - name: Bandcamp
       url: https://bandcamp.com
       twitter: bandcamp
+      facebook: Bandcamp
       img: bandcamp.png
       tfa: No
 
+    - name: Beam
+      url: https://beam.pro
+      img: beam.png
+      tfa: Yes
+      software: Yes
+
     - name: CD Baby
       url: https://www.cdbaby.com/
       twitter: cdbaby
+      facebook: cdbaby
       img: cdbaby.png
       tfa: No
 
@@ -24,12 +32,14 @@ websites:
     - name: hitbox
       url: https://www.hitbox.tv/
       twitter: hitboxliveHelp
+      facebook: hitboxlive
       img: hitbox.png
       tfa: No
 
     - name: Hulu
       url: http://www.hulu.com/
       twitter: hulu_support
+      facebook: hulu
       img: hulu.png
       tfa: No
 
@@ -37,53 +47,70 @@ websites:
       url: https://www.imdb.com
       img: imdb.png
       twitter: IMDb
+      facebook: imdb
       tfa: No
 
     - name: Last.fm
       url: http://www.last.fm/
       twitter: lastfmsupport
+      facebook: lastfm
       img: lastfm.png
       tfa: No
 
     - name: Netflix
       url: https://www.netflix.com/us/
       twitter: Netflixhelps
+      facebook: netflix
       img: netflix.png
       tfa: No
 
+    - name: Picarto.TV
+      url: https://picarto.tv/
+      twitter: PicartoTV
+      facebook: picartotv
+      email_address: support@picarto.tv
+      img: picartotv.png
+      tfa: No
+
     - name: Plex
       url: https://www.plex.tv
       twitter: plexapp
+      facebook: plexapp
       img: plex.png
       tfa: No
 
     - name: Sling TV
       url: https://www.sling.com/
       twitter: slinganswers
+      facebook: sling
       img: sling.png
       tfa: No
 
     - name: SoundCloud
       url: https://soundcloud.com/
       twitter: SCsupport
+      facebook: SoundCloud
       img: soundcloud.png
       tfa: No
 
     - name: Spotify
       url: https://www.spotify.com/
       twitter: spotifycares
+      facebook: spotify
       img: spotify.png
       tfa: No
 
     - name: TIDAL
       url: https://tidal.com/
       twitter: TIDALHiFi
+      facebook: TIDAL
       img: tidal.png
       tfa: No
 
     - name: TiVo
       url: https://www.tivo.com/
       twitter: TiVo
+      facebook: TiVo
       img: tivo.png
       tfa: No
 
@@ -98,9 +125,24 @@ websites:
     - name: Ustream
       url: http://www.ustream.tv/
       twitter: UstreamSupport
+      facebook: ustream
       img: ustream.png
       tfa: No
 
+    - name: Vessel
+      url: https://www.vessel.com/
+      twitter: Vessel
+      facebook: vessel
+      img: vessel.png
+      tfa: No
+
+    - name: Vimeo
+      url: https://vimeo.com/
+      twitter: vimeo
+      facebook: Vimeo
+      img: vimeo.png
+      tfa: No
+
     - name: YouTube
       url: https://www.youtube.com/
       img: youtube.png
@@ -110,15 +152,3 @@ websites:
       phone: Yes
       hardware: Yes
       doc: http://www.google.com/intl/en-US/landing/2step/features.html
-
-    - name: Vessel
-      url: https://www.vessel.com/
-      twitter: Vessel
-      img: vessel.png
-      tfa: No
-
-    - name: Vimeo
-      url: https://vimeo.com/
-      twitter: vimeo
-      img: vimeo.png
-      tfa: No
diff --git a/data/applications/data/finance.yml b/data/applications/data/finance.yml
index 1dbc681..1c6d035 100644
--- a/data/applications/data/finance.yml
+++ b/data/applications/data/finance.yml
@@ -1,15 +1,15 @@
 websites:
+    - name: Adirondack Insurance Exchange
+      url: http://www.aie-ny.com/
+      img: adirondackinsurnaceexchange.png
+      tfa: No
+
     - name: ADP
       url: https://www.adp.com
       twitter: adp
       img: adp.png
       tfa: No
 
-    - name: Adirondack Insurance Exchange
-      url: http://www.aie-ny.com/
-      img: adirondackinsurnaceexchange.png
-      tfa: No
-
     - name: Credit Karma
       url: https://www.creditkarma.com
       twitter: creditkarma
@@ -25,8 +25,9 @@ websites:
     - name: FreeAgent
       url: https://www.freeagent.com
       img: freeagent.png
-      twitter: freeagent
-      tfa: No
+      tfa: Yes
+      software: Yes
+      docs: https://www.freeagent.com/support/kb/getting-started/two-step-verification
 
     - name: FreshBooks
       url: https://www.freshbooks.com
@@ -40,6 +41,13 @@ websites:
       twitter: geico_service
       tfa: No
 
+    - name: Gusto
+      url: https://www.gusto.com
+      img: gusto.png
+      tfa: Yes
+      sms: Yes
+      doc: https://support.gusto.com/hc/en-us/articles/210838787-Two-Step-Authentication
+
     - name: HelloWallet
       url: https://www.hellowallet.com
       twitter: HelloWallet
@@ -102,6 +110,13 @@ websites:
       img: mintbills.png
       tfa: No
 
+    - name: Noddle
+      url: https://www.noddle.co.uk
+      twitter: useyournoddle
+      facebook: noodleuk
+      img: noddle.png
+      tfa: No
+
     - name: Northwestern Mutual
       url: https://www.northwesternmutual.com/
       facebook: northwesternmutual
@@ -115,6 +130,12 @@ websites:
       sms: Yes
       phone: Yes
 
+    - name: Paytrust
+      url: http://paytrust.quicken.com
+      img: paytrust.png
+      tfa: Yes
+      phone: Yes
+
     - name: Pocketsmith
       url: https://www.pocketsmith.com
       img: pocketsmith.png
@@ -156,6 +177,12 @@ websites:
       software: Yes
       doc: http://help.quickfile.co.uk/main/1/2-factor_authentication.htm
 
+    - name: Quizzle
+      url: https://www.quizzle.com
+      img: quizzle.png
+      tfa: No
+      twitter: Quizzle
+
     - name: Ripple Trade
       url: https://www.rippletrade.com/
       img: rippletrade.png
@@ -163,6 +190,13 @@ websites:
       sms: Yes
       doc: https://ripple.com/knowledge_center/using-two-factor-authentication-2fa/
 
+    - name: Santander UK
+      url: http://www.santander.co.uk
+      img: santander.png
+      tfa: Yes
+      sms: Yes
+      doc: http://www.santander.co.uk/uk/help-support/security-centre
+
     - name: Shoeboxed
       url: https://www.shoeboxed.com/
       twitter: Shoeboxed
@@ -212,10 +246,3 @@ websites:
       twitter: ynab
       img: ynab.png
       tfa: no
-
-    - name: ZenPayroll
-      url: https://www.zenpayroll.com
-      img: zenpayroll.png
-      tfa: Yes
-      sms: Yes
-      doc: http://help.zenpayroll.com/customer/portal/articles/969452-two-step-authentication
diff --git a/data/applications/data/food.yml b/data/applications/data/food.yml
index d8204eb..503c8bf 100644
--- a/data/applications/data/food.yml
+++ b/data/applications/data/food.yml
@@ -1,24 +1,29 @@
 websites:
     - name: Dutch Bros
-      url: http://www.dutchbros.com/
+      url: https://dutchbros.com/
       img: dutchbros.png
       tfa: No
       twitter: DutchBros
+      facebook: dutchbros
 
     - name: Max
       url: https://max.se/
       img: max.png
       tfa: No
       twitter: maxhamburgare
+      facebook: maxhamburgare
+      lang: sv
 
     - name: Starbucks
       url: http://www.starbucks.com/
       img: starbucks.png
       tfa: No
       twitter: Starbucks
+      facebook: Starbucks
 
     - name: Taco Bell
       url: https://www.tacobell.com
       img: tacobell.png
       tfa: No
       twitter: tacobell
+      facebook: tacobell
diff --git a/data/applications/data/gaming.yml b/data/applications/data/gaming.yml
index 6500383..a2c078f 100644
--- a/data/applications/data/gaming.yml
+++ b/data/applications/data/gaming.yml
@@ -7,15 +7,6 @@ websites:
       software: Yes
       doc: https://support.ankama.com/hc/en-us/categories/200093427-DOFUS-Security
 
-    - name: Blizzard
-      url: http://blizzard.com
-      img: blizzard.png
-      tfa: Yes
-      sms: Yes
-      software: Yes
-      hardware: Yes
-      doc: http://us.battle.net/en/security/
-
     - name: Black Desert Online
       url: https://www.blackdesertonline.com/
       img: bdo.png
@@ -29,6 +20,21 @@ websites:
       software: Yes
       doc: https://support.bladeandsoul.com/hc/en-us/articles/207578553-Supported-Two-Step-OTP-Authentication-Verification-Methods
 
+    - name: Blizzard
+      url: http://blizzard.com
+      img: blizzard.png
+      tfa: Yes
+      sms: Yes
+      software: Yes
+      hardware: Yes
+      doc: http://us.battle.net/en/security/
+
+    - name: Curse
+      url: https://www.curse.com/
+      img: curse.png
+      tfa: No
+      twitter: curseapp
+
     - name: Desura
       url: http://www.desura.com/
       img: desura.png
@@ -62,6 +68,13 @@ websites:
       exceptions:
           text: "This does not prevent people from logging into the game client by circumventing the launcher. That is a legacy issue that the developers have acknowledged."
 
+    - name: GameFly
+      url: https://www.gamefly.com/
+      twitter: GameFly
+      facebook: gamefly
+      img: gamefly.png
+      tfa: No
+
     - name: Garena Online
       url: http://garena.com
       img: garena.png
@@ -71,6 +84,13 @@ websites:
       exceptions:
           text: "A mobile phone and Garena account level 3 or higher is required for 2FA."
 
+    - name: GeForce (Nvidia)
+      url: http://www.geforce.com/
+      twitter: NVIDIAGeForce
+      facebook: NVIDIAGeForce
+      img: geforce.png
+      tfa: No
+
     - name: GOG.com
       url: https://www.gog.com
       img: gog.png
@@ -139,10 +159,10 @@ websites:
 
     - name: Playstation Network
       url: https://www.playstation.com/
-      twitter: AskPlayStation
       img: psn.png
-      tfa: No
-      status: http://www.polygon.com/2016/4/20/11470660/psn-two-factor-authentication-playstation-network
+      tfa: Yes
+      sms: Yes
+      doc: https://www.playstation.com/en-us/account-security/2-step-verification/
 
     - name: Roberts Space Industries
       url: https://robertsspaceindustries.com/
@@ -183,6 +203,12 @@ websites:
       hardware: Yes
       doc: http://www.swtor.com/info/security-key
 
+    - name: Stardock Corporation
+      url: https://www.stardock.com/
+      twitter: Stardock
+      img: stardock.png
+      tfa: No
+
     - name: Steam
       url: http://store.steampowered.com/
       img: steam.png
@@ -204,8 +230,9 @@ websites:
       url: http://www.trionworlds.com/en/
       img: trionworlds.png
       tfa: Yes
+      email: Yes
       software: Yes
-      doc: https://store.trionworlds.com/account/profile/manage-game
+      doc: https://support.trionworlds.com/hc/en-us/articles/204183357-Adding-a-Mobile-Authenticator
 
     - name: Uplay
       url: https://uplay.ubi.com/
diff --git a/data/applications/data/government.yml b/data/applications/data/government.yml
new file mode 100644
index 0000000..f6f77e8
--- /dev/null
+++ b/data/applications/data/government.yml
@@ -0,0 +1,33 @@
+websites:
+    - name: Canada Revenue Agency
+      url: http://www.cra-arc.gc.ca
+      img: canadarevenueagency.png
+      tfa: No
+      twitter: canrevagency
+      
+    - name: Healthcare.gov
+      url: https://healthcare.gov
+      twitter: HealthCareGov
+      img: healthcaregov.png
+      tfa: No
+
+    - name: Skatteverket
+      url: https://www.skatteverket.se
+      img: skatteverket.png
+      tfa: Yes
+      hardware: Yes
+      software: Yes
+      doc: https://www.skatteverket.se/privat/sjalvservice/allaetjanster/omelegitimation.4.18e1b10334ebe8bc80004811.html
+
+    - name: US Internal Revenue Service
+      url: http://www.irs.gov/Individuals/Get-Transcript
+      twitter: IRSnews
+      img: usirs.png
+      tfa: No
+
+    - name: US Social Security Administration
+      url: https://www.ssa.gov
+      img: usssa.png
+      tfa: Yes
+      sms: Yes
+      doc: https://secure.ssa.gov/RIL/HpsView.do#question3
diff --git a/data/applications/data/health.yml b/data/applications/data/health.yml
index 0660886..3e9152e 100644
--- a/data/applications/data/health.yml
+++ b/data/applications/data/health.yml
@@ -5,6 +5,14 @@ websites:
       img: 23andme.png
       tfa: No
 
+    - name: Carilion Clinic
+      url: https://www.carilionclinic.org
+      img: carilionclinic.png
+      tfa: No
+      twitter: CarilionClinic
+      facebook: carilionclinic
+      email_address: direct@carilionclinic.org
+
     - name: CVS/Caremark
       url: https://www.caremark.com
       twitter: cvshealth
@@ -25,15 +33,11 @@ websites:
       tfa: No
       status: https://twitter.com/Drugscom/status/493856207572975620
 
-    - name: Google Fit
-      url: https://fit.google.com
-      img: googlefit.png
-      tfa: Yes
-      sms: Yes
-      phone: Yes
-      hardware: Yes
-      software: Yes
-      doc: http://www.google.com/intl/en-US/landing/2step/features.html
+    - name: Elation Health
+      url: https://www.elationhealth.com/
+      twitter: ElationHealth
+      img: elationhealth.png
+      tfa: No
 
     - name: FitBit
       url: http://www.fitbit.com
@@ -50,11 +54,15 @@ websites:
       software: Yes
       doc: http://support.followmyhealth.com/customer/portal/articles/1309938-fmh-secure-login-2-step-verification---break-down
 
-    - name: Healthcare.gov
-      url: http://healthcare.gov
-      twitter: HealthCareGov
-      img: healthcaregov.png
-      tfa: No
+    - name: Google Fit
+      url: https://fit.google.com
+      img: googlefit.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      hardware: Yes
+      software: Yes
+      doc: http://www.google.com/intl/en-US/landing/2step/features.html
 
     - name: HealthVault (w/Microsoft Account)
       url: https://www.healthvault.com
@@ -82,6 +90,20 @@ websites:
       img: myfitnesspal.png
       tfa: No
 
+    - name: Runtastic
+      url: https://www.runtastic.com
+      twitter: Runtastic
+      facebook: runtastic
+      img: runtastic.png
+      tfa: No
+
+    - name: Thriva
+      url: https://thriva.co
+      twitter: thrivahealth
+      facebook: thriva
+      img: thriva.png
+      tfa: No
+
     - name: WebMD
       url: http://www.webmd.com
       twitter: WebMD
diff --git a/data/applications/data/hosting.yml b/data/applications/data/hosting.yml
index 0c4b8b6..c45c1ac 100644
--- a/data/applications/data/hosting.yml
+++ b/data/applications/data/hosting.yml
@@ -1,4 +1,11 @@
 websites:
+    - name: 34SP.com
+      url: https://www.34SP.com
+      img: 34sp.png
+      tfa: yes
+      software: yes
+      doc: https://www.34sp.com/kb/142/how-to-enable-2-factor-authentication-on-your-account
+
     - name: ARP Networks
       url: https://arpnetworks.com/
       img: arpnetworks.png
@@ -42,6 +49,13 @@ websites:
       twitter: CloudShards
       tfa: No
 
+    - name: Cloudways
+      url: https://www.cloudways.com/
+      img: cloudways.png
+      tfa: Yes
+      software: Yes
+      doc: https://support.cloudways.com/enabling-two-factor-authentication-for-your-cloudways-account/
+
     - name: cyon
       url: https://www.cyon.ch
       img: cyon.png
@@ -56,6 +70,13 @@ websites:
       software: Yes
       doc: http://wiki.dreamhost.com/Enabling_Multifactor_Authentication
 
+    - name: Easy
+      url: https://easy.gr/
+      img: easy.png
+      tfa: Yes
+      software: Yes
+      doc: https://easy.gr/el/faq
+
     - name: Fastly
       url: https://www.fastly.com
       img: fastly.png
@@ -76,6 +97,13 @@ websites:
       tfa: No
       twitter: globat
 
+    - name: Hetzner Online
+      url: https://www.hetzner.de/
+      img: hetzner.png
+      tfa: Yes
+      software: Yes
+      hardware: Yes
+
     - name: ICUK
       url: https://icuk.net
       img: icuk.png
@@ -96,13 +124,6 @@ websites:
       img: inmotion.png
       tfa: No
 
-    - name: Hetzner Online
-      url: https://www.hetzner.de/
-      img: hetzner.png
-      tfa: Yes
-      software: Yes
-      hardware: Yes
-
     - name: iPage
       url: https://www.ipage.com/ipage/index.html
       twitter: iPage
@@ -136,12 +157,12 @@ websites:
       img: mediatemple.png
       tfa: No
 
-    - name: Netcup
-      url: https://netcup.eu/
-      img: netcup.png
-      tfa: Yes
-      software: Yes
-      doc: http://www.netcup-wiki.de/wiki/Stammdaten_CCP#Zwei-Faktor-Authentifizierung_.282FA.29
+    - name: Mittwald
+      url: https://www.mittwald.de/
+      twitter: mittwald
+      img: mittwald.png
+      tfa: No
+      lang: de
 
     - name: NearlyFreeSpeech.NET
       url: https://www.nearlyfreespeech.net/
@@ -151,6 +172,13 @@ websites:
       software: Yes
       doc: https://blog.nearlyfreespeech.net/2014/02/28/price-cuts-more-security-and-recovery-options/
 
+    - name: Netcup
+      url: https://netcup.eu/
+      img: netcup.png
+      tfa: Yes
+      software: Yes
+      doc: http://www.netcup-wiki.de/wiki/Stammdaten_CCP#Zwei-Faktor-Authentifizierung_.282FA.29
+
     - name: One.com
       url: https://www.one.com/
       twitter: onecom
@@ -195,6 +223,7 @@ websites:
     - name: Scaleway
       url: https://www.scaleway.com/
       twitter: scaleway
+      facebook: scaleway
       img: scaleway.png
       tfa: No
 
@@ -232,6 +261,16 @@ websites:
       software: Yes
       hardware: Yes
 
+    - name: Ukraine
+      url: https://www.ukraine.com.ua/
+      img: ukraine.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      software: Yes
+      hardware: Yes
+      doc: https://www.ukraine.com.ua/faq/rekomendatsii-po-zashchite-ot-vzloma-uchetnoj-zapisi.html
+
     - name: Vultr
       url: https://www.vultr.com/
       img: vultr.png
@@ -247,26 +286,16 @@ websites:
       software: Yes
       doc: https://docs.webfaction.com/user-guide/control_panel.html#two-step-login
 
+    - name: Weebly
+      url: https://www.weebly.com
+      img: weebly.png
+      tfa: No
+      twitter: weebly
+      facebook: weebly
+
     - name: WP Engine
       url: https://wpengine.com/
       img: wpengine.png
       tfa: Yes
       software: Yes
       doc: https://wpengine.com/support/2-factor-authentication/
-
-    - name: Ukraine
-      url: https://www.ukraine.com.ua/
-      img: ukraine.png
-      tfa: Yes
-      sms: Yes
-      phone: Yes
-      software: Yes
-      hardware: Yes
-      doc: https://www.ukraine.com.ua/faq/rekomendatsii-po-zashchite-ot-vzloma-uchetnoj-zapisi.html
-
-    - name: Easy
-      url: https://easy.gr/
-      img: easy.png
-      tfa: Yes
-      software: Yes
-      doc: https://easy.gr/el/faq
diff --git a/data/applications/data/identity.yml b/data/applications/data/identity.yml
index 6d039f8..e71da28 100644
--- a/data/applications/data/identity.yml
+++ b/data/applications/data/identity.yml
@@ -1,4 +1,12 @@
 websites:
+    - name: 1Password
+      url: https://1password.com/
+      img: 1password.png
+      tfa: No
+      email_address: support@1password.com
+      facebook: 1Password
+      twitter: 1Password
+
     - name: Bitium
       url: https://www.bitium.com
       img: bitium.png
@@ -47,6 +55,14 @@ websites:
       tfa: No
       twitter: DocuSign
 
+    - name: ID.me
+      url: https://www.id.me/
+      img: idme.png
+      tfa: No
+      twitter: IDme
+      facebook: IDmeInc
+      email_address: help@id.me
+
     - name: Keeper
       url: https://keepersecurity.com/
       img: keeper.png
@@ -103,12 +119,6 @@ websites:
       software: Yes
       doc: http://www.onelogin.com/product/strong-authentication/two-factor-authentication/
 
-    - name: Persowna
-      url: https://persowna.net
-      img: persowna.png
-      tfa: Yes
-      software: Yes
-
     - name: Passpack
       url: https://www.passpack.com/
       img: passpack.png
@@ -117,6 +127,12 @@ websites:
       hardware: Yes
       doc: https://help.passpack.com/knowledgebase/idx.php/44/0/
 
+    - name: Persowna
+      url: https://persowna.net
+      img: persowna.png
+      tfa: Yes
+      software: Yes
+
     - name: RoboForm
       url: https://www.roboform.com/
       img: roboform.png
@@ -140,3 +156,13 @@ websites:
       exceptions:
           text: "2FA is only available on paid plans."
       doc: http://www.securesafe.com/en/faq/security.html
+
+    - name: True Key
+      url: https://www.truekey.com
+      img: truekey.png
+      tfa: Yes
+      sms: Yes
+      email: Yes
+      software: Yes
+      hardware: Yes
+      doc: https://help.truekey.com/hc/en-us/articles/218580447-How-can-I-add-additional-factors-
diff --git a/data/applications/data/investing.yml b/data/applications/data/investing.yml
index c6d5dd9..015ecd8 100644
--- a/data/applications/data/investing.yml
+++ b/data/applications/data/investing.yml
@@ -15,7 +15,9 @@ websites:
       url: https://www.schwab.com/
       img: charlesschwab.png
       tfa: Yes
+      software: Yes
       hardware: Yes
+      doc: /notes/schwab/
 
     - name: COL Financial
       url: https://www.colfinancial.com
@@ -107,6 +109,12 @@ websites:
       phone: Yes
       doc: https://www.personalcapital.com/safety-and-security
 
+    - name: Raizers
+      url: https://www.raizers.com
+      img: raizers.png
+      tfa: No
+      twitter: Raizers
+
     - name: RBC Direct Investing
       url: http://www.rbcdirectinvesting.com
       twitter: RBC
@@ -116,8 +124,9 @@ websites:
     - name: Robinhood
       url: https://www.robinhood.com/
       img: robinhood.png
-      tfa: No
-      twitter: RobinhoodApp
+      tfa: Yes
+      sms: Yes
+      doc: https://support.robinhood.com/hc/en-us/articles/211546986-Two-Factor-Authentication
 
     - name: Scottrade
       url: https://www.scottrade.com/
@@ -149,24 +158,26 @@ websites:
       img: tdameritrade.png
       tfa: No
 
-    - name: TradeKing
-      url: https://www.tradeking.com
-      twitter: tradeking
-      img: tradeking.png
-      tfa: No
-
     - name: TIAA-CREF
       url: https://www.tiaa-cref.org
       twitter: TC_Talks
       img: tiaacref.png
       tfa: no
 
+    - name: TradeKing
+      url: https://www.tradeking.com
+      twitter: tradeking
+      img: tradeking.png
+      tfa: No
+
     - name: Vanguard
       url: https://www.vanguard.com/
       img: vanguard.png
       tfa: Yes
       sms: Yes
       doc: https://personal.vanguard.com/us/insights/article/Account-security-092015
+      exceptions:
+          text: "TFA is only available for Personal Investor accounts"
 
     - name: Wealthfront
       url: https://www.wealthfront.com/
diff --git a/data/applications/data/other.yml b/data/applications/data/other.yml
index 1377fd8..dcf9e0a 100644
--- a/data/applications/data/other.yml
+++ b/data/applications/data/other.yml
@@ -23,12 +23,42 @@ websites:
       tfa: No
       twitter: airbnb
 
+    - name: AngelList
+      url: https://angel.co
+      img: angellist.png
+      tfa: Yes
+      sms: Yes
+      software: Yes
+
+    - name: Any.do
+      url: https://web.any.do/
+      img: anydo.png
+      tfa: No
+      twitter: AnyDO
+      facebook: Any.do
+
     - name: Asana
       url: https://www.asana.com
       img: asana.png
       tfa: No
       twitter: asana
 
+    - name: Australia Post
+      url: https://auspost.com.au/
+      img: auspost.png
+      tfa: No
+      twitter: auspost
+
+    - name: Autodesk
+      url: http://www.autodesk.com
+      img: autodesk.png
+      tfa: Yes
+      sms: Yes
+      email: Yes
+      phone: Yes
+      software: Yes
+      doc: https://knowledge.autodesk.com/search-result/caas/sfdcarticles/sfdcarticles/Autodesk-Two-Factor-Authentication-FAQ.html
+
     - name: Automater
       url: https://automater.pl/en/
       img: automater.png
@@ -42,7 +72,7 @@ websites:
       tfa: No
       twitter: Azendoo
 
-    - name: Bugzilla@Mozilla		
+    - name: Bugzilla@Mozilla
       url: https://bugzilla.mozilla.org
       img: bugzilla.png
       tfa: Yes
@@ -55,6 +85,13 @@ websites:
       software: Yes
       doc: https://kb.builtwith.com/account-management/how-to-enable-2fa-on-builtwith/
 
+    - name: CA Technologies
+      url: http://www.ca.com/
+      img: ca-technologies.png
+      tfa: No
+      twitter: CAinc
+      facebook: CATechnologies
+
     - name: Cisco Meraki
       url: https://meraki.cisco.com/
       img: meraki.png
@@ -76,6 +113,12 @@ websites:
       tfa: Yes
       software: Yes
 
+    - name: CommuterBenefits
+      url: http://commuterbenefits.com/
+      img: commuterbenefits.png
+      tfa: No
+      twitter: CommuterBenefit
+
     - name: Cosmolex
       url: https://www.cosmolex.com/
       img: cosmolex.png
@@ -83,11 +126,13 @@ websites:
       sms: Yes
       doc: http://support.cosmolex.com/customer/portal/articles/2158628
 
-    - name: Delighted
-      url: https://delightedapp.com/
-      img: delighted.png
-      tfa: Yes
-      sms: Yes
+    - name: Crowd Supply
+      url: https://www.crowdsupply.com
+      img: crowdsupply.png
+      tfa: No
+      twitter: crowd_supply
+      facebook: CrowdSupply
+      email_address: support@crowdsupply.com
 
     - name: Delicious
       url: http://del.icio.us/
@@ -95,6 +140,12 @@ websites:
       twitter: Delicious
       tfa: No
 
+    - name: Delighted
+      url: https://delightedapp.com/
+      img: delighted.png
+      tfa: Yes
+      sms: Yes
+
     - name: DirectAdmin
       url: https://www.directadmin.com
       img: directadmin.png
@@ -108,6 +159,12 @@ websites:
       twitter: doordash
       tfa: No
 
+    - name: Dreamstime
+      url: https://www.dreamstime.com/
+      img: dreamstime.png
+      twitter: Dreamstime
+      tfa: No
+
     - name: Envato
       url: http://envato.com
       img: envato.png
@@ -142,6 +199,13 @@ websites:
       img: hmrc.png
       tfa: No
 
+    - name: IEEE
+      url: https://www.ieee.org
+      img: ieee.png
+      tfa: No
+      twitter: IEEEorg
+      facebook: IEEE.org
+
     - name: IFTTT
       url: https://ifttt.com
       img: ifttt.png
@@ -153,8 +217,9 @@ websites:
     - name: Kayako
       url: https://www.kayako.com
       img: kayako.png
-      twitter: kayako
-      tfa: No
+      tfa: Yes
+      software: Yes
+      doc: https://support.kayako.com/article/1198-securing-your-user-account-with-two-factor-authentication-2fa
 
     - name: Kickstarter
       url: https://www.kickstarter.com
@@ -183,6 +248,13 @@ websites:
       sms: Yes
       software: Yes
 
+    - name: Monster
+      url: https://www.monster.com
+      img: monster.png
+      tfa: No
+      twitter: Monster
+      facebook: monster
+
     - name: Nest
       url: https://nest.com
       twitter: nestsupport
@@ -205,6 +277,14 @@ websites:
       software: Yes
       doc: https://cad.onshape.com/help/Content/twofactorauthentication.htm
 
+    - name: Pastebin
+      url: http://pastebin.com
+      img: pastebin.png
+      tfa: No
+      twitter: pastebin
+      facebook: pastebin
+      email_address: admin@pastebin.com
+
     - name: Patreon
       url: https://www.patreon.com/
       img: patreon.png
@@ -225,6 +305,13 @@ websites:
       img: pinboard.png
       tfa: No
 
+    - name: Planning Center Online
+      url: https://planning.center/
+      twitter: planningcenter
+      facebook: PlanningCenter
+      img: planningcenter.png
+      tfa: No
+
     - name: Pocket
       url: https://www.getpocket.com
       twitter: Pocket
@@ -243,13 +330,22 @@ websites:
       tfa: No
       twitter: Promoter_io
 
-    - name: Skatteverket
-      url: https://www.skatteverket.se
-      img: skatteverket.png
+    - name: Repairshopr
+      url: https://www.repairshopr.com/
+      img: repairshopr.png
       tfa: Yes
-      hardware: Yes
+      doc: https://feedback.repairshopr.com/knowledgebase/articles/928266-two-factor-authentication-google-authenticator
+      sms: Yes
       software: Yes
-      doc: https://www.skatteverket.se/privat/sjalvservice/allaetjanster/omelegitimation.4.18e1b10334ebe8bc80004811.html
+      exceptions:
+          text: "SMS only available as a backup to Google Authenticator."
+
+    - name: Solar.web
+      url: https://www.solarweb.com
+      img: solarweb.png
+      tfa: No
+      twitter: FroniusUSASolar
+      facebook: FroniusUSASolarEnergy
 
     - name: StartJOIN
       url: https://www.startjoin.com/
@@ -263,6 +359,13 @@ websites:
       img: todoist.png
       tfa: No
 
+    - name: Toodledo
+      url: https://www.toodledo.com
+      img: toodledo.png
+      tfa: Yes
+      software: Yes
+      doc: https://www.toodledo.com/info/help.php#168
+
     - name: Total Connect Comfort
       url: https://www.mytotalconnectcomfort.com
       twitter: Honeywell_Home
@@ -276,6 +379,13 @@ websites:
       sms: Yes
       doc: http://help.trello.com/article/993-enabling-two-factor-authentication-for-your-trello-account
 
+    - name: Upwork
+      url: https://www.upwork.com
+      img: upwork.png
+      tfa: No
+      twitter: UpworkHelp
+      facebook: upwork
+
     - name: Usabilla
       url: https://www.usabilla.com
       img: usabilla.png
@@ -283,18 +393,22 @@ websites:
       software: Yes
       doc: http://support.usabilla.com/customer/portal/articles/2098444-2-step-authentication
 
-    - name: US Internal Revenue Service
-      url: http://www.irs.gov/Individuals/Get-Transcript
-      twitter: IRSnews
-      img: irs.png
+    - name: WageWorks
+      url: https://www.wageworks.com
+      img: wageworks.png
       tfa: No
+      twitter: WageWorksCares
 
-    - name: US Social Security Administration
-      url: https://www.ssa.gov
-      img: usssa.png
+    - name: Watchman Monitoring
+      url: https://www.watchmanmonitoring.com
+      img: watchmanmonitoring.png
       tfa: Yes
+      hardware: Yes
       sms: Yes
-      doc: https://secure.ssa.gov/RIL/HpsView.do#question3
+      software: Yes
+      doc: https://www.watchmanmonitoring.com/two-factor-authentication
+      exceptions:
+          text: 'Two factor authentication unavailable for "End User" access, which is read-only.'
 
     - name: Webmin
       url: http://www.webmin.com/
diff --git a/data/applications/data/payments.yml b/data/applications/data/payments.yml
index 70241b9..d52ffe5 100644
--- a/data/applications/data/payments.yml
+++ b/data/applications/data/payments.yml
@@ -94,8 +94,9 @@ websites:
     - name: Paysafecard
       url: https://www.paysafecard.com/
       img: paysafecard.png
-      tfa: No
-      twitter: paysafecard
+      tfa: Yes
+      software: Yes
+      doc: https://www.paysafecard.com/en-au/lp-products/2-step-login/
 
     - name: Privacy
       url: https://privacy.com/
@@ -111,14 +112,6 @@ websites:
       hardware: Yes
       doc: https://help.skrill.com/pkb_sc_article_FAQ?id=kA0D0000000Ci3x&l=en_GB
 
-    - name: Stripe
-      img: stripe.png
-      url: https://www.stripe.com/
-      tfa: Yes
-      sms: Yes
-      software: Yes
-      doc: https://support.stripe.com/questions/how-do-i-enable-two-step-verification
-
     - name: Square
       url: https://squareup.com
       img: squareup.png
@@ -134,6 +127,14 @@ websites:
       tfa: No
       twitter: SquareCash
 
+    - name: Stripe
+      img: stripe.png
+      url: https://www.stripe.com/
+      tfa: Yes
+      sms: Yes
+      software: Yes
+      doc: https://support.stripe.com/questions/how-do-i-enable-two-step-verification
+
     - name: Venmo
       url: https://venmo.com
       img: venmo.png
@@ -141,6 +142,12 @@ websites:
       sms: Yes
       doc: https://help.venmo.com/hc/en-us/articles/217532397--Confirm-my-identity-on-sign-in-Why
 
+    - name: Visa Checkout
+      url: https://secure.checkout.visa.com/
+      img: visa-checkout.png
+      tfa: No
+      twitter: VisaCheckout
+
     - name: Yandex.Money
       url: https://money.yandex.ru
       img: yandexmoney.png
diff --git a/data/applications/data/remote.yml b/data/applications/data/remote.yml
index 3fd1a4c..dd55ae9 100644
--- a/data/applications/data/remote.yml
+++ b/data/applications/data/remote.yml
@@ -32,6 +32,16 @@ websites:
       software: Yes
       doc: https://www.syspectr.com/en/faq/how-do-i-activate-deactivate-two-factor-authentication-for-my-account
 
+    - name: ScreenConnect
+      url: https://www.screenconnect.com
+      img: screenconnect.png
+      tfa: Yes
+      sms: Yes
+      email: Yes
+      software: Yes
+      hardware: Yes
+      doc: https://help.screenconnect.com/Enabling_two-factor_authentication
+
     - name: TeamViewer
       url: https://www.teamviewer.com
       img: teamviewer.png
diff --git a/data/applications/data/retail.yml b/data/applications/data/retail.yml
index 013f47a..4771189 100644
--- a/data/applications/data/retail.yml
+++ b/data/applications/data/retail.yml
@@ -1,4 +1,18 @@
 websites:
+    - name: Adafruit
+      url: https://www.adafruit.com
+      img: adafruit.png
+      tfa: No
+      twitter: adafruit
+      facebook: adafruitindustries
+
+    - name: AdoramaPix
+      url: http://www.adoramapix.com
+      img: adoramapix.png
+      tfa: No
+      twitter: AdoramaPix
+      facebook: AdoramaPix
+
     - name: Amazon
       url: https://www.amazon.com
       img: amazon.png
@@ -19,12 +33,49 @@ websites:
           text: "See http://support.apple.com/kb/HT5593 for a list of supported SMS carriers."
       doc: http://support.apple.com/kb/ht5570
 
+    - name: Big W
+      url: https://www.bigw.com.au/
+      img: bigw.png
+      tfa: No
+      facebook: BIGWaustralia
+
+    - name: Combatant Gentlemen
+      url: https://combatgent.com
+      img: combatgent.png
+      tfa: No
+      twitter: CombatGent
+      facebook: combatgent
+
     - name: Comixology
       url: https://www.comixology.com/
       img: comixology.png
       tfa: No
       twitter: comixology
 
+    - name: Costco
+      url: https://www.costco.com
+      img: costco.png
+      tfa: No
+      facebook: Costco
+
+    - name: Dell
+      url: http://www.dell.com
+      img: dell.png
+      tfa: No
+      twitter: DellCares
+
+    - name: Digital World International
+      url: http://www.dwidigitalcameras.com.au/
+      img: dwi.png
+      tfa: No
+      facebook: DWIAUS
+
+    - name: EB Games Australia
+      url: https://ebgames.com.au/
+      img: ebgamesaustralia.png
+      tfa: No
+      twitter: EBGamesAus
+
     - name: eBay
       url: http://ebay.com
       img: ebay.png
@@ -35,12 +86,6 @@ websites:
           text: "eBay only supports 2FA in some countries."
       doc: http://pages.ebay.com/securitykey/faq.html
 
-    - name: EB Games Australia
-      url: https://ebgames.com.au/
-      img: ebgamesaustralia.png
-      tfa: No
-      twitter: EBGamesAus
-
     - name: Etsy
       url: http://www.etsy.com/
       img: etsy.png
@@ -54,6 +99,19 @@ websites:
       img: everlane.png
       tfa: No
 
+    - name: FastTech
+      url: https://www.fasttech.com
+      img: fasttech.png
+      tfa: No
+      facebook: fasttech.net
+
+    - name: Flipkart
+      url: https://www.flipkart.com
+      img: flipkart.png
+      tfa: No
+      twitter: flipkartsupport
+      facebook: flipkart
+
     - name: Gilt
       url: https://www.gilt.com
       twitter: gilt
@@ -66,24 +124,64 @@ websites:
       img: groupon.png
       tfa: No
 
+    - name: Home Depot
+      url: http://www.homedepot.com
+      img: homedepot.png
+      tfa: No
+      twitter: HomeDepot
+      facebook: homedepot
+
     - name: Hudson's Bay
       url: http://www.thebay.com
       img: bay.png
       twitter: hudsonsbay
       tfa: No
 
+    - name: Hypop
+      url: https://www.hypop.com.au/
+      img: hypop.png
+      twitter: hypop
+      tfa: No
+
+    - name: IKEA
+      url: http://www.ikea.com
+      img: ikea.png
+      tfa: No
+      twitter: IKEAUSA
+      facebook: IKEAUSA
+
+    - name: JB Hi-Fi
+      url: https://www.jbhifi.com.au/
+      twitter: JBHiFi
+      img: jbhifi.png
+      tfa: No
+
     - name: Jet
       url: https://jet.com
       twitter: JetHeads
       img: jet.png
       tfa: No
 
+    - name: Kohl's
+      url: http://www.kohls.com
+      img: kohls.png
+      tfa: No
+      twitter: Kohls
+      facebook: kohls
+
     - name: Lazada
       url: http://www.lazada.com/
       twitter: asklazadasg
       img: lazada.png
       tfa: No
 
+    - name: Lowes
+      url: https://www.lowes.com
+      img: lowes.png
+      tfa: No
+      twitter: Lowes
+      facebook: lowes
+
     - name: Macy's
       url: http://www.macys.com/
       twitter: macys
@@ -96,18 +194,67 @@ websites:
       img: massdrop.png
       tfa: No
 
+    - name: Mercado Libre
+      url: https://www.mercadolibre.com
+      img: mercado-libre.png
+      tfa: Yes
+      software: Yes
+      sms: Yes
+      doc: https://ayuda.mercadolibre.com.ar/ayuda/Consejos-para-fortalecer-la-se_961
+
     - name: Newegg
       url: http://www.newegg.com
       twitter: newegg
       img: newegg.png
       tfa: No
 
+    - name: Nordstrom
+      url: http://shop.nordstrom.com
+      img: nordstrom.png
+      tfa: No
+      twitter: Nordstrom
+      facebook: Nordstrom
+
+    - name: Northern Tool + Equipment
+      url: http://www.northerntool.com/
+      img: northerntool.png
+      tfa: No
+      twitter: NorthernTool
+      facebook: northerntool
+
+    - name: Overstock
+      url: https://www.overstock.com
+      img: overstock.png
+      tfa: No
+      twitter: Overstock
+      facebook: overstock
+      email_address: international@overstock.com
+
+    - name: PC Case Gear
+      url: https://www.pccasegear.com/
+      twitter: pccasegear
+      img: pccasegear.png
+      tfa: No
+
     - name: Rakuten
       url: http://www.rakuten.com/
       twitter: AskRakutenUS
       img: rakuten.png
       tfa: No
 
+    - name: Samsung
+      url: http://www.samsung.com/
+      twitter: SamsungMobile
+      img: samsung.png
+      tfa: No
+
+    - name: Sierra Trading Post
+      url: http://www.sierratradingpost.com
+      img: sierratradingpost.png
+      tfa: No
+      twitter: Sierratp
+      facebook: sierratradingpost
+
     - name: Stack Social
       url: https://stacksocial.com
       twitter: StackSocial
@@ -127,7 +274,7 @@ websites:
       tfa: No
 
     - name: Walmart
-      url: http://www.walmart.com/
+      url: https://www.walmart.com/
       twitter: walmartlabs
       img: walmart.png
       tfa: No
@@ -138,8 +285,23 @@ websites:
       img: warbyparker.png
       tfa: No
 
+    - name: Wayfair
+      url: http://www.wayfair.com
+      img: wayfair.png
+      tfa: No
+      twitter: Wayfair
+      facebook: wayfair
+
     - name: Zappos
       url: http://www.zappos.com/
       twitter: Zappos
       img: zappos.png
       tfa: No
+
+    - name: Zazzle
+      url: http://www.zazzle.com
+      img: zazzle.png
+      tfa: No
+      twitter: zazzle
+      facebook: zazzle
+
diff --git a/data/applications/data/security.yml b/data/applications/data/security.yml
index ad6c92e..d4f71c1 100644
--- a/data/applications/data/security.yml
+++ b/data/applications/data/security.yml
@@ -39,6 +39,14 @@ websites:
       twitter: cyberghost_EN
       tfa: No
 
+    - name: Detectify
+      url: https://detectify.com/
+      img: detectify.png
+      twitter: detectify
+      facebook: detectify
+      email_address: hello@detectify.com
+      tfa: No
+
     - name: DigiCert
       url: https://www.digicert.com/
       img: digicert.png
@@ -116,6 +124,13 @@ websites:
       software: Yes
       doc: http://www.ssltrust.com.au/enable-two-factor-authentication.html
 
+    - name: ThreatConnect
+      url: https://threatconnect.com/
+      img: threatconnect.png
+      tfa: Yes
+      software: Yes
+      doc: http://kb.threatconnect.com/customer/en/portal/articles/2214975-configuring-user-settings-and-two-factor-authentication
+
     - name: ThreatMetrix
       url: https://www.threatmetrix.com/
       img: threatmetrix.png
@@ -136,6 +151,19 @@ websites:
       software: Yes
       doc: http://support.tinfoilsecurity.com/customer/portal/articles/1559364-do-you-support-two-factor-authentication-how-do-i-set-it-up-
 
+    - name: TorGuard
+      url: https://torguard.net
+      img: torguard.png
+      tfa: Yes
+      software: Yes
+
+    - name: TunnelBear
+      url: https://tunnelbear.com/
+      img: tunnelbear.png
+      tfa: No
+      twitter: theTunnelBear
+      facebook: tunnelbear
+
     - name: VPN Unlimited
       url: https://vpnunlimitedapp.com/
       img: vpnunlimited.png
diff --git a/data/applications/data/social.yml b/data/applications/data/social.yml
index 1d1420a..8f12cbc 100644
--- a/data/applications/data/social.yml
+++ b/data/applications/data/social.yml
@@ -12,6 +12,12 @@ websites:
       software: Yes
       doc: https://mml.desk.com/customer/portal/articles/1039728-how-do-i-set-up-two-factor-authentication-
 
+    - name: Badoo
+      url: https://badoo.com
+      img: badoo.png
+      tfa: No
+      twitter: Badoo
+
     - name: Bitly
       url: https://bitly.com/
       img: bitly.png
@@ -80,10 +86,11 @@ websites:
       software: Yes
       doc: https://help.hootsuite.com/entries/22527304-Managing-Google-Authenticator
 
-    - name: Instagram
-      url: https://www.instagram.com
-      twitter: instagram
-      img: instagram.png
+    - name: ICQ
+      url: https://icq.com/
+      twitter: ICQ
+      facebook: ICQ
+      img: icq.png
       tfa: No
 
     - name: Imgur
@@ -92,6 +99,12 @@ websites:
       img: imgur.png
       tfa: No
 
+    - name: Instagram
+      url: https://www.instagram.com
+      twitter: instagram
+      img: instagram.png
+      tfa: No
+
     - name: LinkedIn
       url: https://linkedin.com
       img: linkedin.png
@@ -119,6 +132,14 @@ websites:
       img: meetup.png
       tfa: No
 
+    - name: Newgrounds
+      url: https://www.newgrounds.com/
+      twitter: Newgrounds
+      email_address: support@newgrounds.com
+      facebook: newgrounds
+      img: newgrounds.png
+      tfa: No
+
     - name: Nextdoor
       url: https://nextdoor.com
       twitter: Nextdoor
diff --git a/data/applications/data/transport.yml b/data/applications/data/transport.yml
index f0d8198..bbcc95b 100644
--- a/data/applications/data/transport.yml
+++ b/data/applications/data/transport.yml
@@ -1,26 +1,26 @@
 websites:
-    - name: American Airlines
-      url: https://www.aa.com/
-      twitter: AmericanAir
-      img: aa.png
-      tfa: No
-
     - name: Air Canada
       url: https://www.aircanada.com/
       twitter: AirCanada
       img: aircanada.png
       tfa: No
 
+    - name: Air France
+      url: http://www.airfrance.com
+      twitter: airfrance
+      img: airfrance.png
+      tfa: No
+
     - name: Alaska Airlines
       url: https://www.alaskaair.com
       twitter: AlaskaAir
       img: alaska.png
       tfa: No
 
-    - name: Air France
-      url: http://www.airfrance.com
-      twitter: airfrance
-      img: airfrance.png
+    - name: American Airlines
+      url: https://www.aa.com/
+      twitter: AmericanAir
+      img: aa.png
       tfa: No
 
     - name: Amtrak
@@ -65,36 +65,36 @@ websites:
       img: easyjet.png
       tfa: No
 
-    - name: Greyhound
-      url: https://www.greyhound.com
-      twitter: GHoundBusHelp
-      img: greyhound.png
-      tfa: No
-
     - name: Frontier
       url: https://www.flyfrontier.com
       twitter: FrontierCare
       img: frontier.png
       tfa: No
 
+    - name: Greyhound
+      url: https://www.greyhound.com
+      twitter: GHoundBusHelp
+      img: greyhound.png
+      tfa: No
+
     - name: Hailo
       url: https://www.hailoapp.com/
       twitter: Hailo
       img: hailo.png
       tfa: No
 
-    - name: JetBlue
-      url: https://www.jetblue.com
-      twitter: JetBlue
-      img: jetblue.png
-      tfa: No
-
     - name: Hawaiian Airlines
       url: https://www.hawaiianairlines.com
       twitter: HawaiianAir
       img: hawaiian.png
       tfa: No
 
+    - name: JetBlue
+      url: https://www.jetblue.com
+      twitter: JetBlue
+      img: jetblue.png
+      tfa: No
+
     - name: JetSmarter
       url: https://jetsmarter.com/
       twitter: JetSmarter
@@ -125,18 +125,18 @@ websites:
       twitter: nsb_no
       tfa: No
 
+    - name: OV-chipkaart
+      url: https://www.ov-chipkaart.nl/
+      twitter: OVchipkaart
+      img: ov-chipkaart.png
+      tfa: No
+
     - name: Ryanair
       url: https://www.ryanair.com
       twitter: Ryanair
       img: ryanair.png
       tfa: No
 
-    - name: Transport for London
-      url: https://tfl.gov.uk/
-      twitter: tflwaystopay
-      img: tfl.png
-      tfa: No
-
     - name: SAS
       url: https://www.flysas.com/
       twitter: SAS
@@ -155,6 +155,12 @@ websites:
       img: sl.png
       tfa: No
 
+    - name: SmarTrip
+      img: wmata.png
+      url: https://smartrip.wmata.com
+      tfa: no
+      twitter: wmata
+
     - name: Southwest
       url: https://www.southwest.com/
       twitter: SouthwestAir
@@ -167,6 +173,12 @@ websites:
       img: spirit.png
       tfa: No
 
+    - name: Transport for London
+      url: https://tfl.gov.uk/
+      twitter: tflwaystopay
+      img: tfl.png
+      tfa: No
+
     - name: Uber
       url: https://www.uber.com/
       twitter: uber_support
diff --git a/data/applications/data/utilities.yml b/data/applications/data/utilities.yml
index e15e166..16b4b28 100644
--- a/data/applications/data/utilities.yml
+++ b/data/applications/data/utilities.yml
@@ -1,15 +1,17 @@
 websites:
     - name: American Electric Power
-      url: https://www.aep.com
+      url: https://www.aep.com/
       twitter: AEPnews
+      facebook: americanelectricpower
       img: aep.png
       tfa: No
 
     - name: AT&T
       url: https://www.att.com/
+      twitter: ATTCares
+      facebook: ATT
       img: att.png
       tfa: No
-      twitter: ATTCustomerCare
 
     - name: CallCentric
       url: https://www.callcentric.com/
@@ -20,138 +22,183 @@ websites:
 
     - name: CenturyLink
       url: https://www.centurylink.com/
+      twitter: CenturyLink
+      facebook: CenturyLink
       img: centurylink.png
       tfa: No
-      twitter: CenturyLink
 
-    - name: Charter Communications
-      url: http://www.charter.net/
+    - name: Charter Spectrum
+      url: https://www.spectrum.com/
+      twitter: GetSpectrum
+      facebook: Spectrum
       img: charter.png
       tfa: No
-      twitter: CharterCom
 
     - name: Comcast
-      url: https://www.comcast.com/
+      url: https://www.xfinity.com/
+      twitter: ComcastCares
+      facebook: xfinity
       img: comcast.png
       tfa: No
-      twitter: ComcastCares
 
     - name: Con Edison
-      url: https://www.coned.com
-      img: coned.png
+      url: https://www.coned.com/
       twitter: ConEdison
+      facebook: ConEdison
+      img: coned.png
       tfa: No
 
     - name: Cox
-      url: http://www.cox.com/
+      url: https://www.cox.com/
+      twitter: CoxHelp
+      facebook: coxcommunications
       img: cox.png
       tfa: No
-      twitter: CoxHelp
 
     - name: DIRECTV
       url: http://www.directv.com/
+      twitter: DIRECTVService
+      facebook: directv
       img: directv.png
       tfa: No
-      twitter: DIRECTVService
 
     - name: DISH Network
-      url: http://www.dish.com/
+      url: https://www.dish.com/
+      twitter: dish_answers
+      facebook: DISH
       img: dish.png
       tfa: No
-      twitter: DISH_Answers
 
     - name: Dominion
-      url: https://www.dom.com
-      img: dom.png
-      twitter: DOMVAPower
+      url: https://www.dom.com/
+      twitter: DomVAPower
+      facebook: dominionvirginiapower
+      img: dominion.png
       tfa: No
 
     - name: DTE Energy
-      url: https://www.dteenergy.com
-      img: dte.png
+      url: https://www.dteenergy.com/
       twitter: DTE_Energy
+      facebook: dteenergy
+      img: dteenergy.png
       tfa: No
 
     - name: Duke Energy
-      url: https://www.duke-energy.com
-      img: duke.png
+      url: https://www.duke-energy.com/
       twitter: DukeEnergy
+      facebook: duke.energy
+      img: duke.png
       tfa: No
 
     - name: EE
-      url: http://www.ee.co.uk/
+      url: https://ee.co.uk/
+      twitter: EE
+      facebook: ee
       img: ee.png
       tfa: No
-      twitter: EE
 
-    - name: Frontier
-      url: https://frontier.com
-      img: frontier.png
-      tfa: No
-      twitter: AskFrontier
-      tfa: No
-
-    - name: Georgia Power
-      url: https://www.georgiapower.com
-      img: georgiapower.png
-      twitter: GeorgiaPower
+    - name: Eversource
+      url: https://www.eversource.com/
+      twitter: EversourceCorp
+      facebook: EversourceEnergy
+      img: eversource.png
       tfa: No
 
     - name: Florida Power and Light
-      url: https://www.fpl.com
-      img: fpl.png
+      url: https://www.fpl.com/
       twitter: insideFPL
+      facebook: fplconnect
+      img: fpl.png
+      tfa: No
+
+    - name: Frontier
+      url: https://frontier.com/
+      twitter: AskFrontier
+      facebook: FrontierCorp
+      img: frontier.png
+      tfa: No
+
+    - name: Georgia Power
+      url: https://www.georgiapower.com/
+      twitter: GeorgiaPower
+      facebook: GeorgiaPower
+      img: georgiapower.png
       tfa: No
 
     - name: Google Fiber
-      url: https://fiber.google.com
+      url: https://fiber.google.com/
       img: googlefiber.png
       tfa: Yes
       sms: Yes
       phone: Yes
       software: Yes
       hardware: Yes
-      doc: http://www.google.com/intl/en-US/landing/2step/features.html
+      doc: https://www.google.com/intl/en-US/landing/2step/features.html
 
     - name: Halebop
-      url: https://www.halebop.se
-      img: halebop.png
+      url: https://www.halebop.se/
       twitter: halebop_sverige
+      facebook: halebop
+      img: halebop.png
+      tfa: No
+      lang: sv
+
+    - name: Optus
+      url: http://www.optus.com.au/
+      twitter: Optus
+      facebook: optus
+      img: optus.png
       tfa: No
 
     - name: Pacific Gas and Electric Company PG&E
       url: https://www.pge.com/
+      twitter: PGE4Me
+      facebook: pacificgasandelectric
       img: pge.png
       tfa: No
-      twitter: pge4me
 
     - name: PowerStream
-      url: https://www.powerstream.ca
-      img: powerstream.png
+      url: https://www.powerstream.ca/
       twitter: PowerStreamNews
+      facebook: PowerStreamPage
+      img: powerstream.png
       tfa: No
 
-    - name: Optus
-      url: http://www.optus.com.au/
-      img: optus.png
-      tfa: No
-      twitter: Optus
+    - name: Project Fi
+      url: https://fi.google.com/
+      img: projectfi.png
+      tfa: Yes
+      sms: Yes
+      phone: Yes
+      hardware: Yes
+      software: Yes
+      doc: https://www.google.com/intl/en-US/landing/2step/features.html
 
     - name: RCN
       url: https://www.rcn.com/
+      twitter: RCNconnects
+      facebook: RCN
       img: rcn.png
       tfa: No
-      twitter: rcnconnects
+
+    - name: Rochester Gas & Electric
+      url: https://www.rge.com/
+      twitter: RGandE
+      facebook: RochGandE
+      img: rge.png
+      tfa: No
 
     - name: Rogers
-      url: https://www.rogers.com
+      url: https://www.rogers.com/
       twitter: RogersHelps
+      facebook: Rogers
       img: rogers.png
       tfa: No
 
     - name: San Diego Gas & Electric
-      url: https://www.sdge.com
+      url: https://www.sdge.com/
       twitter: SDGE
+      facebook: SanDiegoGasandElectric
       img: sdge.png
       tfa: No
 
@@ -165,28 +212,46 @@ websites:
       doc: https://wiki.sonic.net/wiki/2-Step_Verfication
 
     - name: Southern California Edison
-      url: https://www.sce.com
-      img: sce.png
+      url: https://www.sce.com/
       twitter: SCE
+      facebook: sce
+      img: sce.png
       tfa: No
 
     - name: Sprint
       url: https://www.sprint.com/
+      twitter: sprint
+      facebook: sprint
       img: sprint.png
       tfa: No
-      twitter: sprint
+
+    - name: T-Mobile
+      url: https://www.t-mobile.com/
+      twitter: TMobileHelp
+      facebook: TMobile
+      img: tmobile.png
+      tfa: No
+
+    - name: Telstra
+      url: https://www.telstra.com.au/
+      twitter: Telstra
+      facebook: Telstra24x7
+      img: telstra.png
+      tfa: No
 
     - name: Three UK
       url: http://www.three.co.uk/
+      twitter: ThreeUK
+      facebook: ThreeUK
       img: three.png
       tfa: No
-      twitter: ThreeUK
 
     - name: Time Warner Cable
       url: https://www.timewarnercable.com/
+      twitter: TWC_Help
+      facebook: twc
       img: timewarner.png
       tfa: No
-      twitter: TWC_Help
 
     - name: Ting
       url: https://ting.com/
@@ -196,38 +261,42 @@ websites:
       software: Yes
       doc: https://help.ting.com/hc/en-us/articles/209351258-Two-Factor-Authentication
 
-    - name: T-Mobile
-      url: https://www.t-mobile.com/
-      img: tmobile.png
-      tfa: No
-      twitter: TMobileHelp
-
     - name: Verizon
-      url: https://www.verizon.com/
+      url: http://www.verizon.com/
+      twitter: VerizonSupport
+      facebook: verizon
       img: verizon.png
       tfa: No
-      twitter: VerizonSupport
 
     - name: Verizon Wireless
       url: https://www.verizonwireless.com/
+      twitter: VZWSupport
       img: verizon.png
       tfa: No
-      twitter: VZWSupport
 
     - name: Vimla
-      url: https://www.vimla.se
+      url: https://vimla.se/
+      twitter: Vimla_se
+      facebook: vimla.se
       img: vimla.png
-      twitter: vimla_se
       tfa: No
+      lang: sv
 
     - name: Virgin Mobile
       url: https://www.virgin.com/gateways/mobile
+      twitter: Virgin
+      facebook: virgin
       img: virginmobile.png
       tfa: No
-      twitter: virgin
+
+    - name: Vodafone (UK)
+      url: https://www.vodafone.co.uk/
+      img: vodafone.png
+      tfa: Yes
+      sms: Yes
 
     - name: VoIP.ms
       url: https://voip.ms/
+      twitter: voipms
       img: voipms.png
       tfa: No
-      twitter: voipms