diff --git a/YSFGateway/YSFHosts.txt b/YSFGateway/YSFHosts.txt
index 2e30636..8b490bb 100644
--- a/YSFGateway/YSFHosts.txt
+++ b/YSFGateway/YSFHosts.txt
@@ -12,84 +12,99 @@
 # https://register.ysfreflector.de/export.php
 #
 
-# YSF001 / AU AUYSF001 / C4FM Reflector
+# YSF001 / AU AUYSF001      / AU & 1st World
 c4fm.duckdns.org 42000
 
-# YSF500 / AU FUSION2 / VK-Reflector 2
+# YSF500 / AU FUSION2       / AU Reflector2 
 aufusion2.ysfreflector.net 42000
 
-# YSF003 / BE FUSIONBE2 / FusionBelgium
-ysf.on4top.be 42000
-
 # YSF724 / BR Fusion-BRAZIL / DV Brazil
 ysf.dvbrazil.com.br 42000
 
-# YSF005 / CA ve2mrcfusion / Fusion Quebec
-ysf.ve2mrc.com 42000
+# YSF002 / CT YSF002 wCAT   / C4FM Catalunya
+c4fm.ea3hkb.com 42000
 
-# YSF262 / DE Germany / YSF262 Germany
+# YSF262 / DE Germany       / YSF262 Germany
 ysf262.ysfreflector.de 42000
 
-# YSF012 / DK YSF012 / C4FM Reflector
-oz2ree.dk 42000
+# YSF007 / ES BM-SPAIN / BM 2141
+c4fm.spain-dmr.es 42000
 
 # YSF020 / ES C4FM_CADIZ / SCSF-ED7ZAJ
 ed7zaj.ddns.net 42000
 
-# YSF002 / ES YSF002-WIRES / C4FM Catalunya
-c4fm.ea3hkb.com 42000
-
-# YSF004 / ES YSF004-EDT / C4FM Reflector
-c4fm.sustrai.org 42000
-
-# YSF906 / ES YSF906 / C4FM-EA7RKV
-xrf906.radioclubveleta.es 42000
-
-# YSF018 / FR FON-Gateway / Allmode-GW
+# YSF018 / FON-Gateway      / AllModes-GW   
 ysf-fon.f1tzo.com 42000
 
-# YSF014 / FR YSF-France / Fusion-France
-m55.evxonline.net 42000
-
-# YSF015 / GB UK_YFS_BM / UK_Reflector
-bm-dmr.uk 42000
-
-# YSF010 / IT FUSION-ITALY / Italy YSFR
+# YSF010 / FUSION-ITALY     / Italy YSFR    
 c4fm-it.selfip.com 42000
 
-# YSF222 / IT YRF003 CISAR / www.cisar.it
-xrf003.iw0red.it 42000
+# YSF003 / FUSIONBE2        / FusionBelgium 
+ysf.on4top.be 42000
 
 # YSF027 / IT YSF027 / Zone_1_Italy
 194.116.29.78 42000
 
-# YSF031 / NL Central / C4FM NL
+# YSF031 / NL Central       / C4FM NL       
 c4fm.pa7lim.nl 42000
 
-# YSF444 / NL YSF444 / Dutch Refl.
+# YSF444 / NL YSF444        / Dutch Refl.   
 ysf444.pa3dfn.nl 42000
 
-# YSF006 / NO YSF006 Norway / 24299+XLX404D
-ysf.hamlabs.no 42000
-
-# YSF260 / PL POLAND / Poland REF
+# YSF260 / PL POLAND        / PolandREF     
 78.11.185.131 42000
 
-# YSF016 / PL YSF016-SR8UWD / WLODAWA
-sr8uwd.wiresx.pl 42000
+# YSF021 / Poland 21        / DMR TG260021  
+ysf021.ham-dmr.pl 42021
+
+# YSF022 / Poland 22        / DMR TG260022  
+ysf022.ham-dmr.pl 42022
 
-# YSF009 / PT-FUSION-PRT--- / Fusion-Portuga
+# YSF009 / PT YSF009        / C4FM-Portugal 
 c4fm.from-ct.com 42000
 
+# YSF023 / SP EmCom         / EmCom TG260023
+ysf023.ham-dmr.pl 42023
+
+# YSF024 / TechTalk24       / Engineers talk
+ysf024.ham-dmr.pl 42024
+
+# YSF015 / UK_YFS_BM        / UK_Reflector  
+bm-dmr.uk 42000
+
 # YSF011 / US Michigan-MI5 / Michigan MI5
 c4fm-mi5.kb8zgl.net 42000
 
-# YSF008 / US YSF008 USA / DVSwitch test
+# YSF008 / US YSF008 USA    / DVSwitch Test 
 ysfreflector.dvswitch.org 42000
 
-# YSF017 / VE FUSION-SPAIN / fusion-spain
+# YSF005 / ve2mrcfusion     / Fusion Quebec 
+ysf.ve2mrc.com 42000
+
+# YSF222 / YRF003 CISAR-IT  / www.cisar.it  
+xrf003.iw0red.it 42000
+
+# YSF014 / YSF-France       / Fusion-France 
+m55.evxonline.net 42000
+
+# YSF004 / YSF004-EDT       / C4FM Reflector
+c4fm.sustrai.org 42000
+
+# YSF006 / YSF006 NORWAY    / 24299+XLX404D 
+ysf.hamlabs.no 42000
+
+# YSF012 / YSF012 Denmark   / C4FM Reflector
+oz2ree.dk 42000
+
+# YSF016 / YSF016           / SR8UWD Wlodawa
+sr8uwd.wiresx.pl 42000
+
+# YSF017 / YSF017           / YSFLatino TG-9
 ysf-latino.ddns.net 42000
 
+# YSF906 / YSF906           / EA7RKV        
+xrf906.radioclubveleta.es 42000
+
 # YSF000 / ZZ Parrot / Parrot
 127.0.0.1 42000