diff --git a/encryption/templates/active b/encryption/templates/active
index 1ce995a..3be3271 100644
--- a/encryption/templates/active
+++ b/encryption/templates/active
@@ -1,7 +1,10 @@
 wpa
-wep
+wep-hex
+wep-passphrase
+wep-shared
 leap
 ttls
 eap
 peap
 peap-tkip
+eap-tls
diff --git a/encryption/templates/eap-tls b/encryption/templates/eap-tls
new file mode 100644
index 0000000..cafaf71
--- /dev/null
+++ b/encryption/templates/eap-tls
@@ -0,0 +1,18 @@
+name = EAP-TLS
+author = Dan O'Reilly
+version = 1
+require identity *Identity ca_cert *Path_to_CA_Cert client_cert *Path_to_Client_Cert private_key *Private_Key private_key_passwd *Private_Key_Password
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+   ssid=$_ESSID
+   key_mgmt=WPA-EAP
+   pairwise=TKIP
+   group=TKIP
+   eap=TLS
+   identity=$_IDENTITY
+   ca_cert=$_CA_CERT
+   client_cert=$_CLIENT_CERT
+   private_key=$_PRIVATE_KEY
+   private_key_passwd=$_PRIVATE_KEY_PASSWD
+}
diff --git a/encryption/templates/leap b/encryption/templates/leap
index 3427e75..1685c2a 100644
--- a/encryption/templates/leap
+++ b/encryption/templates/leap
@@ -8,7 +8,7 @@ network={
 	ssid="$_ESSID"
 	scan_ssid=$_SCAN
 	eap=LEAP
-	key_mgmt=IEEE8021X
+	key-mgmt=IEEE8021X
 	identity="$_USERNAME"
 	password="$_PASSWORD"
 }
diff --git a/encryption/templates/wep b/encryption/templates/wep-hex
similarity index 93%
rename from encryption/templates/wep
rename to encryption/templates/wep-hex
index 1fdac19..e7d147f 100644
--- a/encryption/templates/wep
+++ b/encryption/templates/wep-hex
@@ -1,4 +1,4 @@
-name = WEP
+name = WEP (Hex)
 author = Adam Blackburn
 version = 1
 require key *Key
diff --git a/encryption/templates/wep-passphrase b/encryption/templates/wep-passphrase
new file mode 100644
index 0000000..792eece
--- /dev/null
+++ b/encryption/templates/wep-passphrase
@@ -0,0 +1,14 @@
+name = WEP (Passphrase)
+author = Adam Blackburn
+version = 1
+require passphrase *Passphrase
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       key_mgmt=NONE
+       wep_key0="$_PASSPHRASE"
+       wep_tx_keyidx=0
+       priority=5
+}
diff --git a/encryption/templates/wep-shared b/encryption/templates/wep-shared
new file mode 100644
index 0000000..713e68c
--- /dev/null
+++ b/encryption/templates/wep-shared
@@ -0,0 +1,15 @@
+name = WEP Shared/Restricted
+author = Dan O'Reilly
+version = 1
+require key *Key
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       key_mgmt=NONE
+       auth_alg=SHARED
+       wep_key0=$_KEY
+       wep_tx_keyidx=0
+       priority=5
+}