4 files changed, 17 insertions, 17 deletions
diff --git a/include/channels.h b/include/channels.h
index c0df69513..9cce9feb3 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -188,7 +188,7 @@ class chanrec : public Extensible
  * a userrec and chanrec class. The uc_modes member holds a bitmask of which privilages the user
  * has on the channel, such as op, voice, etc.
  */
-class ucrec : public classbase
+class ucrec : public Extensible
 {
  public:
 	/** Contains a bitmask of the UCMODE_OP ... UCMODE_FOUNDER values.
diff --git a/include/connection.h b/include/connection.h
index eaa995f89..ee723764c 100644
--- a/include/connection.h
+++ b/include/connection.h
@@ -38,7 +38,7 @@
  * connection(s) relating to the server you want information on.
  * The core and module API provide functions for this.
  */
-class ircd_connector : public classbase
+class ircd_connector : public Extensible
 {
  private:
 	/** Sockaddr of the outbound ip and port
diff --git a/include/ctables.h b/include/ctables.h
index cd3dc83a7..2a1be7b77 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -13,16 +13,16 @@
  *
  * ---------------------------------------------------
  */
+#ifndef __CTABLES_H__
+#define __CTABLES_H__
+
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "base.h"
 
-#ifndef __CTABLES_H__
-#define __CTABLES_H__
-
 /** A structure that defines a command
  */
-class command_t : public classbase
+class command_t : public Extensible
 {
  public:
 	/** Command name
diff --git a/src/InspIRCd.layout b/src/InspIRCd.layout
index 77a6e15e3..1c609531c 100644
--- a/src/InspIRCd.layout
+++ b/src/InspIRCd.layout
@@ -101,24 +101,24 @@ LeftChar=1
 [Editor_12]
 Open=1
 Top=0
-CursorCol=34
-CursorRow=83
-TopLine=130
+CursorCol=32
+CursorRow=191
+TopLine=154
 LeftChar=1
 
 [Editor_13]
 Open=1
 Top=0
-CursorCol=37
-CursorRow=161
-TopLine=120
+CursorCol=41
+CursorRow=41
+TopLine=19
 LeftChar=1
 
 [Editor_14]
 Open=1
-Top=0
+Top=1
 CursorCol=1
-CursorRow=23
+CursorRow=18
 TopLine=1
 LeftChar=1
 
@@ -189,8 +189,8 @@ LeftChar=1
 [Editor_23]
 Open=1
 Top=0
-CursorCol=2
-CursorRow=30
+CursorCol=5
+CursorRow=41
 TopLine=1
 LeftChar=1
 
@@ -336,7 +336,7 @@ TopLine=1498
 LeftChar=1
 [Editor_44]
 Open=1
-Top=1
+Top=0
 CursorCol=63
 CursorRow=63
 TopLine=16