diff --git a/src/Facades/Assets.php b/src/Facades/Assets.php
deleted file mode 100644
index 291e76f..0000000
--- a/src/Facades/Assets.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the assets service
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Assets\Assets
- *
- * @method static string getThemeUri()
- * @method static string getAssetUri( string $asset )
- * @method static void enqueueStyle( string $handle, string $src, array $dependencies = [], string $media = 'all' )
- * @method static void enqueueScript( string $handle, string $src, array $dependencies = [], boolean $in_footer = false )
- * @method static void addFavicon()
- */
-class Assets extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme.assets.assets';
-	}
-}
diff --git a/src/Facades/Avatar.php b/src/Facades/Avatar.php
deleted file mode 100644
index 5016999..0000000
--- a/src/Facades/Avatar.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the avatar service
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Avatar\Avatar
- *
- * @method static void bootstrap()
- * @method static void setDefault( integer $attachment_id )
- * @method static void addUserMetaKey( string $user_meta_key )
- * @method static void removeUserMetaKey( string $user_meta_key )
- * @method static string filterAvatar( string $url, integer|string $id_or_email, array $args )
- */
-class Avatar extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme.avatar.avatar';
-	}
-}
diff --git a/src/Facades/Config.php b/src/Facades/Config.php
deleted file mode 100644
index 57d3484..0000000
--- a/src/Facades/Config.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the assets service
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Config\Config
- *
- * @method static mixed get( string $key, mixed $default = null )
- */
-class Config extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme.config.config';
-	}
-}
diff --git a/src/Facades/Image.php b/src/Facades/Image.php
deleted file mode 100644
index b95ae1e..0000000
--- a/src/Facades/Image.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the image service
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Image\Image
- *
- * @method static string thumbnail( integer $attachment_id, integer $width, integer $height, boolean $crop = true )
- */
-class Image extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme.image.image';
-	}
-}
diff --git a/src/Facades/Sidebar.php b/src/Facades/Sidebar.php
deleted file mode 100644
index 6d8b8ed..0000000
--- a/src/Facades/Sidebar.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the sidebar service
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Sidebar\Sidebar
- *
- * @method static string getCurrentSidebarId( string $default = 'default-sidebar', string $meta_key = '_app_custom_sidebar' )
- */
-class Sidebar extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme.sidebar.sidebar';
-	}
-}
diff --git a/src/Facades/Theme.php b/src/Facades/Theme.php
deleted file mode 100644
index ac9c07a..0000000
--- a/src/Facades/Theme.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace WPEmergeTheme\Facades;
-
-use WPEmerge\Support\Facade;
-
-/**
- * Provide access to the theme core instance.
- *
- * @codeCoverageIgnore
- * @see \WPEmergeTheme\Theme\Theme
- *
- * @method static \WPEmergeTheme\Theme\Theme make()
- * @method static \WPEmerge\Application\Application getApplication()
- * @method static boolean isBootstrapped()
- * @method static void bootstrap( array $config = [] )
- * @method static void partial( string $partial, string $child = '', array $context = [] )
- * @method static string uri()
- */
-class Theme extends Facade {
-	protected static function getFacadeAccessor() {
-		return 'wpemerge_theme';
-	}
-}
diff --git a/src/Theme/Theme.php b/src/Theme/Theme.php
index 2fb78c2..b9d2764 100644
--- a/src/Theme/Theme.php
+++ b/src/Theme/Theme.php
@@ -70,7 +70,7 @@ public function sidebar() {
 	}
 
 	/**
-	 * Render a template partial using WPEmerge\render().
+	 * Render a template partial using App::render().
 	 * Interface matches get_template_part() with the addition of $context.
 	 *
 	 * @param  string $partial