diff --git a/irc/atheme/cstemplate b/irc/atheme/cstemplate
index 8e9517d..59f0590 100755
--- a/irc/atheme/cstemplate
+++ b/irc/atheme/cstemplate
@@ -40,15 +40,15 @@ echo "/cs template $1 successor !+*S"
 echo "/cs template $1 sop !-aq+*"
 
 # Normal op, be able to invite, invite, kick, kickban, unban, change topic
-echo "/cs template $1 op !+*-Rfaq"
+echo "/cs template $1 op !+*-Rfaqs"
 
 # Half op, be able to do everything else than kick other halfops & higher
-echo "/cs template $1 hop !+vVhHirtAe-aq"
+echo "/cs template $1 hop !+vVhHirtAe-asq"
 
 # Network operator whom we want to have a little access so they can help
 # with channel issues in case our own ops are away.
 # Usually given to $OPER or staffer hostmask.
-echo "/cs template $1 oper !+*-RfOVaq"
+echo "/cs template $1 oper !+*-RfOVaqs"
 
 # User who is just allowed to voice themselves and get into the channel
 # unless they are banned.
diff --git a/irc/atheme/cstemplate_freenode b/irc/atheme/cstemplate_freenode
index b9af4e8..59ddc34 100755
--- a/irc/atheme/cstemplate_freenode
+++ b/irc/atheme/cstemplate_freenode
@@ -46,16 +46,16 @@ echo "/cs template $1 sop !-aqOVH+*"
 # give this also to $OPER or network operator host
 # start by disabling oper as it causes conflict otherwise
 echo "/cs template $1 oper -*"
-echo "/cs template $1 op !-*+voirtAoe"
+echo "/cs template $1 op !-*+voirtAoeh"
+
+# Auto-op same as above, but gets auto-opped
+echo "/cs template $1 aop !-*+OHvoirtAoe"
 
 # Half op, be able to do everything else than kick other halfops & higher
 echo "/cs template $1 hop !-*+virtAhe"
 
-# Bot which doesn't need to be able to do so much.
-echo "/cs template $1 bot !-*+Ooirte"
-
-# Half op bot which doesn't need to be able to do even that much
-echo "/cs template $1 hbot !-*+Hhirte"
+# Above, but also auto-hop
+echo "/cs template $1 ahop !-*+virtAeHh"
 
 # Permanent ban. Removes all flags and sets autokick.
 echo "/cs template $1 ban !-*+b"
diff --git a/irc/atheme/decstemplate b/irc/atheme/decstemplate
index 621ff54..ae5439f 100755
--- a/irc/atheme/decstemplate
+++ b/irc/atheme/decstemplate
@@ -10,3 +10,5 @@ echo "/cs template $1 hbot -*"
 echo "/cs template $1 user -*"
 echo "/cs template $1 ban -*"
 echo "/cs template $1 alert -*"
+echo "/cs templte $1 aop -*"
+echo "/cs template $1 ahop -*"