Rearranging, and renaming.

config.ini.dist

@@ -1,10 +1,5 @@
 debug =
 
-[api]
-pass =
-api_url =
-user =
-
 [asterisk]
 callfrom =
 callto =
@@ -19,12 +14,7 @@ user =
 hostname =
 jid =
 password =
-
+port =
-[weather]
-city_code =
-city_name =
-key =
-units =
 
 [gotify]
 key =
@@ -52,11 +42,27 @@ color_url =
 status_url =
 toggle_url =
 
+[unlocks]
+api_url =
+pass =
+user =
 
 [user]
 jid =
 name =
 server = 
+
+[weather]
+city_code =
+city_name =
+key =
+units =
+
+[xmpp]
 api_url = 
+key =
+muc_name =
+muc_password = 
+muc_server =
 
 [friends]