diff --git a/core/basepage.php b/core/basepage.php
index 697fd6e1..2657ac80 100644
--- a/core/basepage.php
+++ b/core/basepage.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 require_once "core/event.php";
 
 enum PageMode: string
@@ -255,7 +258,7 @@ class BasePage
             case PageMode::MANUAL:
                 break;
             case PageMode::PAGE:
-                usort($this->blocks, "blockcmp");
+                usort($this->blocks, "Shimmie2\blockcmp");
                 $this->add_auto_html_headers();
                 $this->render();
                 break;
@@ -468,8 +471,8 @@ class BasePage
         }
 
         $sub_links = $sub_links??[];
-        usort($nav_links, "sort_nav_links");
-        usort($sub_links, "sort_nav_links");
+        usort($nav_links, "Shimmie2\sort_nav_links");
+        usort($sub_links, "Shimmie2\sort_nav_links");
 
         return [$nav_links, $sub_links];
     }
diff --git a/core/basethemelet.php b/core/basethemelet.php
index 13e8f245..d6c4a222 100644
--- a/core/basethemelet.php
+++ b/core/basethemelet.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class BaseThemelet
  *
@@ -64,7 +66,7 @@ class BaseThemelet
         }
 
         $custom_classes = "";
-        if (class_exists("Relationships")) {
+        if (class_exists("Shimmie2\Relationships")) {
             if (property_exists($image, 'parent_id') && $image->parent_id !== null) {
                 $custom_classes .= "shm-thumb-has_parent ";
             }
diff --git a/core/block.php b/core/block.php
index ce09be39..8cf31329 100644
--- a/core/block.php
+++ b/core/block.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class Block
  *
diff --git a/core/cacheengine.php b/core/cacheengine.php
index ab0dd332..164b879e 100644
--- a/core/cacheengine.php
+++ b/core/cacheengine.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 interface CacheEngine
 {
     public function get(string $key);
diff --git a/core/captcha.php b/core/captcha.php
index ec79c2cb..d7390d7d 100644
--- a/core/captcha.php
+++ b/core/captcha.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * CAPTCHA abstraction                                                       *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/core/command_builder.php b/core/command_builder.php
index bd1f828b..9c4519eb 100644
--- a/core/command_builder.php
+++ b/core/command_builder.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // Provides mechanisms for cleanly executing command-line applications
 // Was created to try to centralize a solution for whatever caused this:
 // quotes are only needed if the path to convert contains a space; some other times, quotes break things, see github bug #27
diff --git a/core/config.php b/core/config.php
index 708d94be..ecaa274f 100644
--- a/core/config.php
+++ b/core/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Interface Config
  *
diff --git a/core/database.php b/core/database.php
index 49162018..1b41de1e 100644
--- a/core/database.php
+++ b/core/database.php
@@ -1,7 +1,10 @@
 <?php
 
 declare(strict_types=1);
-use FFSPHP\PDO;
+
+namespace Shimmie2;
+
+use FFSPHP\PDO, FFSPHP\PDOStatement;
 
 enum DatabaseDriverID: string
 {
@@ -204,7 +207,7 @@ class Database
     /**
      * Execute an SQL query and return the first column of each row as a single iterable object.
      */
-    public function get_col_iterable(string $query, array $args = []): Generator
+    public function get_col_iterable(string $query, array $args = []): \Generator
     {
         $_start = microtime(true);
         $stmt = $this->execute($query, $args);
@@ -229,7 +232,7 @@ class Database
     /**
      * Execute an SQL query and return the the first column => the second column as an iterable object.
      */
-    public function get_pairs_iterable(string $query, array $args = []): Generator
+    public function get_pairs_iterable(string $query, array $args = []): \Generator
     {
         $_start = microtime(true);
         $stmt = $this->execute($query, $args);
diff --git a/core/dbengine.php b/core/dbengine.php
index 46407595..bf32cd47 100644
--- a/core/dbengine.php
+++ b/core/dbengine.php
@@ -1,6 +1,11 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
+use FFSPHP\PDO;
+
 abstract class SCORE
 {
     public const AIPK      = "SCORE_AIPK";
@@ -177,16 +182,16 @@ class SQLite extends DBEngine
     {
         ini_set('sqlite.assoc_case', '0');
         $db->exec("PRAGMA foreign_keys = ON;");
-        $db->sqliteCreateFunction('UNIX_TIMESTAMP', '_unix_timestamp', 1);
-        $db->sqliteCreateFunction('now', '_now', 0);
-        $db->sqliteCreateFunction('floor', '_floor', 1);
-        $db->sqliteCreateFunction('log', '_log');
-        $db->sqliteCreateFunction('isnull', '_isnull', 1);
-        $db->sqliteCreateFunction('md5', '_md5', 1);
-        $db->sqliteCreateFunction('concat', '_concat', 2);
-        $db->sqliteCreateFunction('lower', '_lower', 1);
-        $db->sqliteCreateFunction('rand', '_rand', 0);
-        $db->sqliteCreateFunction('ln', '_ln', 1);
+        $db->sqliteCreateFunction('UNIX_TIMESTAMP', 'Shimmie2\_unix_timestamp', 1);
+        $db->sqliteCreateFunction('now', 'Shimmie2\_now', 0);
+        $db->sqliteCreateFunction('floor', 'Shimmie2\_floor', 1);
+        $db->sqliteCreateFunction('log', 'Shimmie2\_log');
+        $db->sqliteCreateFunction('isnull', 'Shimmie2\_isnull', 1);
+        $db->sqliteCreateFunction('md5', 'Shimmie2\_md5', 1);
+        $db->sqliteCreateFunction('concat', 'Shimmie2\_concat', 2);
+        $db->sqliteCreateFunction('lower', 'Shimmie2\_lower', 1);
+        $db->sqliteCreateFunction('rand', 'Shimmie2\_rand', 0);
+        $db->sqliteCreateFunction('ln', 'Shimmie2\_ln', 1);
     }
 
     public function scoreql_to_sql(string $data): string
diff --git a/core/event.php b/core/event.php
index 355ac504..db6798ab 100644
--- a/core/event.php
+++ b/core/event.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Generic parent class for all events.
  *
diff --git a/core/exceptions.php b/core/exceptions.php
index 1312cb7b..3d1dff4f 100644
--- a/core/exceptions.php
+++ b/core/exceptions.php
@@ -2,10 +2,12 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * A base exception to be caught by the upper levels.
  */
-class SCoreException extends RuntimeException
+class SCoreException extends \RuntimeException
 {
     public ?string $query;
     public string $error;
@@ -19,7 +21,7 @@ class SCoreException extends RuntimeException
     }
 }
 
-class InstallerException extends RuntimeException
+class InstallerException extends \RuntimeException
 {
     public string $title;
     public string $body;
diff --git a/core/extension.php b/core/extension.php
index 80f1ad5c..cf41957b 100644
--- a/core/extension.php
+++ b/core/extension.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Class Extension
  *
@@ -17,7 +20,7 @@ abstract class Extension
 {
     public string $key;
     protected ?Themelet $theme;
-    public ?ExtensionInfo $info;
+    public ExtensionInfo $info;
 
     private static array $enabled_extensions = [];
 
@@ -26,9 +29,6 @@ abstract class Extension
         $class = $class ?? get_called_class();
         $this->theme = $this->get_theme_object($class);
         $this->info = ExtensionInfo::get_for_extension_class($class);
-        if ($this->info===null) {
-            throw new ScoreException("Info class not found for extension $class");
-        }
         $this->key = $this->info->key;
     }
 
@@ -37,8 +37,9 @@ abstract class Extension
      */
     private function get_theme_object(string $base): ?Themelet
     {
-        $custom = 'Custom'.$base.'Theme';
-        $normal = $base.'Theme';
+        $base = str_replace("Shimmie2\\", "", $base);
+        $custom = "Shimmie2\Custom{$base}Theme";
+        $normal = "Shimmie2\\{$base}Theme";
 
         if (class_exists($custom)) {
             return new $custom();
@@ -224,20 +225,21 @@ abstract class ExtensionInfo
         }
     }
 
-    public static function get_for_extension_class(string $base): ?ExtensionInfo
+    public static function get_for_extension_class(string $base): ExtensionInfo
     {
-        $normal = $base.'Info';
+        $normal = "{$base}Info";
 
         if (array_key_exists($normal, self::$all_info_by_class)) {
             return self::$all_info_by_class[$normal];
         } else {
-            return null;
+            $infos = print_r(array_keys(self::$all_info_by_class), true);
+            throw new ScoreException("$normal not found in {$infos}");
         }
     }
 
     public static function load_all_extension_info()
     {
-        foreach (get_subclasses_of("ExtensionInfo") as $class) {
+        foreach (get_subclasses_of("Shimmie2\ExtensionInfo") as $class) {
             $extension_info = new $class();
             if (array_key_exists($extension_info->key, self::$all_info_by_key)) {
                 throw new ScoreException("Extension Info $class with key $extension_info->key has already been loaded");
@@ -435,13 +437,13 @@ abstract class DataHandlerExtension extends Extension
     public static function get_all_supported_mimes(): array
     {
         $arr = [];
-        foreach (get_subclasses_of("DataHandlerExtension") as $handler) {
+        foreach (get_subclasses_of("Shimmie2\DataHandlerExtension") as $handler) {
             $handler = (new $handler());
             $arr = array_merge($arr, $handler->SUPPORTED_MIME);
         }
 
         // Not sure how to handle this otherwise, don't want to set up a whole other event for this one class
-        if (class_exists("TranscodeImage")) {
+        if (class_exists("Shimmie2\TranscodeImage")) {
             $arr = array_merge($arr, TranscodeImage::get_enabled_mimes());
         }
 
diff --git a/core/imageboard/event.php b/core/imageboard/event.php
index 2d4a1e3c..1580f848 100644
--- a/core/imageboard/event.php
+++ b/core/imageboard/event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * An image is being added to the database.
  */
diff --git a/core/imageboard/image.php b/core/imageboard/image.php
index fd9d40fb..1d30a2c9 100644
--- a/core/imageboard/image.php
+++ b/core/imageboard/image.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Class Image
  *
@@ -149,7 +152,7 @@ class Image
     /**
      * Search for an array of images, returning a iterable object of Image
      */
-    public static function find_images_iterable(int $start = 0, ?int $limit = null, array $tags=[]): Generator
+    public static function find_images_iterable(int $start = 0, ?int $limit = null, array $tags=[]): \Generator
     {
         $result = self::find_images_internal($start, $limit, $tags);
         foreach ($result as $row) {
diff --git a/core/imageboard/misc.php b/core/imageboard/misc.php
index a1f66eca..f36e63e1 100644
--- a/core/imageboard/misc.php
+++ b/core/imageboard/misc.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Misc functions                                                            *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/core/imageboard/search.php b/core/imageboard/search.php
index 32a3368b..11ac9b03 100644
--- a/core/imageboard/search.php
+++ b/core/imageboard/search.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Querylet
 {
     public function __construct(
diff --git a/core/imageboard/tag.php b/core/imageboard/tag.php
index d6bbdc66..f2d338d9 100644
--- a/core/imageboard/tag.php
+++ b/core/imageboard/tag.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Class Tag
  *
@@ -144,7 +147,7 @@ class Tag
         foreach ($tags as $tag) {
             try {
                 $tag = Tag::sanitize($tag);
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $page->flash($e->getMessage());
                 continue;
             }
diff --git a/core/install.php b/core/install.php
index bee62aa7..ee504573 100644
--- a/core/install.php
+++ b/core/install.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Shimmie Installer
  *
diff --git a/core/logging.php b/core/logging.php
index 50db58db..7b5c3694 100644
--- a/core/logging.php
+++ b/core/logging.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Logging convenience                                                       *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
diff --git a/core/permissions.php b/core/permissions.php
index 351fa2a9..20ab0092 100644
--- a/core/permissions.php
+++ b/core/permissions.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // action_object_attribute
 // action = create / view / edit / delete
 // object = image / user / tag / setting
diff --git a/core/polyfills.php b/core/polyfills.php
index 85b04920..33d8e244 100644
--- a/core/polyfills.php
+++ b/core/polyfills.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Things which should be in the core API                                    *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -267,7 +270,7 @@ function get_subclasses_of(string $parent): array
 {
     $result = [];
     foreach (get_declared_classes() as $class) {
-        $rclass = new ReflectionClass($class);
+        $rclass = new \ReflectionClass($class);
         if (!$rclass->isAbstract() && is_subclass_of($class, $parent)) {
             $result[] = $class;
         }
@@ -771,7 +774,7 @@ function join_path(string ...$paths): string
 /**
  * Perform callback on each item returned by an iterator.
  */
-function iterator_map(callable $callback, iterator $iter): Generator
+function iterator_map(callable $callback, \iterator $iter): \Generator
 {
     foreach ($iter as $i) {
         yield call_user_func($callback, $i);
@@ -781,7 +784,7 @@ function iterator_map(callable $callback, iterator $iter): Generator
 /**
  * Perform callback on each item returned by an iterator and combine the result into an array.
  */
-function iterator_map_to_array(callable $callback, iterator $iter): array
+function iterator_map_to_array(callable $callback, \iterator $iter): array
 {
     return iterator_to_array(iterator_map($callback, $iter));
 }
@@ -790,7 +793,7 @@ function stringer($s): string
 {
     if (is_array($s)) {
         if (isset($s[0])) {
-            return "[" . implode(", ", array_map("stringer", $s)) . "]";
+            return "[" . implode(", ", array_map("Shimmie2\stringer", $s)) . "]";
         } else {
             $pairs = [];
             foreach ($s as $k=>$v) {
diff --git a/core/sanitize_php.php b/core/sanitize_php.php
index aadc8fb3..80aebb3c 100644
--- a/core/sanitize_php.php
+++ b/core/sanitize_php.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /*
  * A small number of PHP-sanity things (eg don't silently ignore errors) to
  * be included right at the very start of index.php and tests/bootstrap.php
diff --git a/core/send_event.php b/core/send_event.php
index 4e461d1a..dfd3cb2a 100644
--- a/core/send_event.php
+++ b/core/send_event.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Event API                                                                 *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -37,7 +40,7 @@ function _set_event_listeners(): void
     global $_shm_event_listeners;
     $_shm_event_listeners = [];
 
-    foreach (get_subclasses_of("Extension") as $class) {
+    foreach (get_subclasses_of("Shimmie2\Extension") as $class) {
         /** @var Extension $extension */
         $extension = new $class();
 
@@ -59,19 +62,24 @@ function _set_event_listeners(): void
     }
 }
 
+function _namespaced_class_name(string $class): string {
+    return str_replace("Shimmie2\\", "", $class);
+}
+
 function _dump_event_listeners(array $event_listeners, string $path): void
 {
-    $p = "<"."?php\n";
+    $p = "<"."?php\nnamespace Shimmie2;\n";
 
-    foreach (get_subclasses_of("Extension") as $class) {
-        $p .= "\$$class = new $class(); ";
+    foreach (get_subclasses_of("Shimmie2\Extension") as $class) {
+        $scn = _namespaced_class_name($class);
+        $p .= "\$$scn = new $scn(); ";
     }
 
     $p .= "\$_shm_event_listeners = array(\n";
     foreach ($event_listeners as $event => $listeners) {
         $p .= "\t'$event' => array(\n";
         foreach ($listeners as $id => $listener) {
-            $p .= "\t\t$id => \$".get_class($listener).",\n";
+            $p .= "\t\t$id => \$"._namespaced_class_name(get_class($listener)).",\n";
         }
         $p .= "\t),\n";
     }
@@ -93,10 +101,11 @@ function send_event(Event $event): Event
     global $tracer_enabled;
 
     global $_shm_event_listeners, $_shm_event_count, $_tracer;
-    if (!isset($_shm_event_listeners[get_class($event)])) {
+    $event_name = _namespaced_class_name(get_class($event));
+    if (!isset($_shm_event_listeners[$event_name])) {
         return $event;
     }
-    $method_name = "on".str_replace("Event", "", get_class($event));
+    $method_name = "on".str_replace("Event", "", $event_name);
 
     // send_event() is performance sensitive, and with the number
     // of times tracer gets called the time starts to add up
@@ -104,7 +113,7 @@ function send_event(Event $event): Event
         $_tracer->begin(get_class($event));
     }
     // SHIT: https://bugs.php.net/bug.php?id=35106
-    $my_event_listeners = $_shm_event_listeners[get_class($event)];
+    $my_event_listeners = $_shm_event_listeners[$event_name];
     ksort($my_event_listeners);
 
     foreach ($my_event_listeners as $listener) {
diff --git a/core/sys_config.php b/core/sys_config.php
index 6f0ff854..2f5cb0c2 100644
--- a/core/sys_config.php
+++ b/core/sys_config.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * For any values that aren't defined in data/config/*.php,
  * Shimmie will set the values to their defaults
diff --git a/core/tests/basepage.test.php b/core/tests/basepage.test.php
index 029ce9fc..fdec72c1 100644
--- a/core/tests/basepage.test.php
+++ b/core/tests/basepage.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/basepage.php";
diff --git a/core/tests/block.test.php b/core/tests/block.test.php
index 5d44c320..1051e773 100644
--- a/core/tests/block.test.php
+++ b/core/tests/block.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/block.php";
diff --git a/core/tests/init.test.php b/core/tests/init.test.php
index 9a753978..02d3a0ff 100644
--- a/core/tests/init.test.php
+++ b/core/tests/init.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 class TestInit extends TestCase
diff --git a/core/tests/polyfills.test.php b/core/tests/polyfills.test.php
index 97457c84..edae790a 100644
--- a/core/tests/polyfills.test.php
+++ b/core/tests/polyfills.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/polyfills.php";
diff --git a/core/tests/tag.test.php b/core/tests/tag.test.php
index 212d5e2d..e8e6e0fa 100644
--- a/core/tests/tag.test.php
+++ b/core/tests/tag.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/imageboard/tag.php";
diff --git a/core/tests/urls.test.php b/core/tests/urls.test.php
index bdb6208d..fb34d4ab 100644
--- a/core/tests/urls.test.php
+++ b/core/tests/urls.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/urls.php";
diff --git a/core/tests/util.test.php b/core/tests/util.test.php
index bf2906b9..a0f45ca5 100644
--- a/core/tests/util.test.php
+++ b/core/tests/util.test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 require_once "core/util.php";
diff --git a/core/urls.php b/core/urls.php
index 80467e85..84d76109 100644
--- a/core/urls.php
+++ b/core/urls.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Link
 {
     public ?string $page;
diff --git a/core/user.php b/core/user.php
index dee4b81d..87f8d5f4 100644
--- a/core/user.php
+++ b/core/user.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 function _new_user(array $row): User
 {
     return new User($row);
diff --git a/core/userclass.php b/core/userclass.php
index a15d1767..32bac793 100644
--- a/core/userclass.php
+++ b/core/userclass.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * @global UserClass[] $_shm_user_classes
  */
@@ -58,7 +61,7 @@ class UserClass
 }
 
 $_all_false = [];
-foreach ((new ReflectionClass('Permissions'))->getConstants() as $k => $v) {
+foreach ((new \ReflectionClass('\Shimmie2\Permissions'))->getConstants() as $k => $v) {
     $_all_false[$v] = false;
 }
 new UserClass("base", null, $_all_false);
diff --git a/core/util.php b/core/util.php
index 60596f0c..1c2ecbeb 100644
--- a/core/util.php
+++ b/core/util.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 use function MicroHTML\emptyHTML;
@@ -259,7 +262,7 @@ function load_balance_url(string $tmpl, string $hash, int $n=0): string
         if (isset($flexihashes[$opts])) {
             $flexihash = $flexihashes[$opts];
         } else {
-            $flexihash = new Flexihash\Flexihash();
+            $flexihash = new \Flexihash\Flexihash();
             foreach (explode(",", $opts) as $opt) {
                 $parts = explode("=", $opt);
                 $parts_count = count($parts);
@@ -490,18 +493,18 @@ function scan_dir(string $path): array
     $bytestotal = 0;
     $nbfiles = 0;
 
-    $ite = new RecursiveDirectoryIterator(
+    $ite = new \RecursiveDirectoryIterator(
         $path,
-        FilesystemIterator::KEY_AS_PATHNAME |
-        FilesystemIterator::CURRENT_AS_FILEINFO |
-        FilesystemIterator::SKIP_DOTS
+        \FilesystemIterator::KEY_AS_PATHNAME |
+        \FilesystemIterator::CURRENT_AS_FILEINFO |
+        \FilesystemIterator::SKIP_DOTS
     );
-    foreach (new RecursiveIteratorIterator($ite) as $filename => $cur) {
+    foreach (new \RecursiveIteratorIterator($ite) as $filename => $cur) {
         try {
             $filesize = $cur->getSize();
             $bytestotal += $filesize;
             $nbfiles++;
-        } catch (RuntimeException $e) {
+        } catch (\RuntimeException $e) {
             // This usually just means that the file got eaten by the import
             continue;
         }
@@ -579,7 +582,9 @@ function _load_core_files()
 
 function _load_theme_files()
 {
-    require_all(_get_themelet_files(get_theme()));
+    $theme = get_theme();
+    $files = _get_themelet_files($theme);
+    require_all($files);
 }
 
 function _set_up_shimmie_environment(): void
@@ -621,13 +626,13 @@ function _get_themelet_files(string $_theme): array
 /**
  * Used to display fatal errors to the web user.
  */
-function _fatal_error(Exception $e): void
+function _fatal_error(\Exception $e): void
 {
     $version = VERSION;
     $message = $e->getMessage();
     $phpver = phpversion();
-    $query = is_subclass_of($e, "SCoreException") ? $e->query : null;
-    $code = is_subclass_of($e, "SCoreException") ? $e->http_code : 500;
+    $query = is_subclass_of($e, "Shimmie2\SCoreException") ? $e->query : null;
+    $code = is_subclass_of($e, "Shimmie2\SCoreException") ? $e->http_code : 500;
 
     //$hash = exec("git rev-parse HEAD");
     //$h_hash = $hash ? "<p><b>Hash:</b> $hash" : "";
diff --git a/ext/admin/info.php b/ext/admin/info.php
index 3eb6b901..806d37d9 100644
--- a/ext/admin/info.php
+++ b/ext/admin/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AdminPageInfo extends ExtensionInfo
 {
     public const KEY = "admin";
diff --git a/ext/admin/main.php b/ext/admin/main.php
index ad3bc67c..ec260930 100644
--- a/ext/admin/main.php
+++ b/ext/admin/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Sent when the admin page is ready to be added to
  */
diff --git a/ext/admin/test.php b/ext/admin/test.php
index ae0583a3..a4cbfcae 100644
--- a/ext/admin/test.php
+++ b/ext/admin/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class AdminPageTest extends ShimmiePHPUnitTestCase
 {
     public function testAuth()
diff --git a/ext/admin/theme.php b/ext/admin/theme.php
index 3e370b88..27bacdfa 100644
--- a/ext/admin/theme.php
+++ b/ext/admin/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AdminPageTheme extends Themelet
 {
     /*
diff --git a/ext/alias_editor/info.php b/ext/alias_editor/info.php
index 5a2ba075..753f9976 100644
--- a/ext/alias_editor/info.php
+++ b/ext/alias_editor/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AliasEditorInfo extends ExtensionInfo
 {
     public const KEY = "alias_editor";
diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
index 5cfa45bc..133de0b4 100644
--- a/ext/alias_editor/main.php
+++ b/ext/alias_editor/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroCRUD\ActionColumn;
 use MicroCRUD\TextColumn;
 use MicroCRUD\Table;
diff --git a/ext/alias_editor/test.php b/ext/alias_editor/test.php
index d194fc31..78437026 100644
--- a/ext/alias_editor/test.php
+++ b/ext/alias_editor/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class AliasEditorTest extends ShimmiePHPUnitTestCase
 {
     public function testAliasList()
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index 6dc7dd45..57f8f265 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AliasEditorTheme extends Themelet
 {
     /**
diff --git a/ext/approval/info.php b/ext/approval/info.php
index 4daa19a5..3ed711a4 100644
--- a/ext/approval/info.php
+++ b/ext/approval/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ApprovalInfo extends ExtensionInfo
 {
     public const KEY = "approval";
diff --git a/ext/approval/main.php b/ext/approval/main.php
index a36a21d5..736dc665 100644
--- a/ext/approval/main.php
+++ b/ext/approval/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class ApprovalConfig
 {
     public const VERSION = "ext_approval_version";
diff --git a/ext/approval/theme.php b/ext/approval/theme.php
index c6ad9dd0..a9dde60d 100644
--- a/ext/approval/theme.php
+++ b/ext/approval/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\BR;
 use function MicroHTML\BUTTON;
 use function MicroHTML\INPUT;
diff --git a/ext/artists/info.php b/ext/artists/info.php
index 7359e14c..2cd26752 100644
--- a/ext/artists/info.php
+++ b/ext/artists/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ArtistsInfo extends ExtensionInfo
 {
     public const KEY = "artists";
diff --git a/ext/artists/main.php b/ext/artists/main.php
index fa64a9e7..ae8d9800 100644
--- a/ext/artists/main.php
+++ b/ext/artists/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AuthorSetEvent extends Event
 {
     public Image $image;
diff --git a/ext/artists/test.php b/ext/artists/test.php
index fdebbce5..47f312bd 100644
--- a/ext/artists/test.php
+++ b/ext/artists/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ArtistsTest extends ShimmiePHPUnitTestCase
 {
     public function testSearch()
diff --git a/ext/artists/theme.php b/ext/artists/theme.php
index a9a5febf..0004e601 100644
--- a/ext/artists/theme.php
+++ b/ext/artists/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ArtistsTheme extends Themelet
 {
     public function get_author_editor_html(string $author): string
diff --git a/ext/auto_tagger/config.php b/ext/auto_tagger/config.php
index 3dd8e478..6fd5ed8e 100644
--- a/ext/auto_tagger/config.php
+++ b/ext/auto_tagger/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class AutoTaggerConfig
 {
     public const VERSION = "ext_auto_tagger_ver";
diff --git a/ext/auto_tagger/info.php b/ext/auto_tagger/info.php
index a466d470..ad1a7969 100644
--- a/ext/auto_tagger/info.php
+++ b/ext/auto_tagger/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoTaggerInfo extends ExtensionInfo
 {
     public const KEY = "auto_tagger";
diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php
index 3b0f7903..01a1f378 100644
--- a/ext/auto_tagger/main.php
+++ b/ext/auto_tagger/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once 'config.php';
 
 use MicroCRUD\ActionColumn;
diff --git a/ext/auto_tagger/test.php b/ext/auto_tagger/test.php
index 419d72c9..e8ed6293 100644
--- a/ext/auto_tagger/test.php
+++ b/ext/auto_tagger/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class AutoTaggerTest extends ShimmiePHPUnitTestCase
 {
     public function testAutoTaggerList()
diff --git a/ext/auto_tagger/theme.php b/ext/auto_tagger/theme.php
index 07d165ec..a96ab76c 100644
--- a/ext/auto_tagger/theme.php
+++ b/ext/auto_tagger/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoTaggerTheme extends Themelet
 {
     /**
diff --git a/ext/autocomplete/info.php b/ext/autocomplete/info.php
index 92115a46..bf853976 100644
--- a/ext/autocomplete/info.php
+++ b/ext/autocomplete/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoCompleteInfo extends ExtensionInfo
 {
     public const KEY = "autocomplete";
diff --git a/ext/autocomplete/main.php b/ext/autocomplete/main.php
index 74d33d65..3a2c0880 100644
--- a/ext/autocomplete/main.php
+++ b/ext/autocomplete/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoComplete extends Extension
 {
     /** @var AutoCompleteTheme */
diff --git a/ext/autocomplete/test.php b/ext/autocomplete/test.php
index ec9d1ba4..8378e584 100644
--- a/ext/autocomplete/test.php
+++ b/ext/autocomplete/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoCompleteTest extends ShimmiePHPUnitTestCase
 {
     public function testAuth()
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index d5fcbe8b..d2d17047 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class AutoCompleteTheme extends Themelet
 {
     public function build_autocomplete(Page $page)
diff --git a/ext/ban_words/info.php b/ext/ban_words/info.php
index b1f84dcb..247ab304 100644
--- a/ext/ban_words/info.php
+++ b/ext/ban_words/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BanWordsInfo extends ExtensionInfo
 {
     public const KEY = "ban_words";
diff --git a/ext/ban_words/main.php b/ext/ban_words/main.php
index 39febc87..4e57b7b4 100644
--- a/ext/ban_words/main.php
+++ b/ext/ban_words/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BanWords extends Extension
 {
     public function onInitExt(InitExtEvent $event)
diff --git a/ext/ban_words/test.php b/ext/ban_words/test.php
index 69ec598b..a70f6a06 100644
--- a/ext/ban_words/test.php
+++ b/ext/ban_words/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BanWordsTest extends ShimmiePHPUnitTestCase
 {
     public function check_blocked($image_id, $words)
diff --git a/ext/bbcode/info.php b/ext/bbcode/info.php
index 3e19775b..c0b46095 100644
--- a/ext/bbcode/info.php
+++ b/ext/bbcode/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BBCodeInfo extends ExtensionInfo
 {
     public const KEY = "bbcode";
diff --git a/ext/bbcode/main.php b/ext/bbcode/main.php
index 90b8b6d5..f2739441 100644
--- a/ext/bbcode/main.php
+++ b/ext/bbcode/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class BBCode extends FormatterExtension
 {
diff --git a/ext/bbcode/test.php b/ext/bbcode/test.php
index 6c600e1f..359ee3e0 100644
--- a/ext/bbcode/test.php
+++ b/ext/bbcode/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BBCodeTest extends ShimmiePHPUnitTestCase
 {
     public function testBasics()
diff --git a/ext/biography/info.php b/ext/biography/info.php
index 75d92643..8956243e 100644
--- a/ext/biography/info.php
+++ b/ext/biography/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BiographyInfo extends ExtensionInfo
 {
     public const KEY = "biography";
diff --git a/ext/biography/main.php b/ext/biography/main.php
index 01e2049d..1c9816df 100644
--- a/ext/biography/main.php
+++ b/ext/biography/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Biography extends Extension
 {
     /** @var BiographyTheme */
diff --git a/ext/biography/test.php b/ext/biography/test.php
index 2c908039..d410df72 100644
--- a/ext/biography/test.php
+++ b/ext/biography/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BiographyTest extends ShimmiePHPUnitTestCase
 {
     public function testBio()
diff --git a/ext/biography/theme.php b/ext/biography/theme.php
index 07b6a86a..2aa65b34 100644
--- a/ext/biography/theme.php
+++ b/ext/biography/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\TEXTAREA;
 
 class BiographyTheme extends Themelet
diff --git a/ext/blocks/info.php b/ext/blocks/info.php
index e42066b3..7dca5bd3 100644
--- a/ext/blocks/info.php
+++ b/ext/blocks/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BlocksInfo extends ExtensionInfo
 {
     public const KEY = "blocks";
diff --git a/ext/blocks/main.php b/ext/blocks/main.php
index f278dec0..299a360c 100644
--- a/ext/blocks/main.php
+++ b/ext/blocks/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Blocks extends Extension
 {
     /** @var BlocksTheme */
diff --git a/ext/blocks/test.php b/ext/blocks/test.php
index b30ae863..15677c4f 100644
--- a/ext/blocks/test.php
+++ b/ext/blocks/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BlocksTest extends ShimmiePHPUnitTestCase
 {
     public function testBlocks()
diff --git a/ext/blocks/theme.php b/ext/blocks/theme.php
index c7165889..95073e68 100644
--- a/ext/blocks/theme.php
+++ b/ext/blocks/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\TABLE;
 use function MicroHTML\TR;
 use function MicroHTML\TH;
diff --git a/ext/blotter/info.php b/ext/blotter/info.php
index d00eb9e2..844b3aa2 100644
--- a/ext/blotter/info.php
+++ b/ext/blotter/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BlotterInfo extends ExtensionInfo
 {
     public const KEY = "blotter";
diff --git a/ext/blotter/main.php b/ext/blotter/main.php
index d5f62ea4..a3ca98aa 100644
--- a/ext/blotter/main.php
+++ b/ext/blotter/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Blotter extends Extension
 {
     /** @var BlotterTheme */
diff --git a/ext/blotter/test.php b/ext/blotter/test.php
index 1824a295..4bd3cfdb 100644
--- a/ext/blotter/test.php
+++ b/ext/blotter/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BlotterTest extends ShimmiePHPUnitTestCase
 {
     public function testDenial()
diff --git a/ext/blotter/theme.php b/ext/blotter/theme.php
index 962db12c..67096a94 100644
--- a/ext/blotter/theme.php
+++ b/ext/blotter/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BlotterTheme extends Themelet
 {
     public function display_editor($entries)
diff --git a/ext/browser_search/info.php b/ext/browser_search/info.php
index 8b404ff1..ec07ed65 100644
--- a/ext/browser_search/info.php
+++ b/ext/browser_search/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BrowserSearchInfo extends ExtensionInfo
 {
     public const KEY = "browser_search";
diff --git a/ext/browser_search/main.php b/ext/browser_search/main.php
index 9addbf61..eb71905a 100644
--- a/ext/browser_search/main.php
+++ b/ext/browser_search/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BrowserSearch extends Extension
 {
     public function onInitExt(InitExtEvent $event)
diff --git a/ext/browser_search/test.php b/ext/browser_search/test.php
index 046055a1..3ccd045f 100644
--- a/ext/browser_search/test.php
+++ b/ext/browser_search/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class BrowserSearchTest extends ShimmiePHPUnitTestCase
 {
     public function testBasic()
diff --git a/ext/bulk_actions/info.php b/ext/bulk_actions/info.php
index 3e80e273..b469d2a0 100644
--- a/ext/bulk_actions/info.php
+++ b/ext/bulk_actions/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkActionsInfo extends ExtensionInfo
 {
     public const KEY = "bulk_actions";
diff --git a/ext/bulk_actions/main.php b/ext/bulk_actions/main.php
index 9f3c5587..d922ff79 100644
--- a/ext/bulk_actions/main.php
+++ b/ext/bulk_actions/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkActionException extends SCoreException
 {
 }
@@ -39,10 +41,10 @@ class BulkActionBlockBuildingEvent extends Event
 class BulkActionEvent extends Event
 {
     public string $action;
-    public Generator $items;
+    public \Generator $items;
     public bool $redirect = true;
 
-    public function __construct(String $action, Generator $items)
+    public function __construct(String $action, \Generator $items)
     {
         parent::__construct();
         $this->action = $action;
@@ -201,7 +203,7 @@ class BulkActions extends Extension
         }
     }
 
-    private function yield_items(array $data): Generator
+    private function yield_items(array $data): \Generator
     {
         foreach ($data as $id) {
             if (is_numeric($id)) {
@@ -213,7 +215,7 @@ class BulkActions extends Extension
         }
     }
 
-    private function yield_search_results(string $query): Generator
+    private function yield_search_results(string $query): \Generator
     {
         $tags = Tag::explode($query);
         return Image::find_images_iterable(0, null, $tags);
@@ -231,7 +233,7 @@ class BulkActions extends Extension
         $size = 0;
         foreach ($posts as $post) {
             try {
-                if (class_exists("ImageBan") && isset($_POST['bulk_ban_reason'])) {
+                if (class_exists("Shimmie2\ImageBan") && isset($_POST['bulk_ban_reason'])) {
                     $reason = $_POST['bulk_ban_reason'];
                     if ($reason) {
                         send_event(new AddImageHashBanEvent($post->hash, $reason));
@@ -240,7 +242,7 @@ class BulkActions extends Extension
                 send_event(new ImageDeletionEvent($post));
                 $total++;
                 $size += $post->filesize;
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $page->flash("Error while removing {$post->id}: " . $e->getMessage());
             }
         }
diff --git a/ext/bulk_actions/theme.php b/ext/bulk_actions/theme.php
index e41a9764..d49265c5 100644
--- a/ext/bulk_actions/theme.php
+++ b/ext/bulk_actions/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkActionsTheme extends Themelet
 {
     public function display_selector(Page $page, array $actions, string $query)
@@ -49,7 +51,7 @@ class BulkActionsTheme extends Themelet
 
     public function render_ban_reason_input(): string
     {
-        if (class_exists("ImageBan")) {
+        if (class_exists("Shimmie2\ImageBan")) {
             return "<input type='text' name='bulk_ban_reason' placeholder='Ban reason (leave blank to not ban)' />";
         } else {
             return "";
diff --git a/ext/bulk_add/info.php b/ext/bulk_add/info.php
index dc5cfada..149c1b8e 100644
--- a/ext/bulk_add/info.php
+++ b/ext/bulk_add/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddInfo extends ExtensionInfo
 {
     public const KEY = "bulk_add";
diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index 953b36d7..9aed87dd 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddEvent extends Event
 {
     public string $dir;
diff --git a/ext/bulk_add/test.php b/ext/bulk_add/test.php
index d99eb9b0..78c6e74c 100644
--- a/ext/bulk_add/test.php
+++ b/ext/bulk_add/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddTest extends ShimmiePHPUnitTestCase
 {
     public function testInvalidDir()
diff --git a/ext/bulk_add/theme.php b/ext/bulk_add/theme.php
index cc7135da..6a74b3ef 100644
--- a/ext/bulk_add/theme.php
+++ b/ext/bulk_add/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddTheme extends Themelet
 {
     private array $messages = [];
diff --git a/ext/bulk_add_csv/info.php b/ext/bulk_add_csv/info.php
index 4d13d45a..46d13192 100644
--- a/ext/bulk_add_csv/info.php
+++ b/ext/bulk_add_csv/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddCSVInfo extends ExtensionInfo
 {
     public const KEY = "bulk_add_csv";
diff --git a/ext/bulk_add_csv/main.php b/ext/bulk_add_csv/main.php
index 9ae858e9..31d5b094 100644
--- a/ext/bulk_add_csv/main.php
+++ b/ext/bulk_add_csv/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddCSV extends Extension
 {
     /** @var BulkAddCSVTheme */
@@ -62,7 +64,7 @@ class BulkAddCSV extends Extension
         if ($event->image_id == -1) {
             throw new UploadException("File type not recognised");
         } else {
-            if (class_exists("RatingSetEvent") && in_array($rating, ["s", "q", "e"])) {
+            if (class_exists("Shimmie2\RatingSetEvent") && in_array($rating, ["s", "q", "e"])) {
                 send_event(new RatingSetEvent(Image::by_id($event->image_id), $rating));
             }
             if (file_exists($thumbfile)) {
diff --git a/ext/bulk_add_csv/theme.php b/ext/bulk_add_csv/theme.php
index 0af200e2..2128e5ae 100644
--- a/ext/bulk_add_csv/theme.php
+++ b/ext/bulk_add_csv/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkAddCSVTheme extends Themelet
 {
     private array $messages = [];
diff --git a/ext/bulk_download/info.php b/ext/bulk_download/info.php
index 02745855..d5260459 100644
--- a/ext/bulk_download/info.php
+++ b/ext/bulk_download/info.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class BulkDownloadInfo extends ExtensionInfo
 {
diff --git a/ext/bulk_download/main.php b/ext/bulk_download/main.php
index 34eddfa6..9d465393 100644
--- a/ext/bulk_download/main.php
+++ b/ext/bulk_download/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkDownloadConfig
 {
     public const SIZE_LIMIT = "bulk_download_size_limit";
diff --git a/ext/bulk_import_export/events.php b/ext/bulk_import_export/events.php
index 7a4d2c7a..89b4b00c 100644
--- a/ext/bulk_import_export/events.php
+++ b/ext/bulk_import_export/events.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class BulkExportEvent extends Event
 {
     public Image $image;
diff --git a/ext/bulk_import_export/info.php b/ext/bulk_import_export/info.php
index 78ebaf1d..6ad951b0 100644
--- a/ext/bulk_import_export/info.php
+++ b/ext/bulk_import_export/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 include_once "events.php";
 
 class BulkImportExportInfo extends ExtensionInfo
diff --git a/ext/bulk_import_export/main.php b/ext/bulk_import_export/main.php
index 65d433a9..ef9be4b8 100644
--- a/ext/bulk_import_export/main.php
+++ b/ext/bulk_import_export/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class BulkImportExport extends DataHandlerExtension
 {
diff --git a/ext/comment/info.php b/ext/comment/info.php
index d3fd5951..840aae94 100644
--- a/ext/comment/info.php
+++ b/ext/comment/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CommentListInfo extends ExtensionInfo
 {
     public const KEY = "comment";
diff --git a/ext/comment/main.php b/ext/comment/main.php
index d275eabd..0fc0aadf 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "vendor/ifixit/php-akismet/akismet.class.php";
 
 class CommentPostingEvent extends Event
diff --git a/ext/comment/test.php b/ext/comment/test.php
index 0c60f0c0..4bafa098 100644
--- a/ext/comment/test.php
+++ b/ext/comment/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class CommentListTest extends ShimmiePHPUnitTestCase
 {
     public function setUp(): void
diff --git a/ext/comment/theme.php b/ext/comment/theme.php
index 9aeec637..d212ece0 100644
--- a/ext/comment/theme.php
+++ b/ext/comment/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class CommentListTheme extends Themelet
 {
     private bool $show_anon_id = false;
diff --git a/ext/cron_uploader/config.php b/ext/cron_uploader/config.php
index f6b37e88..1c827049 100644
--- a/ext/cron_uploader/config.php
+++ b/ext/cron_uploader/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 abstract class CronUploaderConfig
 {
diff --git a/ext/cron_uploader/info.php b/ext/cron_uploader/info.php
index 63379559..45d1635f 100644
--- a/ext/cron_uploader/info.php
+++ b/ext/cron_uploader/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * Name: Cron Uploader
  * Authors: YaoiFox <admin@yaoifox.com>, Matthew Barbour <matthew@darkholme.net>
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index df0cb729..6144f5f4 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 
 class CronUploader extends Extension
@@ -382,12 +384,12 @@ class CronUploader extends Extension
                     } else {
                         $added++;
                     }
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     try {
                         if ($database->is_transaction_open()) {
                             $database->rollback();
                         }
-                    } catch (Exception $e) {
+                    } catch (\Exception $e) {
                     }
 
                     $failed++;
@@ -527,7 +529,7 @@ class CronUploader extends Extension
         return false;
     }
 
-    private function generate_image_queue(string $root_dir, ?int $limit = null): Generator
+    private function generate_image_queue(string $root_dir, ?int $limit = null): \Generator
     {
         $base = $this->get_queue_dir();
 
@@ -536,8 +538,8 @@ class CronUploader extends Extension
             return;
         }
 
-        $ite = new RecursiveDirectoryIterator($base, FilesystemIterator::SKIP_DOTS);
-        foreach (new RecursiveIteratorIterator($ite) as $fullpath => $cur) {
+        $ite = new \RecursiveDirectoryIterator($base, \FilesystemIterator::SKIP_DOTS);
+        foreach (new \RecursiveIteratorIterator($ite) as $fullpath => $cur) {
             if (!is_link($fullpath) && !is_dir($fullpath) && !$this->is_skippable_file($fullpath)) {
                 $pathinfo = pathinfo($fullpath);
 
diff --git a/ext/cron_uploader/theme.php b/ext/cron_uploader/theme.php
index 43d218ee..6ba6f395 100644
--- a/ext/cron_uploader/theme.php
+++ b/ext/cron_uploader/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use function MicroHTML\LABEL;
 use function MicroHTML\TABLE;
 use function MicroHTML\TBODY;
diff --git a/ext/custom_html_headers/info.php b/ext/custom_html_headers/info.php
index 1db8441d..0c75d190 100644
--- a/ext/custom_html_headers/info.php
+++ b/ext/custom_html_headers/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomHtmlHeadersInfo extends ExtensionInfo
 {
     public const KEY = "custom_html_headers";
diff --git a/ext/custom_html_headers/main.php b/ext/custom_html_headers/main.php
index d48a43e2..0cabae53 100644
--- a/ext/custom_html_headers/main.php
+++ b/ext/custom_html_headers/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomHtmlHeaders extends Extension
 {
     # Adds setup block for custom <head> content
diff --git a/ext/danbooru_api/info.php b/ext/danbooru_api/info.php
index c8a8b8ce..10113a91 100644
--- a/ext/danbooru_api/info.php
+++ b/ext/danbooru_api/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class DanbooruApiInfo extends ExtensionInfo
 {
     public const KEY = "danbooru_api";
diff --git a/ext/danbooru_api/main.php b/ext/danbooru_api/main.php
index ee8cc36f..9f0a84f8 100644
--- a/ext/danbooru_api/main.php
+++ b/ext/danbooru_api/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 function TAGS(...$args): HTMLElement
diff --git a/ext/danbooru_api/test.php b/ext/danbooru_api/test.php
index aa36c167..5a9da84a 100644
--- a/ext/danbooru_api/test.php
+++ b/ext/danbooru_api/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class DanbooruApiTest extends ShimmiePHPUnitTestCase
 {
     public function testSearch()
diff --git a/ext/download/events.php b/ext/download/events.php
index 51804543..0f5e1bb6 100644
--- a/ext/download/events.php
+++ b/ext/download/events.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageDownloadingEvent extends Event
 {
     public Image $image;
diff --git a/ext/download/info.php b/ext/download/info.php
index f6f56dba..4eb22416 100644
--- a/ext/download/info.php
+++ b/ext/download/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class DownloadInfo extends ExtensionInfo
 {
     public const KEY = "download";
diff --git a/ext/download/main.php b/ext/download/main.php
index feb1a409..52f42888 100644
--- a/ext/download/main.php
+++ b/ext/download/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "events.php";
 
 class Download extends Extension
diff --git a/ext/downtime/info.php b/ext/downtime/info.php
index 2ab7f9c8..c02ce4a7 100644
--- a/ext/downtime/info.php
+++ b/ext/downtime/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class DowntimeInfo extends ExtensionInfo
 {
     public const KEY = "downtime";
diff --git a/ext/downtime/main.php b/ext/downtime/main.php
index ed0f2ddc..b42b1b74 100644
--- a/ext/downtime/main.php
+++ b/ext/downtime/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Downtime extends Extension
 {
     /** @var DowntimeTheme */
diff --git a/ext/downtime/test.php b/ext/downtime/test.php
index 6399f8be..d27638b9 100644
--- a/ext/downtime/test.php
+++ b/ext/downtime/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class DowntimeTest extends ShimmiePHPUnitTestCase
 {
     public function tearDown(): void
diff --git a/ext/downtime/theme.php b/ext/downtime/theme.php
index ca77af35..6876eaf6 100644
--- a/ext/downtime/theme.php
+++ b/ext/downtime/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class DowntimeTheme extends Themelet
 {
     /**
diff --git a/ext/emoticons/info.php b/ext/emoticons/info.php
index 8f4aa474..2dd054f8 100644
--- a/ext/emoticons/info.php
+++ b/ext/emoticons/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class EmoticonsInfo extends ExtensionInfo
 {
     public const KEY = "emoticons";
diff --git a/ext/emoticons/main.php b/ext/emoticons/main.php
index d84de249..2f8d4702 100644
--- a/ext/emoticons/main.php
+++ b/ext/emoticons/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 /**
  * Class Emoticons
diff --git a/ext/emoticons/test.php b/ext/emoticons/test.php
index 2fb1196e..0bcd20ee 100644
--- a/ext/emoticons/test.php
+++ b/ext/emoticons/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class EmoticonsTest extends ShimmiePHPUnitTestCase
 {
     public function testEmoticons()
diff --git a/ext/emoticons_list/info.php b/ext/emoticons_list/info.php
index e3d41392..87717a60 100644
--- a/ext/emoticons_list/info.php
+++ b/ext/emoticons_list/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class EmoticonListInfo extends ExtensionInfo
 {
     public const KEY = "emoticons_list";
diff --git a/ext/emoticons_list/main.php b/ext/emoticons_list/main.php
index 0c486f13..12d660a4 100644
--- a/ext/emoticons_list/main.php
+++ b/ext/emoticons_list/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class EmoticonList
  */
diff --git a/ext/emoticons_list/theme.php b/ext/emoticons_list/theme.php
index 26f1e889..d545e03e 100644
--- a/ext/emoticons_list/theme.php
+++ b/ext/emoticons_list/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class EmoticonListTheme extends Themelet
 {
     public function display_emotes(array $list)
diff --git a/ext/eokm/info.php b/ext/eokm/info.php
index 254cdd94..673415b6 100644
--- a/ext/eokm/info.php
+++ b/ext/eokm/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class EokmInfo extends ExtensionInfo
 {
     public const KEY = "eokm";
diff --git a/ext/eokm/main.php b/ext/eokm/main.php
index 767679a1..83b98f32 100644
--- a/ext/eokm/main.php
+++ b/ext/eokm/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Eokm extends Extension
 {
     public function get_priority(): int
diff --git a/ext/eokm/test.php b/ext/eokm/test.php
index 96fee799..b71e45e1 100644
--- a/ext/eokm/test.php
+++ b/ext/eokm/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class EokmTest extends ShimmiePHPUnitTestCase
 {
     public function testPass()
diff --git a/ext/et/info.php b/ext/et/info.php
index b2fcdef7..e641eee8 100644
--- a/ext/et/info.php
+++ b/ext/et/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ETInfo extends ExtensionInfo
 {
     public const KEY = "et";
diff --git a/ext/et/main.php b/ext/et/main.php
index d205d948..f8288757 100644
--- a/ext/et/main.php
+++ b/ext/et/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ET extends Extension
 {
     /** @var ETTheme */
diff --git a/ext/et/test.php b/ext/et/test.php
index e2cdeeb0..8e94f525 100644
--- a/ext/et/test.php
+++ b/ext/et/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ETTest extends ShimmiePHPUnitTestCase
 {
     public function testET()
diff --git a/ext/et/theme.php b/ext/et/theme.php
index 9bf01788..089175b4 100644
--- a/ext/et/theme.php
+++ b/ext/et/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use function MicroHTML\FORM;
 use function MicroHTML\INPUT;
 use function MicroHTML\P;
diff --git a/ext/et_server/info.php b/ext/et_server/info.php
index 0fd0e371..d5ad2aac 100644
--- a/ext/et_server/info.php
+++ b/ext/et_server/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ETServerInfo extends ExtensionInfo
 {
     public const KEY = "et_server";
diff --git a/ext/et_server/main.php b/ext/et_server/main.php
index 5232173d..2c3f2762 100644
--- a/ext/et_server/main.php
+++ b/ext/et_server/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use function MicroHTML\{PRE};
 
 class ETServer extends Extension
diff --git a/ext/ext_manager/info.php b/ext/ext_manager/info.php
index e812694d..78ffba3a 100644
--- a/ext/ext_manager/info.php
+++ b/ext/ext_manager/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ExtManagerInfo extends ExtensionInfo
 {
     public const KEY = "ext_manager";
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 33958352..2fa7d5db 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b): int
 {
@@ -115,9 +116,9 @@ class ExtManager extends Extension
     {
         $extensions = ExtensionInfo::get_all();
         if (!$all) {
-            $extensions = array_filter($extensions, "__extman_extactive");
+            $extensions = array_filter($extensions, "Shimmie2\__extman_extactive");
         }
-        usort($extensions, "__extman_extcmp");
+        usort($extensions, "Shimmie2\__extman_extcmp");
         return $extensions;
     }
 
diff --git a/ext/ext_manager/test.php b/ext/ext_manager/test.php
index 4ac9d0fb..acb56b77 100644
--- a/ext/ext_manager/test.php
+++ b/ext/ext_manager/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ExtManagerTest extends ShimmiePHPUnitTestCase
 {
     public function testAuth()
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 6eb183db..ddc01bc5 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use function MicroHTML\LABEL;
 use function MicroHTML\A;
 use function MicroHTML\B;
diff --git a/ext/favorites/info.php b/ext/favorites/info.php
index b33c7fb0..d0db6ae5 100644
--- a/ext/favorites/info.php
+++ b/ext/favorites/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FavoritesInfo extends ExtensionInfo
 {
     public const KEY = "favorites";
diff --git a/ext/favorites/main.php b/ext/favorites/main.php
index 375fdf4a..8a6e72f9 100644
--- a/ext/favorites/main.php
+++ b/ext/favorites/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FavoriteSetEvent extends Event
 {
     public int $image_id;
diff --git a/ext/favorites/test.php b/ext/favorites/test.php
index 8b38926c..ed1247bc 100644
--- a/ext/favorites/test.php
+++ b/ext/favorites/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class FavoritesTest extends ShimmiePHPUnitTestCase
 {
     public function testFavorites()
diff --git a/ext/favorites/theme.php b/ext/favorites/theme.php
index 4499f81e..c8fb5216 100644
--- a/ext/favorites/theme.php
+++ b/ext/favorites/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 use function MicroHTML\INPUT;
diff --git a/ext/featured/info.php b/ext/featured/info.php
index 396d9783..15b46d8b 100644
--- a/ext/featured/info.php
+++ b/ext/featured/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FeaturedInfo extends ExtensionInfo
 {
     public const KEY = "featured";
diff --git a/ext/featured/main.php b/ext/featured/main.php
index 40bee1c3..7351edbb 100644
--- a/ext/featured/main.php
+++ b/ext/featured/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Featured extends Extension
 {
     /** @var FeaturedTheme */
diff --git a/ext/featured/test.php b/ext/featured/test.php
index ee27be17..ef0c4119 100644
--- a/ext/featured/test.php
+++ b/ext/featured/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class FeaturedTest extends ShimmiePHPUnitTestCase
 {
     public function testFeatured()
diff --git a/ext/featured/theme.php b/ext/featured/theme.php
index 298eff06..dcca6283 100644
--- a/ext/featured/theme.php
+++ b/ext/featured/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 use function MicroHTML\DIV;
 use function MicroHTML\A;
diff --git a/ext/forum/info.php b/ext/forum/info.php
index 9e2d4e34..09021550 100644
--- a/ext/forum/info.php
+++ b/ext/forum/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ForumInfo extends ExtensionInfo
 {
     public const KEY = "forum";
diff --git a/ext/forum/main.php b/ext/forum/main.php
index 79c1026b..3e5914ee 100644
--- a/ext/forum/main.php
+++ b/ext/forum/main.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /*
 Todo:
 *Quote buttons on posts
diff --git a/ext/forum/theme.php b/ext/forum/theme.php
index f3c316b2..302221f7 100644
--- a/ext/forum/theme.php
+++ b/ext/forum/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ForumTheme extends Themelet
 {
     public function display_thread_list(Page $page, $threads, $showAdminOptions, $pageNumber, $totalPages)
diff --git a/ext/four_oh_four/info.php b/ext/four_oh_four/info.php
index f1c2c39a..e40a5ffe 100644
--- a/ext/four_oh_four/info.php
+++ b/ext/four_oh_four/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FourOhFourInfo extends ExtensionInfo
 {
     public const KEY = "four_oh_four";
diff --git a/ext/four_oh_four/main.php b/ext/four_oh_four/main.php
index 241a2967..836c8f24 100644
--- a/ext/four_oh_four/main.php
+++ b/ext/four_oh_four/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FourOhFour extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/four_oh_four/test.php b/ext/four_oh_four/test.php
index a6f2a1a1..5c71a839 100644
--- a/ext/four_oh_four/test.php
+++ b/ext/four_oh_four/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FourOhFourTest extends ShimmiePHPUnitTestCase
 {
     public function test404Handler()
diff --git a/ext/google_analytics/info.php b/ext/google_analytics/info.php
index e0c4401a..af4f5c9d 100644
--- a/ext/google_analytics/info.php
+++ b/ext/google_analytics/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class GoogleAnalyticsInfo extends ExtensionInfo
 {
     public const KEY = "google_analytics";
diff --git a/ext/google_analytics/main.php b/ext/google_analytics/main.php
index 410ff0b4..a9759374 100644
--- a/ext/google_analytics/main.php
+++ b/ext/google_analytics/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class GoogleAnalytics extends Extension
 {
     # Add analytics to config
diff --git a/ext/handle_archive/info.php b/ext/handle_archive/info.php
index 35ca10a3..b5c315da 100644
--- a/ext/handle_archive/info.php
+++ b/ext/handle_archive/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ArchiveFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_archive";
diff --git a/ext/handle_archive/main.php b/ext/handle_archive/main.php
index 0117f8f4..a975643b 100644
--- a/ext/handle_archive/main.php
+++ b/ext/handle_archive/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ArchiveFileHandler extends DataHandlerExtension
 {
     protected array $SUPPORTED_MIME = [MimeType::ZIP];
diff --git a/ext/handle_cbz/info.php b/ext/handle_cbz/info.php
index a8b07a36..2ffb4fb8 100644
--- a/ext/handle_cbz/info.php
+++ b/ext/handle_cbz/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CBZFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_cbz";
diff --git a/ext/handle_cbz/main.php b/ext/handle_cbz/main.php
index c1508bba..879d47f0 100644
--- a/ext/handle_cbz/main.php
+++ b/ext/handle_cbz/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CBZFileHandler extends DataHandlerExtension
 {
     protected array $SUPPORTED_MIME = [MimeType::COMIC_ZIP];
diff --git a/ext/handle_cbz/theme.php b/ext/handle_cbz/theme.php
index 65115329..ce574a8f 100644
--- a/ext/handle_cbz/theme.php
+++ b/ext/handle_cbz/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CBZFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_flash/info.php b/ext/handle_flash/info.php
index a33c4b98..24f36c39 100644
--- a/ext/handle_flash/info.php
+++ b/ext/handle_flash/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FlashFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_flash";
diff --git a/ext/handle_flash/main.php b/ext/handle_flash/main.php
index 9a8ea390..d0ab7127 100644
--- a/ext/handle_flash/main.php
+++ b/ext/handle_flash/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FlashFileHandler extends DataHandlerExtension
 {
     protected array $SUPPORTED_MIME = [MimeType::FLASH];
diff --git a/ext/handle_flash/theme.php b/ext/handle_flash/theme.php
index 369420f9..9e2c799f 100644
--- a/ext/handle_flash/theme.php
+++ b/ext/handle_flash/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FlashFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_ico/info.php b/ext/handle_ico/info.php
index 6c6c4a54..874c0895 100644
--- a/ext/handle_ico/info.php
+++ b/ext/handle_ico/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IcoFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_ico";
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 38f2b874..9a3cf255 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IcoFileHandler extends DataHandlerExtension
 {
     protected array $SUPPORTED_MIME = [MimeType::ICO, MimeType::ANI, MimeType::WIN_BITMAP, MimeType::ICO_OSX];
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index f576a14c..9e108112 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class IcoFileHandlerTest extends ShimmiePHPUnitTestCase
 {
     public function testIcoHander()
diff --git a/ext/handle_ico/theme.php b/ext/handle_ico/theme.php
index acc660ef..81f6c74f 100644
--- a/ext/handle_ico/theme.php
+++ b/ext/handle_ico/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IcoFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_mp3/info.php b/ext/handle_mp3/info.php
index da6a10f5..bd664103 100644
--- a/ext/handle_mp3/info.php
+++ b/ext/handle_mp3/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MP3FileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_mp3";
diff --git a/ext/handle_mp3/main.php b/ext/handle_mp3/main.php
index 2bed69d4..e9729663 100644
--- a/ext/handle_mp3/main.php
+++ b/ext/handle_mp3/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // TODO: Add support for generating an icon from embedded cover art
 // TODO: MORE AUDIO FORMATS
 
diff --git a/ext/handle_mp3/theme.php b/ext/handle_mp3/theme.php
index d59ff434..769d187d 100644
--- a/ext/handle_mp3/theme.php
+++ b/ext/handle_mp3/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MP3FileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_pixel/info.php b/ext/handle_pixel/info.php
index 53cf62b7..7be05f6d 100644
--- a/ext/handle_pixel/info.php
+++ b/ext/handle_pixel/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PixelFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_pixel";
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 8d0e2cc9..3c4d33b4 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PixelFileHandler extends DataHandlerExtension
 {
     protected array $SUPPORTED_MIME = [MimeType::JPEG, MimeType::GIF, MimeType::PNG, MimeType::WEBP];
diff --git a/ext/handle_pixel/test.php b/ext/handle_pixel/test.php
index 0e8f8f6c..0b12a459 100644
--- a/ext/handle_pixel/test.php
+++ b/ext/handle_pixel/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class PixelFileHandlerTest extends ShimmiePHPUnitTestCase
 {
     public function testPixelHander()
diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php
index 6505ac88..3bf5b302 100644
--- a/ext/handle_pixel/theme.php
+++ b/ext/handle_pixel/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PixelFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_svg/info.php b/ext/handle_svg/info.php
index d53bd983..8d3bdffa 100644
--- a/ext/handle_svg/info.php
+++ b/ext/handle_svg/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SVGFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_svg";
diff --git a/ext/handle_svg/main.php b/ext/handle_svg/main.php
index 35ad81ed..0e6ae9c7 100644
--- a/ext/handle_svg/main.php
+++ b/ext/handle_svg/main.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use enshrined\svgSanitize\Sanitizer;
 
 class SVGFileHandler extends DataHandlerExtension
diff --git a/ext/handle_svg/test.php b/ext/handle_svg/test.php
index 74155544..7a2660e8 100644
--- a/ext/handle_svg/test.php
+++ b/ext/handle_svg/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class SVGFileHandlerTest extends ShimmiePHPUnitTestCase
 {
     public function testSVGHander()
diff --git a/ext/handle_svg/theme.php b/ext/handle_svg/theme.php
index 0fc57974..37557581 100644
--- a/ext/handle_svg/theme.php
+++ b/ext/handle_svg/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SVGFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/handle_video/info.php b/ext/handle_video/info.php
index ec035c36..d200f785 100644
--- a/ext/handle_video/info.php
+++ b/ext/handle_video/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class VideoFileHandlerInfo extends ExtensionInfo
 {
     public const KEY = "handle_video";
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 188c4c88..49e73160 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class VideoFileHandlerConfig
 {
     public const PLAYBACK_AUTOPLAY = "video_playback_autoplay";
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index 8866b997..87453343 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class VideoFileHandlerTheme extends Themelet
 {
     public function display_image(Page $page, Image $image)
diff --git a/ext/hellban/info.php b/ext/hellban/info.php
index fcb484a7..12a3caaa 100644
--- a/ext/hellban/info.php
+++ b/ext/hellban/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * Name: [Beta] Hellban
  */
diff --git a/ext/hellban/main.php b/ext/hellban/main.php
index 194a9cdb..abcfc9af 100644
--- a/ext/hellban/main.php
+++ b/ext/hellban/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HellBan extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/help_pages/info.php b/ext/help_pages/info.php
index 17b62b25..e01c44ae 100644
--- a/ext/help_pages/info.php
+++ b/ext/help_pages/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HelpPagesInfo extends ExtensionInfo
 {
     public const KEY = "help_pages";
diff --git a/ext/help_pages/main.php b/ext/help_pages/main.php
index 4d6312e2..28519599 100644
--- a/ext/help_pages/main.php
+++ b/ext/help_pages/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HelpPageListBuildingEvent extends Event
 {
     public array $pages = [];
diff --git a/ext/help_pages/test.php b/ext/help_pages/test.php
index eeab5076..80a5de59 100644
--- a/ext/help_pages/test.php
+++ b/ext/help_pages/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HelpPagesTest extends ShimmiePHPUnitTestCase
 {
     public function test_list()
diff --git a/ext/help_pages/theme.php b/ext/help_pages/theme.php
index 11d37af6..6e946e9e 100644
--- a/ext/help_pages/theme.php
+++ b/ext/help_pages/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HelpPagesTheme extends Themelet
 {
     public function display_list_page(array $pages)
diff --git a/ext/holiday/info.php b/ext/holiday/info.php
index e32dad0d..a1963a04 100644
--- a/ext/holiday/info.php
+++ b/ext/holiday/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HolidayInfo extends ExtensionInfo
 {
     public const KEY = "holiday";
diff --git a/ext/holiday/main.php b/ext/holiday/main.php
index d429a6be..8dd450c2 100644
--- a/ext/holiday/main.php
+++ b/ext/holiday/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Holiday extends Extension
 {
     /** @var HolidayTheme */
diff --git a/ext/holiday/theme.php b/ext/holiday/theme.php
index 060287b7..762e0b99 100644
--- a/ext/holiday/theme.php
+++ b/ext/holiday/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class HolidayTheme extends Themelet
 {
     public function display_holiday(?string $holiday)
diff --git a/ext/home/info.php b/ext/home/info.php
index dc244cbe..e0b3a6cd 100644
--- a/ext/home/info.php
+++ b/ext/home/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HomeInfo extends ExtensionInfo
 {
     public const KEY = "home";
diff --git a/ext/home/main.php b/ext/home/main.php
index 8c00c499..4a4fe5d4 100644
--- a/ext/home/main.php
+++ b/ext/home/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Home extends Extension
 {
     /** @var HomeTheme */
@@ -64,10 +66,10 @@ class Home extends Extension
             $main_links = $config->get_string('home_links');
         } else {
             $main_links = '[url=site://post/list]Posts[/url][url=site://comment/list]Comments[/url][url=site://tags]Tags[/url]';
-            if (class_exists("Pools")) {
+            if (class_exists("Shimmie2\Pools")) {
                 $main_links .= '[url=site://pool/list]Pools[/url]';
             }
-            if (class_exists("Wiki")) {
+            if (class_exists("Shimmie2\Wiki")) {
                 $main_links .= '[url=site://wiki]Wiki[/url]';
             }
             $main_links .= '[url=site://ext_doc]Documentation[/url]';
diff --git a/ext/home/test.php b/ext/home/test.php
index bb5621c3..3dece097 100644
--- a/ext/home/test.php
+++ b/ext/home/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class HomeTest extends ShimmiePHPUnitTestCase
 {
     public function testHomePage()
diff --git a/ext/home/theme.php b/ext/home/theme.php
index 0d2e5e79..009783d6 100644
--- a/ext/home/theme.php
+++ b/ext/home/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class HomeTheme extends Themelet
 {
     public function display_page(Page $page, string $sitename, string $base_href, string $theme_name, string $body): void
diff --git a/ext/image/config.php b/ext/image/config.php
index b4a332db..7f031131 100644
--- a/ext/image/config.php
+++ b/ext/image/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class ImageConfig
 {
     public const VERSION =          'ext_image_version';
diff --git a/ext/image/info.php b/ext/image/info.php
index 13f4a6db..8d9b7ba6 100644
--- a/ext/image/info.php
+++ b/ext/image/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageIOInfo extends ExtensionInfo
 {
     public const KEY = "image";
diff --git a/ext/image/main.php b/ext/image/main.php
index aff6e6c8..cb6db534 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 
 /**
diff --git a/ext/image/test.php b/ext/image/test.php
index f7ec23f8..881d56a3 100644
--- a/ext/image/test.php
+++ b/ext/image/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ImageIOTest extends ShimmiePHPUnitTestCase
 {
     public function testUserStats()
diff --git a/ext/image/theme.php b/ext/image/theme.php
index b64b6495..3a016fc7 100644
--- a/ext/image/theme.php
+++ b/ext/image/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class ImageIOTheme extends Themelet
diff --git a/ext/image_hash_ban/info.php b/ext/image_hash_ban/info.php
index fed70657..339fa5ce 100644
--- a/ext/image_hash_ban/info.php
+++ b/ext/image_hash_ban/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageBanInfo extends ExtensionInfo
 {
     public const KEY = "image_hash_ban";
diff --git a/ext/image_hash_ban/main.php b/ext/image_hash_ban/main.php
index 136c2bfb..2b3d302d 100644
--- a/ext/image_hash_ban/main.php
+++ b/ext/image_hash_ban/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroCRUD\ActionColumn;
 use MicroCRUD\StringColumn;
 use MicroCRUD\DateColumn;
diff --git a/ext/image_hash_ban/test.php b/ext/image_hash_ban/test.php
index 2428ecb0..c70ca147 100644
--- a/ext/image_hash_ban/test.php
+++ b/ext/image_hash_ban/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ImageBanTest extends ShimmiePHPUnitTestCase
 {
     private string $hash = "feb01bab5698a11dd87416724c7a89e3";
@@ -46,7 +49,7 @@ class ImageBanTest extends ShimmiePHPUnitTestCase
         $this->assertEquals(200, $page->code);
     }
 
-    public function onNotSuccessfulTest(Throwable $t): void
+    public function onNotSuccessfulTest(\Throwable $t): void
     {
         send_event(new RemoveImageHashBanEvent($this->hash));
         parent::onNotSuccessfulTest($t); // TODO: Change the autogenerated stub
diff --git a/ext/image_hash_ban/theme.php b/ext/image_hash_ban/theme.php
index 426e841c..723d197a 100644
--- a/ext/image_hash_ban/theme.php
+++ b/ext/image_hash_ban/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class ImageBanTheme extends Themelet
diff --git a/ext/image_view_counter/info.php b/ext/image_view_counter/info.php
index f2b6009d..7a4a42f4 100644
--- a/ext/image_view_counter/info.php
+++ b/ext/image_view_counter/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageViewCounterInfo extends ExtensionInfo
 {
     public const KEY = "image_view_counter";
diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
index 415025b4..90ff6f7d 100644
--- a/ext/image_view_counter/main.php
+++ b/ext/image_view_counter/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageViewCounter extends Extension
 {
     protected ?Themelet $theme;
diff --git a/ext/image_view_counter/theme.php b/ext/image_view_counter/theme.php
index 5b97eb49..d6c07f34 100644
--- a/ext/image_view_counter/theme.php
+++ b/ext/image_view_counter/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageViewCounterTheme extends Themelet
 {
     public function view_popular($images)
diff --git a/ext/index/config.php b/ext/index/config.php
index e9244df6..7ba35a02 100644
--- a/ext/index/config.php
+++ b/ext/index/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class IndexConfig
 {
diff --git a/ext/index/events.php b/ext/index/events.php
index f00dc63d..35268381 100644
--- a/ext/index/events.php
+++ b/ext/index/events.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * SearchTermParseEvent:
  * Signal that a search term needs parsing
diff --git a/ext/index/info.php b/ext/index/info.php
index ca3f79f6..39df843d 100644
--- a/ext/index/info.php
+++ b/ext/index/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IndexInfo extends ExtensionInfo
 {
     public const KEY = "index";
diff --git a/ext/index/main.php b/ext/index/main.php
index 11ccd453..97286e57 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 require_once "events.php";
 
diff --git a/ext/index/test.php b/ext/index/test.php
index 5f2229eb..84f1ab9f 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class IndexTest extends ShimmiePHPUnitTestCase
 {
     public function testIndexPage()
diff --git a/ext/index/theme.php b/ext/index/theme.php
index 36ec6a38..cf45bd24 100644
--- a/ext/index/theme.php
+++ b/ext/index/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IndexTheme extends Themelet
 {
     protected int $page_number;
@@ -110,7 +112,7 @@ and of course start organising your images :-)
     {
         global $config;
 
-        if (class_exists('Wiki') && $config->get_bool(WikiConfig::TAG_SHORTWIKIS)) {
+        if (class_exists('Shimmie2\Wiki') && $config->get_bool(WikiConfig::TAG_SHORTWIKIS)) {
             if (count($this->search_terms) == 1) {
                 $st = Tag::implode($this->search_terms);
 
@@ -125,7 +127,7 @@ and of course start organising your images :-)
                     $short_wiki_description = $tfe->formatted;
                 }
                 $wikiLink = make_link("wiki/$st");
-                if (class_exists('TagCategories')) {
+                if (class_exists('Shimmie2\TagCategories')) {
                     $this->tagcategories = new TagCategories();
                     $tag_category_dict = $this->tagcategories->getKeyedDict();
                     $st = $this->tagcategories->getTagHtml(html_escape($st), $tag_category_dict);
diff --git a/ext/ipban/info.php b/ext/ipban/info.php
index 1c10f540..740e3915 100644
--- a/ext/ipban/info.php
+++ b/ext/ipban/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IPBanInfo extends ExtensionInfo
 {
     public const KEY = "ipban";
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index 90a14e2f..24795c81 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroCRUD\ActionColumn;
 use MicroCRUD\InetColumn;
 use MicroCRUD\StringColumn;
diff --git a/ext/ipban/test.php b/ext/ipban/test.php
index bc2c2765..4dbb9f1e 100644
--- a/ext/ipban/test.php
+++ b/ext/ipban/test.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IPBanTest extends ShimmiePHPUnitTestCase
 {
     # FIXME: test that the IP is actually banned
diff --git a/ext/ipban/theme.php b/ext/ipban/theme.php
index 392b0929..996b40a7 100644
--- a/ext/ipban/theme.php
+++ b/ext/ipban/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class IPBanTheme extends Themelet
 {
     public function display_bans(Page $page, $table, $paginator)
diff --git a/ext/link_image/info.php b/ext/link_image/info.php
index d87e3598..c0cedfe5 100644
--- a/ext/link_image/info.php
+++ b/ext/link_image/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LinkImageInfo extends ExtensionInfo
 {
     public const KEY = "link_image";
diff --git a/ext/link_image/main.php b/ext/link_image/main.php
index 17033c96..315ed858 100644
--- a/ext/link_image/main.php
+++ b/ext/link_image/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LinkImage extends Extension
 {
     /** @var LinkImageTheme */
diff --git a/ext/link_image/test.php b/ext/link_image/test.php
index 7d2a1b04..3f9d78c3 100644
--- a/ext/link_image/test.php
+++ b/ext/link_image/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class LinkImageTest extends ShimmiePHPUnitTestCase
 {
     public function testLinkImage()
diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php
index 9ed66b2a..6491de24 100644
--- a/ext/link_image/theme.php
+++ b/ext/link_image/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class LinkImageTheme extends Themelet
 {
     public function links_block(Page $page, $data)
diff --git a/ext/livefeed/info.php b/ext/livefeed/info.php
index 47db6179..2d52939c 100644
--- a/ext/livefeed/info.php
+++ b/ext/livefeed/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LiveFeedInfo extends ExtensionInfo
 {
     public const KEY = "livefeed";
diff --git a/ext/livefeed/main.php b/ext/livefeed/main.php
index 2a293c90..8bdd5b36 100644
--- a/ext/livefeed/main.php
+++ b/ext/livefeed/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LiveFeed extends Extension
 {
     public function onSetupBuilding(SetupBuildingEvent $event)
diff --git a/ext/log_db/info.php b/ext/log_db/info.php
index bf0d15a8..0b0eeeb2 100644
--- a/ext/log_db/info.php
+++ b/ext/log_db/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogDatabaseInfo extends ExtensionInfo
 {
     public const KEY = "log_db";
diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index 88e02bbc..6af1abe9 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 use MicroCRUD\ActionColumn;
 use MicroCRUD\Column;
diff --git a/ext/log_db/test.php b/ext/log_db/test.php
index 04a50040..6185d4c6 100644
--- a/ext/log_db/test.php
+++ b/ext/log_db/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class LogDatabaseTest extends ShimmiePHPUnitTestCase
 {
     public function testLog()
diff --git a/ext/log_db/theme.php b/ext/log_db/theme.php
index ee8555ea..fa12da1b 100644
--- a/ext/log_db/theme.php
+++ b/ext/log_db/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogDatabaseTheme extends Themelet
 {
     public function display_events($table, $paginator)
diff --git a/ext/log_logstash/info.php b/ext/log_logstash/info.php
index d40617ff..e71d9c35 100644
--- a/ext/log_logstash/info.php
+++ b/ext/log_logstash/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogLogstashInfo extends ExtensionInfo
 {
     public const KEY = "log_logstash";
diff --git a/ext/log_logstash/main.php b/ext/log_logstash/main.php
index db7c5012..47f051bb 100644
--- a/ext/log_logstash/main.php
+++ b/ext/log_logstash/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogLogstash extends Extension
 {
     public function onLog(LogEvent $event)
diff --git a/ext/log_net/info.php b/ext/log_net/info.php
index 8f42c155..dca447e3 100644
--- a/ext/log_net/info.php
+++ b/ext/log_net/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogNetInfo extends ExtensionInfo
 {
     public const KEY = "log_net";
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index b5b4d90a..d998dcc7 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class LogNet extends Extension
 {
     private int $count = 0;
diff --git a/ext/media/config.php b/ext/media/config.php
index 3b795fa2..7427aded 100644
--- a/ext/media/config.php
+++ b/ext/media/config.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 abstract class MediaConfig
 {
     public const FFMPEG_PATH = "media_ffmpeg_path";
diff --git a/ext/media/events.php b/ext/media/events.php
index 51a6a22d..0ea62c3b 100644
--- a/ext/media/events.php
+++ b/ext/media/events.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MediaResizeEvent extends Event
 {
     public string $engine;
diff --git a/ext/media/info.php b/ext/media/info.php
index 9a025afd..5490639e 100644
--- a/ext/media/info.php
+++ b/ext/media/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MediaInfo extends ExtensionInfo
 {
     public const KEY = "media";
diff --git a/ext/media/main.php b/ext/media/main.php
index 806b7979..d4ff5f32 100644
--- a/ext/media/main.php
+++ b/ext/media/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 require_once "events.php";
 require_once "media_engine.php";
diff --git a/ext/media/media_engine.php b/ext/media/media_engine.php
index 3dff0e17..191d3259 100644
--- a/ext/media/media_engine.php
+++ b/ext/media/media_engine.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class MediaEngine
 {
     public const GD = "gd";
diff --git a/ext/media/theme.php b/ext/media/theme.php
index efb9506a..00ec1922 100644
--- a/ext/media/theme.php
+++ b/ext/media/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class MediaTheme extends Themelet
diff --git a/ext/media/video_codecs.php b/ext/media/video_codecs.php
index 4369ce28..1a2d2060 100644
--- a/ext/media/video_codecs.php
+++ b/ext/media/video_codecs.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class VideoContainers
 {
     public const WEBM = MimeType::WEBM;
diff --git a/ext/mime/file_extension.php b/ext/mime/file_extension.php
index 4a1a8b57..52b72fe6 100644
--- a/ext/mime/file_extension.php
+++ b/ext/mime/file_extension.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class FileExtension
 {
     public const ANI = 'ani';
diff --git a/ext/mime/info.php b/ext/mime/info.php
index 807e01fa..fb8173e9 100644
--- a/ext/mime/info.php
+++ b/ext/mime/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MimeSystemInfo extends ExtensionInfo
 {
     public const KEY = "mime";
diff --git a/ext/mime/main.php b/ext/mime/main.php
index 77d75683..1e1380fe 100644
--- a/ext/mime/main.php
+++ b/ext/mime/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "mime_map.php";
 require_once "file_extension.php";
 require_once "mime_type.php";
diff --git a/ext/mime/mime_map.php b/ext/mime/mime_map.php
index d7d85a95..b5f75b8c 100644
--- a/ext/mime/mime_map.php
+++ b/ext/mime/mime_map.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MimeMap
 {
     public const MAP_NAME = 'name';
diff --git a/ext/mime/mime_type.php b/ext/mime/mime_type.php
index b85ac1d8..8c3f225b 100644
--- a/ext/mime/mime_type.php
+++ b/ext/mime/mime_type.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "file_extension.php";
 
 class MimeType
diff --git a/ext/mime/test.php b/ext/mime/test.php
index 26c6e8bb..1c374a32 100644
--- a/ext/mime/test.php
+++ b/ext/mime/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class MimeSystemTest extends ShimmiePHPUnitTestCase
 {
     public function testJPEG()
diff --git a/ext/mime/theme.php b/ext/mime/theme.php
index 16d406f3..a90f3914 100644
--- a/ext/mime/theme.php
+++ b/ext/mime/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class MimeSystemTheme extends Themelet
 {
     public function get_help_html(): string
diff --git a/ext/not_a_tag/info.php b/ext/not_a_tag/info.php
index 55cda17e..c2a35a58 100644
--- a/ext/not_a_tag/info.php
+++ b/ext/not_a_tag/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class NotATagInfo extends ExtensionInfo
 {
     public const KEY = "not_a_tag";
diff --git a/ext/not_a_tag/main.php b/ext/not_a_tag/main.php
index 8a3dc0b8..167cff8d 100644
--- a/ext/not_a_tag/main.php
+++ b/ext/not_a_tag/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroCRUD\ActionColumn;
 use MicroCRUD\TextColumn;
 use MicroCRUD\Table;
diff --git a/ext/not_a_tag/test.php b/ext/not_a_tag/test.php
index 10080c4f..505188de 100644
--- a/ext/not_a_tag/test.php
+++ b/ext/not_a_tag/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class NotATagTest extends ShimmiePHPUnitTestCase
 {
     public function testUntags()
diff --git a/ext/not_a_tag/theme.php b/ext/not_a_tag/theme.php
index 259d7c74..7c23a7a3 100644
--- a/ext/not_a_tag/theme.php
+++ b/ext/not_a_tag/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class NotATagTheme extends Themelet
 {
     public function display_untags(Page $page, $table, $paginator)
diff --git a/ext/notes/info.php b/ext/notes/info.php
index 29e6a51c..6ed211d0 100644
--- a/ext/notes/info.php
+++ b/ext/notes/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class NotesInfo extends ExtensionInfo
 {
     public const KEY = "notes";
diff --git a/ext/notes/main.php b/ext/notes/main.php
index b9d32b6c..ce3702e0 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Notes extends Extension
 {
     /** @var NotesTheme */
diff --git a/ext/notes/theme.php b/ext/notes/theme.php
index e29f04ce..9f6118fd 100644
--- a/ext/notes/theme.php
+++ b/ext/notes/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class NotesTheme extends Themelet
 {
     public function note_button(int $image_id): string
diff --git a/ext/numeric_score/info.php b/ext/numeric_score/info.php
index 9f1bbbc8..b3d8276a 100644
--- a/ext/numeric_score/info.php
+++ b/ext/numeric_score/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class NumericScoreInfo extends ExtensionInfo
 {
     public const KEY = "numeric_score";
diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index d3a69928..94eda54b 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class NumericScoreSetEvent extends Event
 {
     public int $image_id;
diff --git a/ext/numeric_score/test.php b/ext/numeric_score/test.php
index fe75ed16..44662acc 100644
--- a/ext/numeric_score/test.php
+++ b/ext/numeric_score/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class NumericScoreTest extends ShimmiePHPUnitTestCase
 {
     public function testNumericScore()
diff --git a/ext/numeric_score/theme.php b/ext/numeric_score/theme.php
index c8131ba8..94a9215c 100644
--- a/ext/numeric_score/theme.php
+++ b/ext/numeric_score/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class NumericScoreTheme extends Themelet
 {
     public function get_voter(Image $image)
diff --git a/ext/ouroboros_api/info.php b/ext/ouroboros_api/info.php
index 664125eb..4c19d24a 100644
--- a/ext/ouroboros_api/info.php
+++ b/ext/ouroboros_api/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class OuroborosAPIInfo extends ExtensionInfo
 {
     public const KEY = "ouroboros_api";
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index 4ef8448e..6e940791 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class _SafeOuroborosImage
 {
diff --git a/ext/pm/info.php b/ext/pm/info.php
index 99ad2c3b..567d7cfa 100644
--- a/ext/pm/info.php
+++ b/ext/pm/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PrivMsgInfo extends ExtensionInfo
 {
     public const KEY = "pm";
diff --git a/ext/pm/main.php b/ext/pm/main.php
index 4198b610..f5c6017a 100644
--- a/ext/pm/main.php
+++ b/ext/pm/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SendPMEvent extends Event
 {
     public PM $pm;
diff --git a/ext/pm/test.php b/ext/pm/test.php
index dd525430..2bac3d16 100644
--- a/ext/pm/test.php
+++ b/ext/pm/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class PrivMsgTest extends ShimmiePHPUnitTestCase
 {
     public function testPM()
diff --git a/ext/pm/theme.php b/ext/pm/theme.php
index 119ee14d..283acace 100644
--- a/ext/pm/theme.php
+++ b/ext/pm/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PrivMsgTheme extends Themelet
 {
     public function display_pms(Page $page, $pms)
diff --git a/ext/pm_triggers/info.php b/ext/pm_triggers/info.php
index e5b287b9..a11d3a5a 100644
--- a/ext/pm_triggers/info.php
+++ b/ext/pm_triggers/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PMTriggerInfo extends ExtensionInfo
 {
     public const KEY = "pm_triggers";
diff --git a/ext/pm_triggers/main.php b/ext/pm_triggers/main.php
index 5b36eb1a..65e20512 100644
--- a/ext/pm_triggers/main.php
+++ b/ext/pm_triggers/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PMTrigger extends Extension
 {
     public function onImageDeletion(ImageDeletionEvent $event)
diff --git a/ext/pools/info.php b/ext/pools/info.php
index cc215aa4..a99ad94d 100644
--- a/ext/pools/info.php
+++ b/ext/pools/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PoolsInfo extends ExtensionInfo
 {
     public const KEY = "pools";
diff --git a/ext/pools/main.php b/ext/pools/main.php
index 591861dd..76aff697 100644
--- a/ext/pools/main.php
+++ b/ext/pools/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class PoolsConfig
 {
     public const MAX_IMPORT_RESULTS = "poolsMaxImportResults";
diff --git a/ext/pools/test.php b/ext/pools/test.php
index 1edeace1..bf23b7bc 100644
--- a/ext/pools/test.php
+++ b/ext/pools/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class PoolsTest extends ShimmiePHPUnitTestCase
 {
     public function setUp(): void
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 2a00f816..cbdfdd4b 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PoolsTheme extends Themelet
 {
     /**
@@ -361,7 +363,7 @@ class PoolsTheme extends Themelet
             } elseif ($history['action'] == 0) {
                 $prefix = "-";
             } else {
-                throw new RuntimeException("history['action'] not in {0, 1}");
+                throw new \RuntimeException("history['action'] not in {0, 1}");
             }
 
             $images = trim($history['images']);
diff --git a/ext/post_peek/info.php b/ext/post_peek/info.php
index fe7f9f29..fa08270f 100644
--- a/ext/post_peek/info.php
+++ b/ext/post_peek/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PostPeekInfo extends ExtensionInfo
 {
     public const KEY = "post_peek";
diff --git a/ext/post_peek/main.php b/ext/post_peek/main.php
index d7941b6a..88cf5e9c 100644
--- a/ext/post_peek/main.php
+++ b/ext/post_peek/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PostPeek extends Extension
 {
 }
diff --git a/ext/post_peek/theme.php b/ext/post_peek/theme.php
index b1924f21..077c111c 100644
--- a/ext/post_peek/theme.php
+++ b/ext/post_peek/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PostPeekTheme extends Themelet
 {
 }
diff --git a/ext/post_titles/config.php b/ext/post_titles/config.php
index e5ed3af3..a711e435 100644
--- a/ext/post_titles/config.php
+++ b/ext/post_titles/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 abstract class PostTitlesConfig
 {
diff --git a/ext/post_titles/events/post_title_set_event.php b/ext/post_titles/events/post_title_set_event.php
index 2ab3a0a2..b0fd8f8a 100644
--- a/ext/post_titles/events/post_title_set_event.php
+++ b/ext/post_titles/events/post_title_set_event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PostTitleSetEvent extends Event
 {
     public Image $image;
diff --git a/ext/post_titles/info.php b/ext/post_titles/info.php
index 2174d80e..1c1c87b0 100644
--- a/ext/post_titles/info.php
+++ b/ext/post_titles/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PostTitlesInfo extends ExtensionInfo
 {
     public const KEY = "post_titles";
diff --git a/ext/post_titles/main.php b/ext/post_titles/main.php
index f4e5df19..5cb6687e 100644
--- a/ext/post_titles/main.php
+++ b/ext/post_titles/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 require_once "events/post_title_set_event.php";
 
diff --git a/ext/post_titles/theme.php b/ext/post_titles/theme.php
index 96303d14..aa3c9d35 100644
--- a/ext/post_titles/theme.php
+++ b/ext/post_titles/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class PostTitlesTheme extends Themelet
 {
     public function get_title_set_html(string $title, bool $can_set): string
diff --git a/ext/private_image/info.php b/ext/private_image/info.php
index 791dee1a..2196f19e 100644
--- a/ext/private_image/info.php
+++ b/ext/private_image/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class PrivateImageInfo extends ExtensionInfo
 {
     public const KEY = "private_image";
diff --git a/ext/private_image/main.php b/ext/private_image/main.php
index f2706cf3..0e8034c1 100644
--- a/ext/private_image/main.php
+++ b/ext/private_image/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class PrivateImageConfig
 {
     public const VERSION = "ext_private_image_version";
diff --git a/ext/private_image/theme.php b/ext/private_image/theme.php
index 8be0f28f..a06a2239 100644
--- a/ext/private_image/theme.php
+++ b/ext/private_image/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class PrivateImageTheme extends Themelet
diff --git a/ext/qr_code/info.php b/ext/qr_code/info.php
index 7dc69e0c..e8e6098c 100644
--- a/ext/qr_code/info.php
+++ b/ext/qr_code/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class QRImageInfo extends ExtensionInfo
 {
     public const KEY = "qr_code";
diff --git a/ext/qr_code/main.php b/ext/qr_code/main.php
index cdaae9bc..405d1cfb 100644
--- a/ext/qr_code/main.php
+++ b/ext/qr_code/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class QRImage extends Extension
 {
     /** @var QRImageTheme */
diff --git a/ext/qr_code/theme.php b/ext/qr_code/theme.php
index 7378424e..857eb89d 100644
--- a/ext/qr_code/theme.php
+++ b/ext/qr_code/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class QRImageTheme extends Themelet
 {
     public function links_block(string $link)
diff --git a/ext/random_image/info.php b/ext/random_image/info.php
index 7762915d..6d103042 100644
--- a/ext/random_image/info.php
+++ b/ext/random_image/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RandomImageInfo extends ExtensionInfo
 {
     public const KEY = "random_image";
diff --git a/ext/random_image/main.php b/ext/random_image/main.php
index 9e627c1f..d835e926 100644
--- a/ext/random_image/main.php
+++ b/ext/random_image/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RandomImage extends Extension
 {
     /** @var RandomImageTheme */
diff --git a/ext/random_image/test.php b/ext/random_image/test.php
index 4afc5878..d39391e6 100644
--- a/ext/random_image/test.php
+++ b/ext/random_image/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RandomImageTest extends ShimmiePHPUnitTestCase
 {
     public function testRandom()
diff --git a/ext/random_image/theme.php b/ext/random_image/theme.php
index 942a11ed..144e0717 100644
--- a/ext/random_image/theme.php
+++ b/ext/random_image/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\DIV;
 use function MicroHTML\A;
 use function MicroHTML\IMG;
diff --git a/ext/random_list/info.php b/ext/random_list/info.php
index a95dee4f..38ec94df 100644
--- a/ext/random_list/info.php
+++ b/ext/random_list/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RandomListInfo extends ExtensionInfo
 {
     public const KEY = "random_list";
diff --git a/ext/random_list/main.php b/ext/random_list/main.php
index f44c9b54..8bd826c8 100644
--- a/ext/random_list/main.php
+++ b/ext/random_list/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RandomList extends Extension
 {
     /** @var RandomListTheme */
diff --git a/ext/random_list/theme.php b/ext/random_list/theme.php
index 164ad819..0eac68f7 100644
--- a/ext/random_list/theme.php
+++ b/ext/random_list/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RandomListTheme extends Themelet
 {
     protected array $search_terms;
diff --git a/ext/rating/info.php b/ext/rating/info.php
index b0ddc421..48f0b6dc 100644
--- a/ext/rating/info.php
+++ b/ext/rating/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RatingsInfo extends ExtensionInfo
 {
     public const KEY = "rating";
diff --git a/ext/rating/main.php b/ext/rating/main.php
index 7247c3a5..36041948 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
 * @global ImageRating[] $_shm_ratings
 */
@@ -41,10 +43,10 @@ function add_rating(ImageRating $rating)
 {
     global $_shm_ratings;
     if ($rating->code == "?" && array_key_exists("?", $_shm_ratings)) {
-        throw new RuntimeException("? is a reserved rating code that cannot be overridden");
+        throw new \RuntimeException("? is a reserved rating code that cannot be overridden");
     }
     if ($rating->code != "?" && in_array(strtolower($rating->search_term), Ratings::UNRATED_KEYWORDS)) {
-        throw new RuntimeException("$rating->search_term is a reserved search term");
+        throw new \RuntimeException("$rating->search_term is a reserved search term");
     }
     $_shm_ratings[$rating->code] = $rating;
 }
diff --git a/ext/rating/test.php b/ext/rating/test.php
index 1074777d..e9b73473 100644
--- a/ext/rating/test.php
+++ b/ext/rating/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RatingsTest extends ShimmiePHPUnitTestCase
 {
     public function testRatingSafe()
diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index 6e31d854..5d514bc9 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RatingsTheme extends Themelet
 {
     public function get_rater_html(int $image_id, string $rating, bool $can_rate): string
diff --git a/ext/regen_thumb/info.php b/ext/regen_thumb/info.php
index 651bc9b8..da4424f7 100644
--- a/ext/regen_thumb/info.php
+++ b/ext/regen_thumb/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RegenThumbInfo extends ExtensionInfo
 {
     public const KEY = "regen_thumb";
diff --git a/ext/regen_thumb/main.php b/ext/regen_thumb/main.php
index 064b32c3..9c4119b0 100644
--- a/ext/regen_thumb/main.php
+++ b/ext/regen_thumb/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class RegenThumb extends Extension
 {
diff --git a/ext/regen_thumb/test.php b/ext/regen_thumb/test.php
index a23b8982..44f93fd1 100644
--- a/ext/regen_thumb/test.php
+++ b/ext/regen_thumb/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RegenThumbTest extends ShimmiePHPUnitTestCase
 {
     public function testRegenThumb()
diff --git a/ext/regen_thumb/theme.php b/ext/regen_thumb/theme.php
index a47c3d27..6477c7e5 100644
--- a/ext/regen_thumb/theme.php
+++ b/ext/regen_thumb/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class RegenThumbTheme extends Themelet
diff --git a/ext/relationships/info.php b/ext/relationships/info.php
index 90268387..f7a8e344 100644
--- a/ext/relationships/info.php
+++ b/ext/relationships/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RelationshipsInfo extends ExtensionInfo
 {
     public const KEY = "relationships";
diff --git a/ext/relationships/main.php b/ext/relationships/main.php
index 7886a661..f1bc7db1 100644
--- a/ext/relationships/main.php
+++ b/ext/relationships/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageRelationshipSetEvent extends Event
 {
     public int $child_id;
diff --git a/ext/relationships/test.php b/ext/relationships/test.php
index 58d91423..88c54315 100644
--- a/ext/relationships/test.php
+++ b/ext/relationships/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RelationshipsTest extends ShimmiePHPUnitTestCase
 {
     //=================================================================
diff --git a/ext/relationships/theme.php b/ext/relationships/theme.php
index b001107f..96e73cde 100644
--- a/ext/relationships/theme.php
+++ b/ext/relationships/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RelationshipsTheme extends Themelet
 {
     public function relationship_info(Image $image)
diff --git a/ext/report_image/info.php b/ext/report_image/info.php
index 62f7da05..3a60a0f6 100644
--- a/ext/report_image/info.php
+++ b/ext/report_image/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ReportImageInfo extends ExtensionInfo
 {
     public const KEY = "report_image";
diff --git a/ext/report_image/main.php b/ext/report_image/main.php
index 1208a234..a65d54d1 100644
--- a/ext/report_image/main.php
+++ b/ext/report_image/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RemoveReportedImageEvent extends Event
 {
     public int $id;
diff --git a/ext/report_image/test.php b/ext/report_image/test.php
index a8984de2..57996eaf 100644
--- a/ext/report_image/test.php
+++ b/ext/report_image/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ReportImageTest extends ShimmiePHPUnitTestCase
 {
     public function testReportImage()
diff --git a/ext/report_image/theme.php b/ext/report_image/theme.php
index 00fa592e..12c565ef 100644
--- a/ext/report_image/theme.php
+++ b/ext/report_image/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class ReportImageTheme extends Themelet
diff --git a/ext/res_limit/info.php b/ext/res_limit/info.php
index 6b48d2d1..c407f628 100644
--- a/ext/res_limit/info.php
+++ b/ext/res_limit/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ResolutionLimitInfo extends ExtensionInfo
 {
     public const KEY = "res_limit";
diff --git a/ext/res_limit/main.php b/ext/res_limit/main.php
index 4169a1ad..a0e6f27b 100644
--- a/ext/res_limit/main.php
+++ b/ext/res_limit/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ResolutionLimit extends Extension
 {
     public function get_priority(): int
diff --git a/ext/res_limit/test.php b/ext/res_limit/test.php
index ba1ef5c0..8163dd95 100644
--- a/ext/res_limit/test.php
+++ b/ext/res_limit/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ResolutionLimitTest extends ShimmiePHPUnitTestCase
 {
     public function testResLimitOK()
diff --git a/ext/resize/info.php b/ext/resize/info.php
index edc2c99d..b7703588 100644
--- a/ext/resize/info.php
+++ b/ext/resize/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * Notice:
  *  The image resize and resample code is based off of the "smart_resize_image"
diff --git a/ext/resize/main.php b/ext/resize/main.php
index 155da809..1a86b43c 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class ResizeConfig
 {
     public const ENABLED = 'resize_enabled';
diff --git a/ext/resize/theme.php b/ext/resize/theme.php
index 63240826..44937b1f 100644
--- a/ext/resize/theme.php
+++ b/ext/resize/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ResizeImageTheme extends Themelet
 {
     /*
diff --git a/ext/rotate/info.php b/ext/rotate/info.php
index e18462ed..51c530d4 100644
--- a/ext/rotate/info.php
+++ b/ext/rotate/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * Notice:
  *  The image resize and resample code is based off of the "smart_resize_image"
diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index 6998f1d5..030a2ac2 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // TODO Add warning that rotate doesn't support lossless webp output
 
 /**
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index 732f099f..a8a08a26 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class RotateImageTheme extends Themelet
diff --git a/ext/rss_comments/info.php b/ext/rss_comments/info.php
index 15f56fab..d72bcb46 100644
--- a/ext/rss_comments/info.php
+++ b/ext/rss_comments/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RSSCommentsInfo extends ExtensionInfo
 {
     public const KEY = "rss_comments";
diff --git a/ext/rss_comments/main.php b/ext/rss_comments/main.php
index 178ec57e..5afadf6b 100644
--- a/ext/rss_comments/main.php
+++ b/ext/rss_comments/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RSSComments extends Extension
 {
     public function onPostListBuilding(PostListBuildingEvent $event)
diff --git a/ext/rss_comments/test.php b/ext/rss_comments/test.php
index 65d4ca3b..c3ce163e 100644
--- a/ext/rss_comments/test.php
+++ b/ext/rss_comments/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RSSCommentsTest extends ShimmiePHPUnitTestCase
 {
     public function testImageFeed()
diff --git a/ext/rss_images/info.php b/ext/rss_images/info.php
index 74090e31..6cc73d10 100644
--- a/ext/rss_images/info.php
+++ b/ext/rss_images/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class RSSImagesInfo extends ExtensionInfo
 {
     public const KEY = "rss_images";
diff --git a/ext/rss_images/main.php b/ext/rss_images/main.php
index 852949e5..228aa343 100644
--- a/ext/rss_images/main.php
+++ b/ext/rss_images/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class RSSImages extends Extension
 {
diff --git a/ext/rss_images/test.php b/ext/rss_images/test.php
index 06f19e46..89dc8acc 100644
--- a/ext/rss_images/test.php
+++ b/ext/rss_images/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class RSSImagesTest extends ShimmiePHPUnitTestCase
 {
     public function testImageFeed()
diff --git a/ext/rss_images/theme.php b/ext/rss_images/theme.php
index ee6d0879..2affd486 100644
--- a/ext/rss_images/theme.php
+++ b/ext/rss_images/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* needed for access to build_thumb_html */
 class RSSImagesTheme extends Themelet
 {
diff --git a/ext/rule34/info.php b/ext/rule34/info.php
index d63c9089..cd01f775 100644
--- a/ext/rule34/info.php
+++ b/ext/rule34/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Rule34Info extends ExtensionInfo
 {
     public const KEY = "rule34";
diff --git a/ext/rule34/main.php b/ext/rule34/main.php
index 4e5780f9..61254f26 100644
--- a/ext/rule34/main.php
+++ b/ext/rule34/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use function MicroHTML\TR;
 use function MicroHTML\TH;
 use function MicroHTML\TD;
diff --git a/ext/rule34/theme.php b/ext/rule34/theme.php
index 0e56cab8..0f607fe3 100644
--- a/ext/rule34/theme.php
+++ b/ext/rule34/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 use function MicroHTML\LABEL;
 use function MicroHTML\BR;
diff --git a/ext/setup/config.php b/ext/setup/config.php
index a926dbb2..b9439f48 100644
--- a/ext/setup/config.php
+++ b/ext/setup/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class SetupConfig
 {
diff --git a/ext/setup/info.php b/ext/setup/info.php
index d6302529..c1b2772d 100644
--- a/ext/setup/info.php
+++ b/ext/setup/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SetupInfo extends ExtensionInfo
 {
     public const KEY = "setup";
diff --git a/ext/setup/main.php b/ext/setup/main.php
index ca7a240a..169db3a8 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-include_once "config.php";
+namespace Shimmie2;
+
+require_once "config.php";
 
 /*
  * Sent when the setup screen's 'set' button has been
diff --git a/ext/setup/test.php b/ext/setup/test.php
index dd3f5eea..e7eb169d 100644
--- a/ext/setup/test.php
+++ b/ext/setup/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class SetupTest extends ShimmiePHPUnitTestCase
 {
     public function testNiceUrlsTest()
diff --git a/ext/setup/theme.php b/ext/setup/theme.php
index 0dbf4478..bebf977a 100644
--- a/ext/setup/theme.php
+++ b/ext/setup/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SetupTheme extends Themelet
 {
     /*
@@ -17,7 +19,7 @@ class SetupTheme extends Themelet
      */
     public function display_page(Page $page, SetupPanel $panel)
     {
-        usort($panel->blocks, "blockcmp");
+        usort($panel->blocks, "Shimmie2\blockcmp");
 
         /*
          * Try and keep the two columns even; count the line breaks in
diff --git a/ext/shimmie_api/info.php b/ext/shimmie_api/info.php
index a8d09ec1..34d98675 100644
--- a/ext/shimmie_api/info.php
+++ b/ext/shimmie_api/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ShimmieApiInfo extends ExtensionInfo
 {
     public const KEY = "shimmie_api";
diff --git a/ext/shimmie_api/main.php b/ext/shimmie_api/main.php
index d744f2ee..835f5f6f 100644
--- a/ext/shimmie_api/main.php
+++ b/ext/shimmie_api/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class _SafeImage
 {
     public int $id;
diff --git a/ext/shimmie_api/test.php b/ext/shimmie_api/test.php
index 6addeff6..9efa291f 100644
--- a/ext/shimmie_api/test.php
+++ b/ext/shimmie_api/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ShimmieApiTest extends ShimmiePHPUnitTestCase
 {
     public function testAPI()
diff --git a/ext/site_description/info.php b/ext/site_description/info.php
index 9d815291..2e94e3e3 100644
--- a/ext/site_description/info.php
+++ b/ext/site_description/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SiteDescriptionInfo extends ExtensionInfo
 {
     public const KEY = "site_description";
diff --git a/ext/site_description/main.php b/ext/site_description/main.php
index 417ea1c3..e0fe5218 100644
--- a/ext/site_description/main.php
+++ b/ext/site_description/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SiteDescription extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/site_description/test.php b/ext/site_description/test.php
index 9544ffda..8d07917f 100644
--- a/ext/site_description/test.php
+++ b/ext/site_description/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class SiteDescriptionTest extends ShimmiePHPUnitTestCase
 {
     public function testSiteDescription()
diff --git a/ext/sitemap/info.php b/ext/sitemap/info.php
index f88c1ec9..58ec3e84 100644
--- a/ext/sitemap/info.php
+++ b/ext/sitemap/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class XMLSitemapInfo extends ExtensionInfo
 {
     public const KEY = "sitemap";
diff --git a/ext/sitemap/main.php b/ext/sitemap/main.php
index 8c1e44aa..3843adc7 100644
--- a/ext/sitemap/main.php
+++ b/ext/sitemap/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class XMLSitemap extends Extension
 {
diff --git a/ext/sitemap/test.php b/ext/sitemap/test.php
index f8e0c3ce..b36e5a9c 100644
--- a/ext/sitemap/test.php
+++ b/ext/sitemap/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class XMLSitemapTest extends ShimmiePHPUnitTestCase
 {
     public function testBasic()
diff --git a/ext/source_history/info.php b/ext/source_history/info.php
index 8ebad09a..3c0ca01a 100644
--- a/ext/source_history/info.php
+++ b/ext/source_history/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SourceHistoryInfo extends ExtensionInfo
 {
     public const KEY = "source_history";
diff --git a/ext/source_history/main.php b/ext/source_history/main.php
index 742ba1db..f9726b4d 100644
--- a/ext/source_history/main.php
+++ b/ext/source_history/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SourceHistory extends Extension
 {
     /** @var SourceHistoryTheme */
diff --git a/ext/source_history/theme.php b/ext/source_history/theme.php
index aedc9ff0..d583abfb 100644
--- a/ext/source_history/theme.php
+++ b/ext/source_history/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\LI;
 use function MicroHTML\A;
 use function MicroHTML\INPUT;
diff --git a/ext/static_files/info.php b/ext/static_files/info.php
index 9084f096..a44cc4c5 100644
--- a/ext/static_files/info.php
+++ b/ext/static_files/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class StaticFilesInfo extends ExtensionInfo
 {
     public const KEY = "static_files";
diff --git a/ext/static_files/main.php b/ext/static_files/main.php
index 85d39ace..8a8693f0 100644
--- a/ext/static_files/main.php
+++ b/ext/static_files/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class StaticFiles extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/static_files/test.php b/ext/static_files/test.php
index 1dd474b1..e26288b9 100644
--- a/ext/static_files/test.php
+++ b/ext/static_files/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class StaticFilesTest extends ShimmiePHPUnitTestCase
 {
     public function testStaticHandler()
diff --git a/ext/statsd/info.php b/ext/statsd/info.php
index d4d866ae..d37e4c8a 100644
--- a/ext/statsd/info.php
+++ b/ext/statsd/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class StatsDInterfaceInfo extends ExtensionInfo
 {
     public const KEY = "statsd";
diff --git a/ext/statsd/main.php b/ext/statsd/main.php
index 5beb739e..75417025 100644
--- a/ext/statsd/main.php
+++ b/ext/statsd/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 _d("STATSD_HOST", null);
 
 function dstat($name, $val)
diff --git a/ext/system/info.php b/ext/system/info.php
index fd9fe65e..47eded77 100644
--- a/ext/system/info.php
+++ b/ext/system/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class SystemInfo extends ExtensionInfo
 {
     public const KEY = "system";
diff --git a/ext/system/main.php b/ext/system/main.php
index 65896500..2cb66073 100644
--- a/ext/system/main.php
+++ b/ext/system/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class System extends Extension
 {
     public function onPageRequest(PageRequestEvent $event)
@@ -11,7 +13,7 @@ class System extends Extension
         if ($event->page_matches("system")) {
             $e = new PageSubNavBuildingEvent("system");
             send_event($e);
-            usort($e->links, "sort_nav_links");
+            usort($e->links, "Shimmie2\sort_nav_links");
             $link = $e->links[0]->link;
 
             $page->set_redirect($link->make_link());
diff --git a/ext/tag_categories/config.php b/ext/tag_categories/config.php
index 9666abc8..17c98bcf 100644
--- a/ext/tag_categories/config.php
+++ b/ext/tag_categories/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class TagCategoriesConfig
 {
     public const VERSION = "ext_tag_categories_version";
diff --git a/ext/tag_categories/info.php b/ext/tag_categories/info.php
index 917b2969..221148b0 100644
--- a/ext/tag_categories/info.php
+++ b/ext/tag_categories/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagCategoriesInfo extends ExtensionInfo
 {
     public const KEY = "tag_categories";
diff --git a/ext/tag_categories/main.php b/ext/tag_categories/main.php
index d3503308..5d28d59f 100644
--- a/ext/tag_categories/main.php
+++ b/ext/tag_categories/main.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 require_once "config.php";
 
diff --git a/ext/tag_categories/theme.php b/ext/tag_categories/theme.php
index 4fa159bb..f47b4ded 100644
--- a/ext/tag_categories/theme.php
+++ b/ext/tag_categories/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagCategoriesTheme extends Themelet
 {
     public function show_tag_categories(Page $page, $tc_dict)
diff --git a/ext/tag_edit/info.php b/ext/tag_edit/info.php
index 0ba86c75..c9d61c88 100644
--- a/ext/tag_edit/info.php
+++ b/ext/tag_edit/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagEditInfo extends ExtensionInfo
 {
     public const KEY = "tag_edit";
diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php
index c0f665b3..f63518dd 100644
--- a/ext/tag_edit/main.php
+++ b/ext/tag_edit/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * OwnerSetEvent:
  *   $image_id
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index 3118fe02..98d57c35 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TagEditTest extends ShimmiePHPUnitTestCase
 {
     public function testValidChange()
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index e1cd84af..3d9e18f9 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagEditTheme extends Themelet
 {
     /*
diff --git a/ext/tag_editcloud/info.php b/ext/tag_editcloud/info.php
index 7e83b559..943e1e75 100644
--- a/ext/tag_editcloud/info.php
+++ b/ext/tag_editcloud/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagEditCloudInfo extends ExtensionInfo
 {
     public const KEY = "tag_editcloud";
diff --git a/ext/tag_editcloud/main.php b/ext/tag_editcloud/main.php
index 58369aa4..7f2fa3b5 100644
--- a/ext/tag_editcloud/main.php
+++ b/ext/tag_editcloud/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /* Todo:
  * 	usepref(todo2: port userpref)
  *	theme junk
diff --git a/ext/tag_history/info.php b/ext/tag_history/info.php
index 186c1678..6cd8a6c1 100644
--- a/ext/tag_history/info.php
+++ b/ext/tag_history/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagHistoryInfo extends ExtensionInfo
 {
     public const KEY = "tag_history";
diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php
index 7d9579f4..4a6064be 100644
--- a/ext/tag_history/main.php
+++ b/ext/tag_history/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagHistory extends Extension
 {
     /** @var TagHistoryTheme */
diff --git a/ext/tag_history/test.php b/ext/tag_history/test.php
index 51e7610e..e94f2900 100644
--- a/ext/tag_history/test.php
+++ b/ext/tag_history/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TagHistoryTest extends ShimmiePHPUnitTestCase
 {
     public function testTagHistory()
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index 174c72fe..a11b97d2 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\LI;
 use function MicroHTML\A;
 use function MicroHTML\INPUT;
diff --git a/ext/tag_list/config.php b/ext/tag_list/config.php
index 09139adb..a26d428f 100644
--- a/ext/tag_list/config.php
+++ b/ext/tag_list/config.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
 
 class TagListConfig
 {
diff --git a/ext/tag_list/info.php b/ext/tag_list/info.php
index b6ad46d2..eca765b5 100644
--- a/ext/tag_list/info.php
+++ b/ext/tag_list/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagListInfo extends ExtensionInfo
 {
     public const KEY = "tag_list";
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index 21677bb9..aa15a871 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 
 class TagList extends Extension
@@ -85,7 +87,7 @@ class TagList extends Extension
         if ($config->get_int(TagListConfig::LENGTH) > 0) {
             $type = $config->get_string(TagListConfig::IMAGE_TYPE);
             if ($type == TagListConfig::TYPE_TAGS || $type == TagListConfig::TYPE_BOTH) {
-                if (class_exists("TagCategories") and $config->get_bool(TagCategoriesConfig::SPLIT_ON_VIEW)) {
+                if (class_exists("Shimmie2\TagCategories") and $config->get_bool(TagCategoriesConfig::SPLIT_ON_VIEW)) {
                     $this->add_split_tags_block($page, $event->image);
                 } else {
                     $this->add_tags_block($page, $event->image);
@@ -262,7 +264,7 @@ class TagList extends Extension
         if ($config->get_bool(TagListConfig::PAGES)) {
             $html .= $this->build_az();
         }
-        if (class_exists('TagCategories')) {
+        if (class_exists('Shimmie2\TagCategories')) {
             $this->tagcategories = new TagCategories();
             $tag_category_dict = $this->tagcategories->getKeyedDict();
         }
@@ -274,7 +276,7 @@ class TagList extends Extension
                 $size = 0.5;
             }
             $h_tag_no_underscores = str_replace("_", " ", $h_tag);
-            if (class_exists('TagCategories')) {
+            if (class_exists('Shimmie2\TagCategories')) {
                 $h_tag_no_underscores = $this->tagcategories->getTagHtml($h_tag, $tag_category_dict);
             }
             $html .= "&nbsp;<a style='font-size: ${size}em' href='$link'>$h_tag_no_underscores</a>&nbsp;\n";
@@ -331,7 +333,7 @@ class TagList extends Extension
         */
         mb_internal_encoding('UTF-8');
 
-        if (class_exists('TagCategories')) {
+        if (class_exists('Shimmie2\TagCategories')) {
             $this->tagcategories = new TagCategories();
             $tag_category_dict = $this->tagcategories->getKeyedDict();
         }
@@ -350,7 +352,7 @@ class TagList extends Extension
             }
             $link = $this->theme->tag_link($tag);
             $h_tag = html_escape($tag);
-            if (class_exists('TagCategories')) {
+            if (class_exists('Shimmie2\TagCategories')) {
                 $h_tag = $this->tagcategories->getTagHtml($h_tag, $tag_category_dict, "&nbsp;($count)");
             }
             $html .= "<a href='$link'>$h_tag</a>\n";
diff --git a/ext/tag_list/test.php b/ext/tag_list/test.php
index 9b91fd9d..f054a72e 100644
--- a/ext/tag_list/test.php
+++ b/ext/tag_list/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TagListTest extends ShimmiePHPUnitTestCase
 {
     private array $pages = ["map", "alphabetic", "popularity", "categories"];
diff --git a/ext/tag_list/theme.php b/ext/tag_list/theme.php
index 7cf48541..f829465a 100644
--- a/ext/tag_list/theme.php
+++ b/ext/tag_list/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagListTheme extends Themelet
 {
     public string $heading = "";
@@ -71,7 +73,7 @@ class TagListTheme extends Themelet
             asort($tag_infos);
         }
 
-        if (class_exists('TagCategories')) {
+        if (class_exists('Shimmie2\TagCategories')) {
             $this->tagcategories = new TagCategories();
             $tag_category_dict = $this->tagcategories->getKeyedDict();
         } else {
@@ -133,7 +135,7 @@ class TagListTheme extends Themelet
             asort($tag_infos);
         }
 
-        if (class_exists('TagCategories')) {
+        if (class_exists('Shimmie2\TagCategories')) {
             $this->tagcategories = new TagCategories();
             $tag_category_dict = $this->tagcategories->getKeyedDict();
         } else {
diff --git a/ext/tag_tools/info.php b/ext/tag_tools/info.php
index 6111acaf..3e1199d0 100644
--- a/ext/tag_tools/info.php
+++ b/ext/tag_tools/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagToolsInfo extends ExtensionInfo
 {
     public const KEY = "tag_tools";
diff --git a/ext/tag_tools/main.php b/ext/tag_tools/main.php
index ede738aa..02278056 100644
--- a/ext/tag_tools/main.php
+++ b/ext/tag_tools/main.php
@@ -3,6 +3,8 @@
 /** @noinspection PhpUnusedPrivateMethodInspection */
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TagTools extends Extension
 {
     /** @var TagToolsTheme */
diff --git a/ext/tag_tools/test.php b/ext/tag_tools/test.php
index 1e549495..e99acbf4 100644
--- a/ext/tag_tools/test.php
+++ b/ext/tag_tools/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TagToolsTest extends ShimmiePHPUnitTestCase
 {
     public function testLowercaseAndSetCase()
diff --git a/ext/tag_tools/theme.php b/ext/tag_tools/theme.php
index f54607cb..11994b7d 100644
--- a/ext/tag_tools/theme.php
+++ b/ext/tag_tools/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class TagToolsTheme extends Themelet
diff --git a/ext/tagger_xml/info.php b/ext/tagger_xml/info.php
index c5c57a0c..c7754bab 100644
--- a/ext/tagger_xml/info.php
+++ b/ext/tagger_xml/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TaggerXMLInfo extends ExtensionInfo
 {
     public const KEY = "tagger_xml";
diff --git a/ext/tagger_xml/main.php b/ext/tagger_xml/main.php
index f449197d..315e762d 100644
--- a/ext/tagger_xml/main.php
+++ b/ext/tagger_xml/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // Tagger AJAX back-end
 class TaggerXML extends Extension
 {
diff --git a/ext/tips/info.php b/ext/tips/info.php
index 6b6bdbaa..d8dd65cd 100644
--- a/ext/tips/info.php
+++ b/ext/tips/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TipsInfo extends ExtensionInfo
 {
     public const KEY = "tips";
diff --git a/ext/tips/main.php b/ext/tips/main.php
index d4709c5a..646b39c2 100644
--- a/ext/tips/main.php
+++ b/ext/tips/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CreateTipEvent extends Event
 {
     public bool $enable;
diff --git a/ext/tips/test.php b/ext/tips/test.php
index fe964cfb..4a3d22dc 100644
--- a/ext/tips/test.php
+++ b/ext/tips/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TipsTest extends ShimmiePHPUnitTestCase
 {
     public function setUp(): void
diff --git a/ext/tips/theme.php b/ext/tips/theme.php
index ea18b2d2..c9787b22 100644
--- a/ext/tips/theme.php
+++ b/ext/tips/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class TipsTheme extends Themelet
 {
     public function manageTips($url, $images)
diff --git a/ext/transcode/config.php b/ext/transcode/config.php
index c7a77e8c..598c16bf 100644
--- a/ext/transcode/config.php
+++ b/ext/transcode/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeConfig
 {
     public const VERSION = "ext_transcode_version";
diff --git a/ext/transcode/info.php b/ext/transcode/info.php
index 550db96a..f79529e2 100644
--- a/ext/transcode/info.php
+++ b/ext/transcode/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeImageInfo extends ExtensionInfo
 {
     public const KEY = "transcode";
diff --git a/ext/transcode/main.php b/ext/transcode/main.php
index 2c53c289..46a8ed43 100644
--- a/ext/transcode/main.php
+++ b/ext/transcode/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 /*
 * This is used by the image transcoding code when there is an error while transcoding
diff --git a/ext/transcode/theme.php b/ext/transcode/theme.php
index 61e2440b..55c1f61a 100644
--- a/ext/transcode/theme.php
+++ b/ext/transcode/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeImageTheme extends Themelet
 {
     /*
diff --git a/ext/transcode_video/config.php b/ext/transcode_video/config.php
index 1bf23950..9e29c115 100644
--- a/ext/transcode_video/config.php
+++ b/ext/transcode_video/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeVideoConfig
 {
     public const ENABLED = "transcode_video_enabled";
diff --git a/ext/transcode_video/info.php b/ext/transcode_video/info.php
index c34baba9..4dd7877c 100644
--- a/ext/transcode_video/info.php
+++ b/ext/transcode_video/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeVideoInfo extends ExtensionInfo
 {
     public const KEY = "transcode_video";
diff --git a/ext/transcode_video/main.php b/ext/transcode_video/main.php
index cf333c83..263a3da2 100644
--- a/ext/transcode_video/main.php
+++ b/ext/transcode_video/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 /*
 * This is used by the image transcoding code when there is an error while transcoding
diff --git a/ext/transcode_video/theme.php b/ext/transcode_video/theme.php
index d1f25d31..244730b2 100644
--- a/ext/transcode_video/theme.php
+++ b/ext/transcode_video/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TranscodeVideoTheme extends Themelet
 {
     /*
diff --git a/ext/trash/info.php b/ext/trash/info.php
index fa4ee594..13b643d6 100644
--- a/ext/trash/info.php
+++ b/ext/trash/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class TrashInfo extends ExtensionInfo
 {
     public const KEY = "trash";
diff --git a/ext/trash/main.php b/ext/trash/main.php
index eafd6faa..52e0b75a 100644
--- a/ext/trash/main.php
+++ b/ext/trash/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 abstract class TrashConfig
 {
     public const VERSION = "ext_trash_version";
diff --git a/ext/trash/theme.php b/ext/trash/theme.php
index f2631059..9a5553a8 100644
--- a/ext/trash/theme.php
+++ b/ext/trash/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\INPUT;
 
 class TrashTheme extends Themelet
diff --git a/ext/update/info.php b/ext/update/info.php
index 0ed0d3d2..7941141c 100644
--- a/ext/update/info.php
+++ b/ext/update/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UpdateInfo extends ExtensionInfo
 {
     public const KEY = "update";
diff --git a/ext/update/main.php b/ext/update/main.php
index 4b4d2bab..8e4c26cd 100644
--- a/ext/update/main.php
+++ b/ext/update/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Update extends Extension
 {
     /** @var UpdateTheme */
diff --git a/ext/update/theme.php b/ext/update/theme.php
index 2876032f..a990a4a7 100644
--- a/ext/update/theme.php
+++ b/ext/update/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class UpdateTheme extends Themelet
 {
     public function display_admin_block()
diff --git a/ext/upgrade/info.php b/ext/upgrade/info.php
index c95e334c..db8a8c34 100644
--- a/ext/upgrade/info.php
+++ b/ext/upgrade/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UpgradeInfo extends ExtensionInfo
 {
     public const KEY = "upgrade";
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index c7cd304d..648e9577 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Upgrade extends Extension
 {
     public function onCommand(CommandEvent $event)
diff --git a/ext/upload/config.php b/ext/upload/config.php
index 3e3666e1..8f4b5124 100644
--- a/ext/upload/config.php
+++ b/ext/upload/config.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UploadConfig
 {
     public const COUNT = "upload_count";
diff --git a/ext/upload/info.php b/ext/upload/info.php
index ce6c535e..969e397c 100644
--- a/ext/upload/info.php
+++ b/ext/upload/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UploadInfo extends ExtensionInfo
 {
     public const KEY = "upload";
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 75c9989c..4ff58b95 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "config.php";
 
 /**
@@ -147,7 +149,7 @@ class Upload extends Extension
     public function onPageSubNavBuilding(PageSubNavBuildingEvent $event)
     {
         if ($event->parent=="upload") {
-            if (class_exists("Wiki")) {
+            if (class_exists("Shimmie2\Wiki")) {
                 $event->add_nav_link("upload_guidelines", new Link('wiki/upload_guidelines'), "Guidelines");
             }
         }
diff --git a/ext/upload/test.php b/ext/upload/test.php
index 411888eb..2f901749 100644
--- a/ext/upload/test.php
+++ b/ext/upload/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class UploadTest extends ShimmiePHPUnitTestCase
 {
     public function testUploadPage()
diff --git a/ext/upload/theme.php b/ext/upload/theme.php
index 80627010..301408bd 100644
--- a/ext/upload/theme.php
+++ b/ext/upload/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 use function MicroHTML\TABLE;
diff --git a/ext/user/events.php b/ext/user/events.php
index 48dfbe29..61ab8bab 100644
--- a/ext/user/events.php
+++ b/ext/user/events.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UserBlockBuildingEvent extends Event
 {
     public array $parts = [];
diff --git a/ext/user/info.php b/ext/user/info.php
index b12b0466..81d33e9a 100644
--- a/ext/user/info.php
+++ b/ext/user/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UserPageInfo extends ExtensionInfo
 {
     public const KEY = "user";
diff --git a/ext/user/main.php b/ext/user/main.php
index 198abb9d..6890104b 100644
--- a/ext/user/main.php
+++ b/ext/user/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "events.php";
 
 use MicroHTML\HTMLElement;
@@ -697,7 +699,7 @@ class UserPage extends Extension
 
     private function count_log_ips(User $duser): array
     {
-        if (!class_exists('LogDatabase')) {
+        if (!class_exists('Shimmie2\LogDatabase')) {
             return [];
         }
         global $database;
diff --git a/ext/user/test.php b/ext/user/test.php
index 40ed203f..1479b720 100644
--- a/ext/user/test.php
+++ b/ext/user/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class UserPageTest extends ShimmiePHPUnitTestCase
 {
     public function testUserPage()
diff --git a/ext/user/theme.php b/ext/user/theme.php
index d983db57..fad854bc 100644
--- a/ext/user/theme.php
+++ b/ext/user/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 use function MicroHTML\emptyHTML;
diff --git a/ext/user_config/info.php b/ext/user_config/info.php
index fc5b5b91..a6495dbd 100644
--- a/ext/user_config/info.php
+++ b/ext/user_config/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UserConfigInfo extends ExtensionInfo
 {
     public const KEY = "user_config";
diff --git a/ext/user_config/main.php b/ext/user_config/main.php
index 2194b518..4e91ed40 100644
--- a/ext/user_config/main.php
+++ b/ext/user_config/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /** @var Config */
 global $user_config;
 
diff --git a/ext/user_config/test.php b/ext/user_config/test.php
index 45d5e031..5e12abbc 100644
--- a/ext/user_config/test.php
+++ b/ext/user_config/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class UserConfigTest extends ShimmiePHPUnitTestCase
 {
     private const OPTIONS_BLOCK_TITLE = "User Options";
diff --git a/ext/user_config/theme.php b/ext/user_config/theme.php
index ca13a471..16fbc21c 100644
--- a/ext/user_config/theme.php
+++ b/ext/user_config/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class UserConfigTheme extends Themelet
 {
     public function get_user_operations(string $key): string
@@ -39,7 +41,7 @@ class UserConfigTheme extends Themelet
      */
     public function display_user_config_page(Page $page, User $user, SetupPanel $panel)
     {
-        usort($panel->blocks, "blockcmp");
+        usort($panel->blocks, "Shimmie2\blockcmp");
 
         /*
          * Try and keep the two columns even; count the line breaks in
diff --git a/ext/varnish/info.php b/ext/varnish/info.php
index d7e53106..a85f717d 100644
--- a/ext/varnish/info.php
+++ b/ext/varnish/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class VarnishPurgerInfo extends ExtensionInfo
 {
     public const KEY = "varnish";
diff --git a/ext/varnish/main.php b/ext/varnish/main.php
index 3d20cbdb..cfe0d226 100644
--- a/ext/varnish/main.php
+++ b/ext/varnish/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class VarnishPurger extends Extension
 {
     public function onInitExt(InitExtEvent $event)
diff --git a/ext/view/events/displaying_image_event.php b/ext/view/events/displaying_image_event.php
index f5585ce4..d216f87f 100644
--- a/ext/view/events/displaying_image_event.php
+++ b/ext/view/events/displaying_image_event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /*
  * DisplayingImageEvent:
  *   $image -- the image being displayed
diff --git a/ext/view/events/image_admin_block_building_event.php b/ext/view/events/image_admin_block_building_event.php
index a86acdcd..47cb6a5c 100644
--- a/ext/view/events/image_admin_block_building_event.php
+++ b/ext/view/events/image_admin_block_building_event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageAdminBlockBuildingEvent extends Event
 {
     /** @var string[] */
diff --git a/ext/view/events/image_info_box_building_event.php b/ext/view/events/image_info_box_building_event.php
index 9f42a7ac..57d2affd 100644
--- a/ext/view/events/image_info_box_building_event.php
+++ b/ext/view/events/image_info_box_building_event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageInfoBoxBuildingEvent extends Event
 {
     public array $parts = [];
diff --git a/ext/view/events/image_info_set_event.php b/ext/view/events/image_info_set_event.php
index 17735571..0602804d 100644
--- a/ext/view/events/image_info_set_event.php
+++ b/ext/view/events/image_info_set_event.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ImageInfoSetEvent extends Event
 {
     public Image $image;
diff --git a/ext/view/info.php b/ext/view/info.php
index 08619267..27602aa0 100644
--- a/ext/view/info.php
+++ b/ext/view/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ViewImageInfo extends ExtensionInfo
 {
     public const KEY = "view";
diff --git a/ext/view/main.php b/ext/view/main.php
index 4f9b21f8..acbaf3b8 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 require_once "events/displaying_image_event.php";
 require_once "events/image_info_box_building_event.php";
 require_once "events/image_info_set_event.php";
diff --git a/ext/view/test.php b/ext/view/test.php
index 7b794590..8faeab77 100644
--- a/ext/view/test.php
+++ b/ext/view/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class ViewImageTest extends ShimmiePHPUnitTestCase
 {
     public function setUp(): void
diff --git a/ext/view/theme.php b/ext/view/theme.php
index b7ef57ca..4a4897c5 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class ViewImageTheme extends Themelet
 {
     public function display_meta_headers(Image $image)
diff --git a/ext/wiki/info.php b/ext/wiki/info.php
index 8177f486..d4cbdca5 100644
--- a/ext/wiki/info.php
+++ b/ext/wiki/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class WikiInfo extends ExtensionInfo
 {
     public const KEY = "wiki";
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index d894cf9d..f6a3311e 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class WikiUpdateEvent extends Event
 {
     public User $user;
@@ -266,7 +268,7 @@ class Wiki extends Extension
                     "title"=>$wpage->title, "locked"=>$wpage->locked, "body"=>$wpage->body]
                 );
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             throw new WikiUpdateException("Somebody else edited that page at the same time :-(");
         }
     }
@@ -388,7 +390,7 @@ class Wiki extends Extension
             $template = $config->get_string(WikiConfig::TAG_PAGE_TEMPLATE);
 
             //CATEGORIES
-            if (class_exists("TagCategories")) {
+            if (class_exists("Shimmie2\TagCategories")) {
                 $tagcategories = new TagCategories();
                 $tag_category_dict = $tagcategories->getKeyedDict();
             }
@@ -411,7 +413,7 @@ class Wiki extends Extension
             $template = format_text($template);
             //Things after this line will NOT be escaped!!! Be careful what you add.
 
-            if (class_exists("AutoTagger")) {
+            if (class_exists("Shimmie2\AutoTagger")) {
                 $auto_tags = $database->get_one("
                     SELECT additional_tags
                     FROM auto_tag
@@ -675,7 +677,7 @@ class Wiki extends Extension
                 return "--- $value\n";
 
             default:
-                throw new RuntimeException("stat needs to be =, + or -");
+                throw new \RuntimeException("stat needs to be =, + or -");
         }
     }
 }
diff --git a/ext/wiki/test.php b/ext/wiki/test.php
index f9d84ff7..8f5551cc 100644
--- a/ext/wiki/test.php
+++ b/ext/wiki/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class WikiTest extends ShimmiePHPUnitTestCase
 {
     public function testIndex()
diff --git a/ext/wiki/theme.php b/ext/wiki/theme.php
index 39e52505..db29f0b8 100644
--- a/ext/wiki/theme.php
+++ b/ext/wiki/theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class WikiTheme extends Themelet
 {
     /**
@@ -29,7 +31,7 @@ class WikiTheme extends Themelet
 
         // see if title is a category'd tag
         $title_html = html_escape($wiki_page->title);
-        if (class_exists('TagCategories')) {
+        if (class_exists('Shimmie2\TagCategories')) {
             $this->tagcategories = new TagCategories();
             $tag_category_dict = $this->tagcategories->getKeyedDict();
             $title_html = $this->tagcategories->getTagHtml($title_html, $tag_category_dict);
diff --git a/ext/word_filter/info.php b/ext/word_filter/info.php
index 29e80904..a132c72a 100644
--- a/ext/word_filter/info.php
+++ b/ext/word_filter/info.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class WordFilterInfo extends ExtensionInfo
 {
     public const KEY = "word_filter";
diff --git a/ext/word_filter/main.php b/ext/word_filter/main.php
index 6fd2306c..fd753390 100644
--- a/ext/word_filter/main.php
+++ b/ext/word_filter/main.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class WordFilter extends Extension
 {
     // before emoticon filter
diff --git a/ext/word_filter/test.php b/ext/word_filter/test.php
index 07a28690..a5ba62c2 100644
--- a/ext/word_filter/test.php
+++ b/ext/word_filter/test.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class WordFilterTest extends ShimmiePHPUnitTestCase
 {
     public function setUp(): void
diff --git a/index.php b/index.php
index 7a4d9b03..357bfd6b 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,8 @@
 <?php
+declare(strict_types=1);
+
+namespace Shimmie2;
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Make sure that shimmie is correctly installed                             *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -38,7 +42,7 @@ require_once "core/util.php";
 
 global $cache, $config, $database, $user, $page, $_tracer;
 _set_up_shimmie_environment();
-$_tracer = new EventTracer();
+$_tracer = new \EventTracer();
 $_tracer->begin("Bootstrap");
 _load_core_files();
 $cache = new Cache(CACHE_DSN);
@@ -52,7 +56,6 @@ $page = new Page();
 _load_event_listeners();
 $_tracer->end();
 
-
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
 * Send events, display output                                               *
 \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -91,7 +94,7 @@ try {
     if (function_exists("fastcgi_finish_request")) {
         fastcgi_finish_request();
     }
-} catch (Exception $e) {
+} catch (\Exception $e) {
     if ($database && $database->is_transaction_open()) {
         $database->rollback();
     }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 53930c2b..1a9f05cc 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use PHPUnit\Framework\TestCase;
 
 chdir(dirname(dirname(__FILE__)));
@@ -20,7 +22,7 @@ if (file_exists("tests/trace.json")) {
 global $cache, $config, $database, $user, $page, $_tracer;
 _set_up_shimmie_environment();
 $tracer_enabled = true;
-$_tracer = new EventTracer();
+$_tracer = new \EventTracer();
 $_tracer->begin("bootstrap");
 _load_core_files();
 $cache = new Cache(CACHE_DSN);
@@ -126,7 +128,7 @@ abstract class ShimmiePHPUnitTestCase extends TestCase
         $post_args = self::check_args($post_args);
 
         if (str_contains($page_name, "?")) {
-            throw new RuntimeException("Query string included in page name");
+            throw new \RuntimeException("Query string included in page name");
         }
         $_SERVER['REQUEST_URI'] = make_link($page_name, http_build_query($get_args));
         $_GET = $get_args;
@@ -253,6 +255,7 @@ abstract class ShimmiePHPUnitTestCase extends TestCase
             "source" => null,
         ]);
         send_event($dae);
+        // if($dae->image_id == -1) throw new \Exception("Upload failed :(");
         return $dae->image_id;
     }
 
diff --git a/tests/defines.php b/tests/defines.php
index ee971e0d..dc6ad864 100644
--- a/tests/defines.php
+++ b/tests/defines.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 define("UNITTEST", true);
 define("EXTRA_EXTS", str_replace("ext/", "", implode(',', glob('ext/*'))));
 
diff --git a/tests/router.php b/tests/router.php
index 56f963a0..7b9ec264 100644
--- a/tests/router.php
+++ b/tests/router.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 // custom routing for stand-alone mode, basically
 // .htaccess for the built-in php web server
 if (PHP_SAPI !== 'cli-server') {
diff --git a/themes/danbooru/comment.theme.php b/themes/danbooru/comment.theme.php
index e8034ea7..73eaf8dd 100644
--- a/themes/danbooru/comment.theme.php
+++ b/themes/danbooru/comment.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomCommentListTheme extends CommentListTheme
 {
     public function display_comment_list(array $images, int $page_number, int $total_pages, bool $can_post)
diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php
index ee4d1f93..9a24cc1b 100644
--- a/themes/danbooru/index.theme.php
+++ b/themes/danbooru/index.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomIndexTheme extends IndexTheme
 {
     /**
diff --git a/themes/danbooru/page.class.php b/themes/danbooru/page.class.php
index 682920c0..99009405 100644
--- a/themes/danbooru/page.class.php
+++ b/themes/danbooru/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Name: Danbooru Theme
  * Author: Bzchan <bzchan@animemahou.com>
diff --git a/themes/danbooru/tag_list.theme.php b/themes/danbooru/tag_list.theme.php
index 1802dcfb..4dd0bb02 100644
--- a/themes/danbooru/tag_list.theme.php
+++ b/themes/danbooru/tag_list.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomTagListTheme extends TagListTheme
 {
     public function display_page(Page $page)
diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php
index 604bc30f..c1858f21 100644
--- a/themes/danbooru/themelet.class.php
+++ b/themes/danbooru/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
     public function display_paginator(Page $page, string $base, ?string $query, int $page_number, int $total_pages, bool $show_random = false)
diff --git a/themes/danbooru/upload.theme.php b/themes/danbooru/upload.theme.php
index dc40c6b3..411d7e97 100644
--- a/themes/danbooru/upload.theme.php
+++ b/themes/danbooru/upload.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUploadTheme extends UploadTheme
 {
     public function display_block(Page $page): void
diff --git a/themes/danbooru/user.theme.php b/themes/danbooru/user.theme.php
index 5c9badcf..c4c851ba 100644
--- a/themes/danbooru/user.theme.php
+++ b/themes/danbooru/user.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUserPageTheme extends UserPageTheme
 {
     public function display_login_page(Page $page)
diff --git a/themes/danbooru/view.theme.php b/themes/danbooru/view.theme.php
index 67c9a7d2..5135e41b 100644
--- a/themes/danbooru/view.theme.php
+++ b/themes/danbooru/view.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomViewImageTheme extends ViewImageTheme
 {
     public function display_page(Image $image, $editor_parts)
diff --git a/themes/danbooru2/admin.theme.php b/themes/danbooru2/admin.theme.php
index bb85ee16..1d8082f6 100644
--- a/themes/danbooru2/admin.theme.php
+++ b/themes/danbooru2/admin.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomAdminPageTheme extends AdminPageTheme
 {
     public function display_page()
diff --git a/themes/danbooru2/comment.theme.php b/themes/danbooru2/comment.theme.php
index 4a4a7e0c..43598e59 100644
--- a/themes/danbooru2/comment.theme.php
+++ b/themes/danbooru2/comment.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomCommentListTheme extends CommentListTheme
 {
     public function display_comment_list(array $images, int $page_number, int $total_pages, bool $can_post)
diff --git a/themes/danbooru2/ext_manager.theme.php b/themes/danbooru2/ext_manager.theme.php
index 35860dde..bdc7b0c2 100644
--- a/themes/danbooru2/ext_manager.theme.php
+++ b/themes/danbooru2/ext_manager.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomExtManagerTheme extends ExtManagerTheme
 {
     public function display_table(Page $page, array $extensions, bool $editable)
diff --git a/themes/danbooru2/index.theme.php b/themes/danbooru2/index.theme.php
index 6ef017b3..51bf4473 100644
--- a/themes/danbooru2/index.theme.php
+++ b/themes/danbooru2/index.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomIndexTheme extends IndexTheme
 {
     /**
diff --git a/themes/danbooru2/page.class.php b/themes/danbooru2/page.class.php
index f59c2ab7..d96d84fd 100644
--- a/themes/danbooru2/page.class.php
+++ b/themes/danbooru2/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Name: Danbooru 2 Theme
  * Author: Bzchan <bzchan@animemahou.com>, updated by Daniel Oaks <daniel@danieloaks.net>
diff --git a/themes/danbooru2/tag_list.theme.php b/themes/danbooru2/tag_list.theme.php
index 1802dcfb..4dd0bb02 100644
--- a/themes/danbooru2/tag_list.theme.php
+++ b/themes/danbooru2/tag_list.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomTagListTheme extends TagListTheme
 {
     public function display_page(Page $page)
diff --git a/themes/danbooru2/themelet.class.php b/themes/danbooru2/themelet.class.php
index 604bc30f..c1858f21 100644
--- a/themes/danbooru2/themelet.class.php
+++ b/themes/danbooru2/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
     public function display_paginator(Page $page, string $base, ?string $query, int $page_number, int $total_pages, bool $show_random = false)
diff --git a/themes/danbooru2/upload.theme.php b/themes/danbooru2/upload.theme.php
index dc40c6b3..411d7e97 100644
--- a/themes/danbooru2/upload.theme.php
+++ b/themes/danbooru2/upload.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUploadTheme extends UploadTheme
 {
     public function display_block(Page $page): void
diff --git a/themes/danbooru2/user.theme.php b/themes/danbooru2/user.theme.php
index 5c9badcf..c4c851ba 100644
--- a/themes/danbooru2/user.theme.php
+++ b/themes/danbooru2/user.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUserPageTheme extends UserPageTheme
 {
     public function display_login_page(Page $page)
diff --git a/themes/danbooru2/view.theme.php b/themes/danbooru2/view.theme.php
index 9c40349f..bb211947 100644
--- a/themes/danbooru2/view.theme.php
+++ b/themes/danbooru2/view.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomViewImageTheme extends ViewImageTheme
 {
     public function display_page(Image $image, $editor_parts)
diff --git a/themes/default/page.class.php b/themes/default/page.class.php
index 62ee009a..026403af 100644
--- a/themes/default/page.class.php
+++ b/themes/default/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Page extends BasePage
 {
 }
diff --git a/themes/default/themelet.class.php b/themes/default/themelet.class.php
index 9a0e2a8e..ec8b0f04 100644
--- a/themes/default/themelet.class.php
+++ b/themes/default/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
 }
diff --git a/themes/futaba/comment.theme.php b/themes/futaba/comment.theme.php
index 4e6cbcb0..1a948b81 100644
--- a/themes/futaba/comment.theme.php
+++ b/themes/futaba/comment.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomCommentListTheme extends CommentListTheme
 {
     public int $inner_id = 0;
diff --git a/themes/futaba/page.class.php b/themes/futaba/page.class.php
index 178a9a7e..83be4b91 100644
--- a/themes/futaba/page.class.php
+++ b/themes/futaba/page.class.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Page extends BasePage
 {
     public bool $left_enabled = true;
diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php
index 359f4ac5..cb2c937d 100644
--- a/themes/futaba/themelet.class.php
+++ b/themes/futaba/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
     /**
diff --git a/themes/futaba/view.theme.php b/themes/futaba/view.theme.php
index 85538996..eb40ad1e 100644
--- a/themes/futaba/view.theme.php
+++ b/themes/futaba/view.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomViewImageTheme extends ViewImageTheme
 {
     public function display_page(Image $image, $editor_parts)
diff --git a/themes/lite/comment.theme.php b/themes/lite/comment.theme.php
index eaa3c349..ce60276c 100644
--- a/themes/lite/comment.theme.php
+++ b/themes/lite/comment.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomCommentListTheme extends CommentListTheme
 {
     protected function comment_to_html(Comment $comment, bool $trim=false): string
diff --git a/themes/lite/page.class.php b/themes/lite/page.class.php
index 6411f116..c6cb63e4 100644
--- a/themes/lite/page.class.php
+++ b/themes/lite/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 /**
  * Name: Lite Theme
  * Author: Zach Hall <zach@sosguy.net>
diff --git a/themes/lite/setup.theme.php b/themes/lite/setup.theme.php
index d55b9f32..34f18544 100644
--- a/themes/lite/setup.theme.php
+++ b/themes/lite/setup.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class CustomSetupTheme
  *
diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php
index cb616bf6..c3a0fa3d 100644
--- a/themes/lite/themelet.class.php
+++ b/themes/lite/themelet.class.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class Themelet
  */
diff --git a/themes/lite/user.theme.php b/themes/lite/user.theme.php
index bd6d1fa0..14327f6d 100644
--- a/themes/lite/user.theme.php
+++ b/themes/lite/user.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUserPageTheme extends UserPageTheme
 {
     public function display_login_page(Page $page)
diff --git a/themes/lite/user_config.theme.php b/themes/lite/user_config.theme.php
index 703e41ca..b0c9f1fe 100644
--- a/themes/lite/user_config.theme.php
+++ b/themes/lite/user_config.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 /**
  * Class CustomSetupTheme
  *
diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php
index 5e639600..4688b7cb 100644
--- a/themes/lite/view.theme.php
+++ b/themes/lite/view.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomViewImageTheme extends ViewImageTheme
 {
     public function display_page(Image $image, $editor_parts)
diff --git a/themes/material/home.theme.php b/themes/material/home.theme.php
index c5697708..fb909563 100644
--- a/themes/material/home.theme.php
+++ b/themes/material/home.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomHomeTheme extends HomeTheme
 {
     public function display_page(Page $page, string $sitename, string $base_href, string $theme_name, string $body): void
diff --git a/themes/material/page.class.php b/themes/material/page.class.php
index 558e77a0..4c8896aa 100644
--- a/themes/material/page.class.php
+++ b/themes/material/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Page extends BasePage
 {
     public function render()
diff --git a/themes/material/themelet.class.php b/themes/material/themelet.class.php
index 9a0e2a8e..ec8b0f04 100644
--- a/themes/material/themelet.class.php
+++ b/themes/material/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
 }
diff --git a/themes/material/upload.theme.php b/themes/material/upload.theme.php
index e208f417..dca4d9bb 100644
--- a/themes/material/upload.theme.php
+++ b/themes/material/upload.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUploadTheme extends UploadTheme
 {
     // public function display_block(Page $page) {
diff --git a/themes/material/user.theme.php b/themes/material/user.theme.php
index 7d65e439..f80b4758 100644
--- a/themes/material/user.theme.php
+++ b/themes/material/user.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUserPageTheme extends UserPageTheme
 {
     public function display_user_block(Page $page, User $user, $parts)
diff --git a/themes/material/view.theme.php b/themes/material/view.theme.php
index 5933dea7..cde66060 100644
--- a/themes/material/view.theme.php
+++ b/themes/material/view.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomViewImageTheme extends ViewImageTheme
 {
     /*
diff --git a/themes/rule34v2/home.theme.php b/themes/rule34v2/home.theme.php
index 54e67cc6..3cda2e09 100644
--- a/themes/rule34v2/home.theme.php
+++ b/themes/rule34v2/home.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomHomeTheme extends HomeTheme
 {
     public function display_page(Page $page, string $sitename, string $base_href, string $theme_name, string $body): void
diff --git a/themes/rule34v2/index.theme.php b/themes/rule34v2/index.theme.php
index 7ab04133..94793bad 100644
--- a/themes/rule34v2/index.theme.php
+++ b/themes/rule34v2/index.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomIndexTheme extends IndexTheme
 {
     protected function build_table(array $images, ?string $query): string
diff --git a/themes/rule34v2/page.class.php b/themes/rule34v2/page.class.php
index 69345196..f2688da3 100644
--- a/themes/rule34v2/page.class.php
+++ b/themes/rule34v2/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Page extends BasePage
 {
     public function render()
diff --git a/themes/rule34v2/tag_edit.theme.php b/themes/rule34v2/tag_edit.theme.php
index e1490d74..eac621c4 100644
--- a/themes/rule34v2/tag_edit.theme.php
+++ b/themes/rule34v2/tag_edit.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomTagEditTheme extends TagEditTheme
 {
     public function get_tag_editor_html(Image $image): string
diff --git a/themes/rule34v2/themelet.class.php b/themes/rule34v2/themelet.class.php
index 530b98e6..1d0f2ab5 100644
--- a/themes/rule34v2/themelet.class.php
+++ b/themes/rule34v2/themelet.class.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
     public function build_thumb_html(Image $image): string
diff --git a/themes/rule34v2/upload.theme.php b/themes/rule34v2/upload.theme.php
index e08416a5..d80d76ea 100644
--- a/themes/rule34v2/upload.theme.php
+++ b/themes/rule34v2/upload.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 use MicroHTML\HTMLElement;
 
 use function MicroHTML\A;
diff --git a/themes/rule34v2/user.theme.php b/themes/rule34v2/user.theme.php
index be33fac7..81592bd8 100644
--- a/themes/rule34v2/user.theme.php
+++ b/themes/rule34v2/user.theme.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 use function MicroHTML\emptyHTML;
 use function MicroHTML\rawHTML;
 use function MicroHTML\TABLE;
diff --git a/themes/warm/page.class.php b/themes/warm/page.class.php
index 40c168d4..3ffcbab4 100644
--- a/themes/warm/page.class.php
+++ b/themes/warm/page.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Page extends BasePage
 {
     public function render()
diff --git a/themes/warm/themelet.class.php b/themes/warm/themelet.class.php
index 9a0e2a8e..ec8b0f04 100644
--- a/themes/warm/themelet.class.php
+++ b/themes/warm/themelet.class.php
@@ -1,6 +1,9 @@
 <?php
 
 declare(strict_types=1);
+
+namespace Shimmie2;
+
 class Themelet extends BaseThemelet
 {
 }
diff --git a/themes/warm/upload.theme.php b/themes/warm/upload.theme.php
index 030cde52..0029786c 100644
--- a/themes/warm/upload.theme.php
+++ b/themes/warm/upload.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUploadTheme extends UploadTheme
 {
     public function display_block(Page $page): void
diff --git a/themes/warm/user.theme.php b/themes/warm/user.theme.php
index d1fee5d3..a58e9ceb 100644
--- a/themes/warm/user.theme.php
+++ b/themes/warm/user.theme.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Shimmie2;
+
 class CustomUserPageTheme extends UserPageTheme
 {
     public function display_user_block(Page $page, User $user, $parts)