diff --git a/P25Gateway/P25Hosts.txt b/P25Gateway/P25Hosts.txt
index 0394073..f1d650c 100644
--- a/P25Gateway/P25Hosts.txt
+++ b/P25Gateway/P25Hosts.txt
@@ -7,22 +7,22 @@
 4	p25.duckdns.org		41004
 
 # 420 Super Freq
-420 p25.evsuperfreqs.com 41000
+420	p25.evsuperfreqs.com	41000
 
 # 530 NZ
-530 zldigitalreflectors.hopto.org 41000
+530	zldigitalreflectors.hopto.org	41000
 
 # 707 Rural Minnesota - Bridge to TGIF707, YSF US RuralMN-707
 707	707p25.kd0ioe.com	41000
 
 # 927 Southern California
-927 927.org 41000
+927	927.org			41000
 
 # 2140 P25 Reflector BM DMR+ Multi 
 2140	94.177.235.81		41000
 
 # RU DMR TG2503
-2503 p25.r1ik.ru 41000
+2503	p25.r1ik.ru		41000
 
 # 3023 Ontario Crosslink
 3023	ontxlink.hopto.org	41000
@@ -48,14 +48,17 @@
 # 10301	Europe
 10301	ea5gvk.duckdns.org	41000
 
-# 10310 HAMNET HAMCLOUD	http://44.148.230.100/P25Reflector-Dashboard/
+# 10310 Germany HAMNET (Bridge to 10320)	http://44.148.230.100/
 10310	44.148.230.100		41000
 
-# 10320 Germany	https://db0he.de:8002/p25db/
-10320	46.41.0.214		41000
+# 10311 Germany HAMNET Multimode (Bridge to 10321)	http://44.148.230.100/
+10311	44.148.230.100		41010
 
-# 10321 Germany Multimode	https://db0he.de:8003/p25db/
-10321	46.41.0.214		41010
+# 10320 Germany INTERNET (Bridge to 10310)	http://xlx-hc.ham-digital.org/
+10320	137.226.79.122		41000
+
+# 10321 Germany INTERNET Multimode (Bridge to 10311)	http://xlx-hc.ham-digital.org/
+10321	137.226.79.122		41010
 
 # 10328 German Pegasus Project
 10328	5.9.59.26		41000
@@ -84,6 +87,9 @@
 # 10700 Australia NSW Bridge to AU NSW YSF
 10700	p25nsw.gustotech.net	41000
 
+# 22212 IT PIEDMONT GDO
+22212	p25gdo.duckdns.org	41000
+
 # 23225 Austria
 23225	94.199.173.123		41000
 
@@ -103,7 +109,7 @@
 31062	p25.mw-dmr.net		41000
 
 # 31079 ALERT Radio / Multimode P25/DMR
-31079 927.org 41001
+31079	927.org			41001
 
 # 31088 Colorado HD
 31088	54.191.50.212		41000
@@ -120,18 +126,18 @@
 # 31188 Southern Indiana
 31188	w9windigital.org	41000
 
-# 31665 TGIF Network, http://tgif.network
-31665	tgif.network		41000
-
-# 31672 P25 Pi-Star chat
-31672	p25-31672.pistar.uk	41000
-
 # 31341 South Jersey, http://p25.kc2idb.net
 31341	p25.kc2idb.net		41000
 
 # 31403 Oklahoma Link
 31403	3.208.70.29		41000
 
+# 31665 TGIF Network, http://tgif.network
+31665	tgif.network		41000
+
+# 31672 P25 Pi-Star chat
+31672	p25-31672.pistar.uk	41000
+
 # 31777 DX-LINK
 31777	8.9.4.102		41000
 
@@ -149,6 +155,3 @@
 
 # 53099 New Zealand bridge to D-Star, DMR and NXDN
 53099	203.86.206.49		41000
-
-# 22212 IT PIEDMONT GDO
-22212 p25gdo.duckdns.org 41000