diff --git a/modules/webcpanel/templates/chanserv/access.html b/modules/webcpanel/templates/chanserv/access.html
index c50434f8a..322f665c5 100644
--- a/modules/webcpanel/templates/chanserv/access.html
+++ b/modules/webcpanel/templates/chanserv/access.html
@@ -1,4 +1,4 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
Access List
@@ -74,4 +74,4 @@
{END IF}
{END IF}
-{INCLUDE footer.html}
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/chanserv/akick.html b/modules/webcpanel/templates/chanserv/akick.html
index ddfea546c..de1bc280c 100644
--- a/modules/webcpanel/templates/chanserv/akick.html
+++ b/modules/webcpanel/templates/chanserv/akick.html
@@ -1,4 +1,4 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
Akick List
@@ -58,4 +58,4 @@
{END IF}
-{INCLUDE footer.html}
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/chanserv/drop.html b/modules/webcpanel/templates/chanserv/drop.html
index c28eb051a..3a160dbb1 100644
--- a/modules/webcpanel/templates/chanserv/drop.html
+++ b/modules/webcpanel/templates/chanserv/drop.html
@@ -1,4 +1,4 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
Channels you can drop
@@ -29,4 +29,4 @@
{END IF}
-{INCLUDE footer.html}
\ No newline at end of file
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/chanserv/main.html b/modules/webcpanel/templates/chanserv/main.html
index e77626f31..6bfd05983 100644
--- a/modules/webcpanel/templates/chanserv/main.html
+++ b/modules/webcpanel/templates/chanserv/main.html
@@ -1,3 +1,3 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
-{INCLUDE footer.html}
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/chanserv/modes.html b/modules/webcpanel/templates/chanserv/modes.html
index 3c7fe7ab3..b086e60c7 100644
--- a/modules/webcpanel/templates/chanserv/modes.html
+++ b/modules/webcpanel/templates/chanserv/modes.html
@@ -1,4 +1,4 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
Channel Mode List
@@ -53,4 +53,4 @@
{END IF}
-{INCLUDE footer.html}
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/chanserv/set.html b/modules/webcpanel/templates/chanserv/set.html
index bc785c567..3c63294ac 100644
--- a/modules/webcpanel/templates/chanserv/set.html
+++ b/modules/webcpanel/templates/chanserv/set.html
@@ -1,4 +1,4 @@
-{INCLUDE header.html}
+{INCLUDE layout/header.loggedin.html}
{INCLUDE chanserv/chanlist.html}
Channel Information
@@ -86,4 +86,4 @@
{END IF}
{END IF}
-{INCLUDE footer.html}
+{INCLUDE layout/footer.loggedin.html}
diff --git a/modules/webcpanel/templates/confirm.html b/modules/webcpanel/templates/confirm.html
index 3ef3bf52d..4b5f08c67 100644
--- a/modules/webcpanel/templates/confirm.html
+++ b/modules/webcpanel/templates/confirm.html
@@ -1,19 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {TITLE}
-
-
-
+{INCLUDE layout/header.html}
-
-
-
-
-
-
-
-
-
+{INCLUDE layout/footer.html}
diff --git a/modules/webcpanel/templates/footer.html b/modules/webcpanel/templates/footer.html
deleted file mode 100644
index 9fc3e5845..000000000
--- a/modules/webcpanel/templates/footer.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-