diff --git a/src/chat/client.yml b/src/chat/client.toml
similarity index 83%
rename from src/chat/client.yml
rename to src/chat/client.toml
index 4014bd3..4fb082a 100644
--- a/src/chat/client.yml
+++ b/src/chat/client.toml
@@ -14,5 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-auto_connect: false # Automatic connection to 'auto_connect_ip'
-auto_connect_ip: "109.123.243.163" # See 'auto_connect'
\ No newline at end of file
+[connection]
+auto_connect = false # Automatic connection to 'auto_connect_ip'
+auto_connect_ip = "109.123.243.163" # See 'auto_connect'
\ No newline at end of file
diff --git a/src/chat/server.yml b/src/chat/server.toml
similarity index 83%
rename from src/chat/server.yml
rename to src/chat/server.toml
index 4658c53..6a8eb5d 100644
--- a/src/chat/server.yml
+++ b/src/chat/server.toml
@@ -14,4 +14,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-user_pick_username: true # User will be prompted for his username on connect or will have to set it onetime [NOT IMPLEMENTED]
+[connection]
+user_pick_username = true # User will be prompted for his username on connect or will have to set it onetime [NOT IMPLEMENTED]