diff --git a/conf-templates/hostapd.conf b/conf-templates/hostapd.conf
index 5e18691..3b29fa4 100644
--- a/conf-templates/hostapd.conf
+++ b/conf-templates/hostapd.conf
@@ -1,15 +1,61 @@
-#############################
+##########################################################
+# INTERFACES AND WI-FI HOTSPOT NAME
 
 interface=wlan0
+
+#############################
+
 #bridge=br0
 
 #############################
 
+# Should we hide the hotspot
+# Only devices which know the hotspot
+# can establish connection
+# 0 = public, 1 = hidden
+
+ignore_broadcast_ssid=1
+
+#############################
+
 # Name of the Wireless Access Point (SSID)
 ssid=WAP
 
+##########################################################
+# AUTHENTICATION
+
+# 1 = WPA1, 2 = WPA2
+wpa=2
+
+# 1 = WPA, 2 = WEP, 3 = both
+auth_algs=1
+
+#############################
+
+# Set of accepted cipher suites
+rsn_pairwise=CCMP
+
+# Set of accepted key management algorithms
+wpa_key_mgmt=WPA-PSK
+
 #############################
 
+# Alternative A: Hashed password (recommended)
+
+wpa_psk=45f4df5c5afedcacb396d9ac95be210babd26150343da6ae7507364306b843bf
+
+# Generate this with wpa_passphrase
+# wpa_passphrase <SSID> <password>
+
+#############################
+
+# Alternative B: Plain text password (not recommended)
+
+#wpa_passphrase=mitmWireBand12
+
+##########################################################
+# WI-FI FREQUENCIES, CHANNEL AND DRIVERS
+
 # Driver interface type (hostap/wired/none/nl80211/bsd)
 driver=nl80211
 
@@ -47,37 +93,7 @@ channel=7
 max_num_sta=5
 
 #############################
-
-# 1 = WPA1, 2 = WPA2
-wpa=2
-
-# 1 = WPA, 2 = WEP, 3 = both
-auth_algs=1
-
-#############################
-
-# Set of accepted cipher suites
-rsn_pairwise=CCMP
-
-# Set of accepted key management algorithms
-wpa_key_mgmt=WPA-PSK
-
-#############################
-
-# Alternative A: Hashed password (recommended)
-
-wpa_psk=45f4df5c5afedcacb396d9ac95be210babd26150343da6ae7507364306b843bf
-
-# Generate this with wpa_passphrase
-# wpa_passphrase <SSID> <password>
-
-#############################
-
-# Alternative B: Plain text password (not recommended)
-
-#wpa_passphrase=mitmWireBand12
-
-#############################
+# OTHER
 
 #ap_isolate=1