--- a/src/class-buddypress.php
+++ b/src/class-buddypress.php
@@ -118,7 +118,7 @@ class BuddyPress {
 
 		// Only run these methods if they haven't been run previously
 		if ( null === $instance ) {
-			$instance = new BuddyPress;
+			$instance = new BuddyPress();
 			$instance->constants();
 			$instance->setup_globals();
 			$instance->legacy_constants();
@@ -141,21 +141,24 @@ class BuddyPress {
 	 * @see BuddyPress::instance()
 	 * @see buddypress()
 	 */
-	private function __construct() { /* Do nothing here */ }
+	private function __construct() {
+		/* Do nothing here */ }
 
 	/**
 	 * A dummy magic method to prevent BuddyPress from being cloned.
 	 *
 	 * @since 1.7.0
 	 */
-	public function __clone() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'buddypress' ), '1.7' ); }
+	public function __clone() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'buddypress' ), '1.7' ); }
 
 	/**
 	 * A dummy magic method to prevent BuddyPress from being unserialized.
 	 *
 	 * @since 1.7.0
 	 */
-	public function __wakeup() { _doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'buddypress' ), '1.7' ); }
+	public function __wakeup() {
+		_doing_it_wrong( __FUNCTION__, __( 'Cheatin’ huh?', 'buddypress' ), '1.7' ); }
 
 	/**
 	 * Magic method for checking the existence of a certain custom field.
@@ -166,7 +169,8 @@ class BuddyPress {
 	 *
 	 * @return bool
 	 */
-	public function __isset( $key ) { return isset( $this->data[$key] ); }
+	public function __isset( $key ) {
+		return isset( $this->data[ $key ] ); }
 
 	/**
 	 * Magic method for getting BuddyPress variables.
@@ -177,7 +181,8 @@ class BuddyPress {
 	 *
 	 * @return mixed
 	 */
-	public function __get( $key ) { return isset( $this->data[$key] ) ? $this->data[$key] : null; }
+	public function __get( $key ) {
+		return isset( $this->data[ $key ] ) ? $this->data[ $key ] : null; }
 
 	/**
 	 * Magic method for setting BuddyPress variables.
@@ -187,7 +192,8 @@ class BuddyPress {
 	 * @param string $key   Key to set a value for.
 	 * @param mixed  $value Value to set.
 	 */
-	public function __set( $key, $value ) { $this->data[$key] = $value; }
+	public function __set( $key, $value ) {
+		$this->data[ $key ] = $value; }
 
 	/**
 	 * Magic method for unsetting BuddyPress variables.
@@ -196,7 +202,10 @@ class BuddyPress {
 	 *
 	 * @param string $key Key to unset a value for.
 	 */
-	public function __unset( $key ) { if ( isset( $this->data[$key] ) ) unset( $this->data[$key] ); }
+	public function __unset( $key ) {
+		if ( isset( $this->data[ $key ] ) ) {
+			unset( $this->data[ $key ] );
+		} }
 
 	/**
 	 * Magic method to prevent notices and errors from invalid method calls.
@@ -208,7 +217,9 @@ class BuddyPress {
 	 *
 	 * @return null
 	 */
-	public function __call( $name = '', $args = array() ) { unset( $name, $args ); return null; }
+	public function __call( $name = '', $args = array() ) {
+		unset( $name, $args );
+		return null; }
 
 	/** Private Methods *******************************************************/
 
@@ -216,14 +227,13 @@ class BuddyPress {
 	 * Bootstrap constants.
 	 *
 	 * @since 1.6.0
-	 *
 	 */
 	private function constants() {
 
 		// Place your custom code (actions/filters) in a file called
 		// '/plugins/bp-custom.php' and it will be loaded before anything else.
 		if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) ) {
-			require( WP_PLUGIN_DIR . '/bp-custom.php' );
+			require WP_PLUGIN_DIR . '/bp-custom.php';
 		}
 
 		// Path and URL
@@ -267,7 +277,7 @@ class BuddyPress {
 					// /wp-admin/includes/plugin.php file in order to use that function.
 
 					// get network-activated plugins
-					$plugins = get_site_option( 'active_sitewide_plugins');
+					$plugins = get_site_option( 'active_sitewide_plugins' );
 
 					// basename
 					$basename = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
@@ -278,7 +288,6 @@ class BuddyPress {
 						$root_blog_id = $current_site->blog_id;
 					}
 				}
-
 			}
 
 			define( 'BP_ROOT_BLOG', $root_blog_id );
@@ -297,16 +306,15 @@ class BuddyPress {
 	 * Component global variables.
 	 *
 	 * @since 1.6.0
-	 *
 	 */
 	private function setup_globals() {
 
-		/** Versions **********************************************************/
+		/** Versions */
 
 		$this->version    = '6.0.0-alpha';
 		$this->db_version = 12385;
 
-		/** Loading ***********************************************************/
+		/** Loading */
 
 		/**
 		 * Should deprecated code be loaded?
@@ -316,14 +324,14 @@ class BuddyPress {
 		 */
 		$this->load_deprecated = false;
 
-		/** Toolbar ***********************************************************/
+		/** Toolbar */
 
 		/**
 		 * @var string The primary toolbar ID.
 		 */
 		$this->my_account_menu_id = '';
 
-		/** URIs **************************************************************/
+		/** URIs */
 
 		/**
 		 * @var int The current offset of the URI.
@@ -336,7 +344,7 @@ class BuddyPress {
 		 */
 		$this->no_status_set = false;
 
-		/** Components ********************************************************/
+		/** Components */
 
 		/**
 		 * @var string Name of the current BuddyPress component (primary).
@@ -358,7 +366,7 @@ class BuddyPress {
 		 */
 		$this->is_single_item = false;
 
-		/** Root **************************************************************/
+		/** Root */
 
 		/**
 		 * Filters the BuddyPress Root blog ID.
@@ -369,36 +377,36 @@ class BuddyPress {
 		 */
 		$this->root_blog_id = (int) apply_filters( 'bp_get_root_blog_id', BP_ROOT_BLOG );
 
-		/** Paths**************************************************************/
+		/** Paths*/
 
 		// BuddyPress root directory
-		$this->file           = constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php';
-		$this->basename       = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
-		$this->plugin_dir     = trailingslashit( constant( 'BP_PLUGIN_DIR' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
-		$this->plugin_url     = trailingslashit( constant( 'BP_PLUGIN_URL' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
+		$this->file       = constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php';
+		$this->basename   = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
+		$this->plugin_dir = trailingslashit( constant( 'BP_PLUGIN_DIR' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
+		$this->plugin_url = trailingslashit( constant( 'BP_PLUGIN_URL' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) );
 
 		// Languages
-		$this->lang_dir       = $this->plugin_dir . 'bp-languages';
+		$this->lang_dir = $this->plugin_dir . 'bp-languages';
 
 		// Templates (theme compatibility)
-		$this->themes_dir     = $this->plugin_dir . 'bp-templates';
-		$this->themes_url     = $this->plugin_url . 'bp-templates';
+		$this->themes_dir = $this->plugin_dir . 'bp-templates';
+		$this->themes_url = $this->plugin_url . 'bp-templates';
 
 		// Themes (for bp-default)
 		$this->old_themes_dir = $this->plugin_dir . 'bp-themes';
 		$this->old_themes_url = $this->plugin_url . 'bp-themes';
 
-		/** Theme Compat ******************************************************/
+		/** Theme Compat */
 
-		$this->theme_compat   = new stdClass(); // Base theme compatibility class
-		$this->filters        = new stdClass(); // Used when adding/removing filters
+		$this->theme_compat = new stdClass(); // Base theme compatibility class
+		$this->filters      = new stdClass(); // Used when adding/removing filters
 
-		/** Users *************************************************************/
+		/** Users */
 
 		$this->current_user   = new stdClass();
 		$this->displayed_user = new stdClass();
 
-		/** Post types and taxonomies *****************************************/
+		/** Post types and taxonomies */
 
 		/**
 		 * Filters the post type slug for the email component.
@@ -407,7 +415,7 @@ class BuddyPress {
 		 *
 		 * @param string $value Email post type slug.
 		 */
-		$this->email_post_type     = apply_filters( 'bp_email_post_type', 'bp-email' );
+		$this->email_post_type = apply_filters( 'bp_email_post_type', 'bp-email' );
 
 		/**
 		 * Filters the taxonomy slug for the email type component.
@@ -449,70 +457,69 @@ class BuddyPress {
 	 * Include required files.
 	 *
 	 * @since 1.6.0
-	 *
 	 */
 	private function includes() {
 		spl_autoload_register( array( $this, 'autoload' ) );
 
 		// Load the WP abstraction file so BuddyPress can run on all WordPress setups.
-		require( $this->plugin_dir . 'bp-core/bp-core-wpabstraction.php' );
+		require $this->plugin_dir . 'bp-core/bp-core-wpabstraction.php';
 
 		// Setup the versions (after we include multisite abstraction above)
 		$this->versions();
 
-		/** Update/Install ****************************************************/
+		/** Update/Install */
 
 		// Theme compatibility
-		require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php'     );
-		require( $this->plugin_dir . 'bp-core/bp-core-theme-compatibility.php' );
+		require $this->plugin_dir . 'bp-core/bp-core-template-loader.php';
+		require $this->plugin_dir . 'bp-core/bp-core-theme-compatibility.php';
 
 		// Require all of the BuddyPress core libraries
-		require( $this->plugin_dir . 'bp-core/bp-core-dependency.php'       );
-		require( $this->plugin_dir . 'bp-core/bp-core-actions.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-caps.php'             );
-		require( $this->plugin_dir . 'bp-core/bp-core-cache.php'            );
-		require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'            );
-		require( $this->plugin_dir . 'bp-core/bp-core-update.php'           );
-		require( $this->plugin_dir . 'bp-core/bp-core-options.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-taxonomy.php'         );
-		require( $this->plugin_dir . 'bp-core/bp-core-filters.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-attachments.php'      );
-		require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'          );
-		require( $this->plugin_dir . 'bp-core/bp-core-template.php'         );
-		require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'         );
-		require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'         );
-		require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'         );
-		require( $this->plugin_dir . 'bp-core/bp-core-functions.php'        );
-		require( $this->plugin_dir . 'bp-core/bp-core-moderation.php'       );
-		require( $this->plugin_dir . 'bp-core/bp-core-loader.php'           );
-		require( $this->plugin_dir . 'bp-core/bp-core-customizer-email.php' );
-		require( $this->plugin_dir . 'bp-core/bp-core-rest-api.php'         );
+		require $this->plugin_dir . 'bp-core/bp-core-dependency.php';
+		require $this->plugin_dir . 'bp-core/bp-core-actions.php';
+		require $this->plugin_dir . 'bp-core/bp-core-caps.php';
+		require $this->plugin_dir . 'bp-core/bp-core-cache.php';
+		require $this->plugin_dir . 'bp-core/bp-core-cssjs.php';
+		require $this->plugin_dir . 'bp-core/bp-core-update.php';
+		require $this->plugin_dir . 'bp-core/bp-core-options.php';
+		require $this->plugin_dir . 'bp-core/bp-core-taxonomy.php';
+		require $this->plugin_dir . 'bp-core/bp-core-filters.php';
+		require $this->plugin_dir . 'bp-core/bp-core-attachments.php';
+		require $this->plugin_dir . 'bp-core/bp-core-avatars.php';
+		require $this->plugin_dir . 'bp-core/bp-core-widgets.php';
+		require $this->plugin_dir . 'bp-core/bp-core-template.php';
+		require $this->plugin_dir . 'bp-core/bp-core-adminbar.php';
+		require $this->plugin_dir . 'bp-core/bp-core-buddybar.php';
+		require $this->plugin_dir . 'bp-core/bp-core-catchuri.php';
+		require $this->plugin_dir . 'bp-core/bp-core-functions.php';
+		require $this->plugin_dir . 'bp-core/bp-core-moderation.php';
+		require $this->plugin_dir . 'bp-core/bp-core-loader.php';
+		require $this->plugin_dir . 'bp-core/bp-core-customizer-email.php';
+		require $this->plugin_dir . 'bp-core/bp-core-rest-api.php';
 
 		// Maybe load deprecated functionality (this double negative is proof positive!)
 		if ( ! bp_get_option( '_bp_ignore_deprecated_code', ! $this->load_deprecated ) ) {
-			require( $this->plugin_dir . 'bp-core/deprecated/1.2.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/1.7.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/1.9.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.0.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.1.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.2.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.3.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.4.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.5.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.6.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.7.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.8.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/2.9.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/3.0.php' );
-			require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
+			require $this->plugin_dir . 'bp-core/deprecated/1.2.php';
+			require $this->plugin_dir . 'bp-core/deprecated/1.5.php';
+			require $this->plugin_dir . 'bp-core/deprecated/1.6.php';
+			require $this->plugin_dir . 'bp-core/deprecated/1.7.php';
+			require $this->plugin_dir . 'bp-core/deprecated/1.9.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.0.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.1.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.2.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.3.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.4.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.5.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.6.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.7.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.8.php';
+			require $this->plugin_dir . 'bp-core/deprecated/2.9.php';
+			require $this->plugin_dir . 'bp-core/deprecated/3.0.php';
+			require $this->plugin_dir . 'bp-core/deprecated/4.0.php';
 		}
 
 		// Load wp-cli module if PHP 5.4+
 		if ( defined( 'WP_CLI' ) && file_exists( $this->plugin_dir . 'cli/wp-cli-bp.php' ) && version_compare( phpversion(), '5.4.0', '>=' ) ) {
-			require( $this->plugin_dir . 'cli/wp-cli-bp.php' );
+			require $this->plugin_dir . 'cli/wp-cli-bp.php';
 		}
 	}
 
@@ -545,8 +552,8 @@ class BuddyPress {
 
 		// These classes don't have a name that matches their component.
 		$irregular_map = array(
-			'BP_Akismet'                => 'activity',
-			'BP_REST_Activity_Endpoint' => 'activity',
+			'BP_Akismet'                                 => 'activity',
+			'BP_REST_Activity_Endpoint'                  => 'activity',
 
 			'BP_Admin'                                   => 'core',
 			'BP_Attachment_Avatar'                       => 'core',
@@ -580,30 +587,30 @@ class BuddyPress {
 			'BP_REST_Attachments_Member_Avatar_Endpoint' => 'core',
 			'BP_REST_Attachments_Group_Avatar_Endpoint'  => 'core',
 
-			'BP_Core_Friends_Widget' => 'friends',
+			'BP_Core_Friends_Widget'                     => 'friends',
 
-			'BP_Group_Extension'                        => 'groups',
-			'BP_Group_Member_Query'                     => 'groups',
-			'BP_REST_Groups_Endpoint'                   => 'groups',
-			'BP_REST_Group_Membership_Endpoint'         => 'groups',
-			'BP_REST_Group_Invites_Endpoint'            => 'groups',
-			'BP_REST_Group_Membership_Request_Endpoint' => 'groups',
+			'BP_Group_Extension'                         => 'groups',
+			'BP_Group_Member_Query'                      => 'groups',
+			'BP_REST_Groups_Endpoint'                    => 'groups',
+			'BP_REST_Group_Membership_Endpoint'          => 'groups',
+			'BP_REST_Group_Invites_Endpoint'             => 'groups',
+			'BP_REST_Group_Membership_Request_Endpoint'  => 'groups',
 
-			'BP_Core_Members_Template'       => 'members',
-			'BP_Core_Members_Widget'         => 'members',
-			'BP_Core_Recently_Active_Widget' => 'members',
-			'BP_Core_Whos_Online_Widget'     => 'members',
-			'BP_Registration_Theme_Compat'   => 'members',
-			'BP_Signup'                      => 'members',
-			'BP_REST_Members_Endpoint'       => 'members',
+			'BP_Core_Members_Template'                   => 'members',
+			'BP_Core_Members_Widget'                     => 'members',
+			'BP_Core_Recently_Active_Widget'             => 'members',
+			'BP_Core_Whos_Online_Widget'                 => 'members',
+			'BP_Registration_Theme_Compat'               => 'members',
+			'BP_Signup'                                  => 'members',
+			'BP_REST_Members_Endpoint'                   => 'members',
 
-			'BP_REST_Messages_Endpoint' => 'messages',
+			'BP_REST_Messages_Endpoint'                  => 'messages',
 
-			'BP_REST_Notifications_Endpoint' => 'notifications',
+			'BP_REST_Notifications_Endpoint'             => 'notifications',
 
-			'BP_REST_XProfile_Fields_Endpoint'       => 'xprofile',
-			'BP_REST_XProfile_Field_Groups_Endpoint' => 'xprofile',
-			'BP_REST_XProfile_Data_Endpoint'         => 'xprofile',
+			'BP_REST_XProfile_Fields_Endpoint'           => 'xprofile',
+			'BP_REST_XProfile_Field_Groups_Endpoint'     => 'xprofile',
+			'BP_REST_XProfile_Data_Endpoint'             => 'xprofile',
 		);
 
 		$component = null;
@@ -612,7 +619,7 @@ class BuddyPress {
 		if ( isset( $irregular_map[ $class ] ) ) {
 			$component = $irregular_map[ $class ];
 
-		// Next chunk is usually the component name.
+			// Next chunk is usually the component name.
 		} elseif ( in_array( $class_parts[1], $components, true ) ) {
 			$component = $class_parts[1];
 		}
@@ -654,12 +661,11 @@ class BuddyPress {
 	 * Set up the default hooks and actions.
 	 *
 	 * @since 1.6.0
-	 *
 	 */
 	private function setup_actions() {
 
 		// Add actions to plugin activation and deactivation hooks
-		add_action( 'activate_'   . $this->basename, 'bp_activation'   );
+		add_action( 'activate_' . $this->basename, 'bp_activation' );
 		add_action( 'deactivate_' . $this->basename, 'bp_deactivation' );
 
 		// If BuddyPress is being deactivated, do not add any actions
@@ -679,11 +685,11 @@ class BuddyPress {
 			'register_theme_packages',  // Register bundled theme packages (bp-themes)
 			'load_textdomain',          // Load textdomain
 			'add_rewrite_tags',         // Add rewrite tags
-			'generate_rewrite_rules'    // Generate rewrite rules
+			'generate_rewrite_rules',    // Generate rewrite rules
 		);
 
 		// Add the actions
-		foreach( $actions as $class_action ) {
+		foreach ( $actions as $class_action ) {
 			if ( method_exists( $this, $class_action ) ) {
 				add_action( 'bp_' . $class_action, array( $this, $class_action ), 5 );
 			}
@@ -713,19 +719,19 @@ class BuddyPress {
 		$versions['1.6-single'] = get_blog_option( $this->root_blog_id, '_bp_db_version' );
 
 		// 1.6-single exists, so trust it
-		if ( !empty( $versions['1.6-single'] ) ) {
+		if ( ! empty( $versions['1.6-single'] ) ) {
 			$this->db_version_raw = (int) $versions['1.6-single'];
 
-		// If no 1.6-single exists, use the max of the others
+			// If no 1.6-single exists, use the max of the others
 		} else {
-			$versions['1.2']        = get_site_option(                      'bp-core-db-version' );
-			$versions['1.5-multi']  = get_site_option(                           'bp-db-version' );
-			$versions['1.6-multi']  = get_site_option(                          '_bp_db_version' );
-			$versions['1.5-single'] = get_blog_option( $this->root_blog_id,      'bp-db-version' );
+			$versions['1.2']        = get_site_option( 'bp-core-db-version' );
+			$versions['1.5-multi']  = get_site_option( 'bp-db-version' );
+			$versions['1.6-multi']  = get_site_option( '_bp_db_version' );
+			$versions['1.5-single'] = get_blog_option( $this->root_blog_id, 'bp-db-version' );
 
 			// Remove empty array items
 			$versions             = array_filter( $versions );
-			$this->db_version_raw = (int) ( !empty( $versions ) ) ? (int) max( $versions ) : 0;
+			$this->db_version_raw = (int) ( ! empty( $versions ) ) ? (int) max( $versions ) : 0;
 		}
 	}
 
@@ -765,26 +771,30 @@ class BuddyPress {
 	public function register_theme_packages() {
 
 		// Register the default theme compatibility package
-		bp_register_theme_package( array(
-			'id'      => 'legacy',
-			'name'    => __( 'BuddyPress Legacy', 'buddypress' ),
-			'version' => bp_get_version(),
-			'dir'     => trailingslashit( $this->themes_dir . '/bp-legacy' ),
-			'url'     => trailingslashit( $this->themes_url . '/bp-legacy' )
-		) );
-
-		bp_register_theme_package( array(
-			'id'      => 'nouveau',
-			'name'    => __( 'BuddyPress Nouveau', 'buddypress' ),
-			'version' => bp_get_version(),
-			'dir'     => trailingslashit( $this->themes_dir . '/bp-nouveau' ),
-			'url'     => trailingslashit( $this->themes_url . '/bp-nouveau' )
-		) );
+		bp_register_theme_package(
+			array(
+				'id'      => 'legacy',
+				'name'    => __( 'BuddyPress Legacy', 'buddypress' ),
+				'version' => bp_get_version(),
+				'dir'     => trailingslashit( $this->themes_dir . '/bp-legacy' ),
+				'url'     => trailingslashit( $this->themes_url . '/bp-legacy' ),
+			)
+		);
+
+		bp_register_theme_package(
+			array(
+				'id'      => 'nouveau',
+				'name'    => __( 'BuddyPress Nouveau', 'buddypress' ),
+				'version' => bp_get_version(),
+				'dir'     => trailingslashit( $this->themes_dir . '/bp-nouveau' ),
+				'url'     => trailingslashit( $this->themes_url . '/bp-nouveau' ),
+			)
+		);
 
 		// Register the basic theme stack. This is really dope.
 		bp_register_template_stack( 'get_stylesheet_directory', 10 );
-		bp_register_template_stack( 'get_template_directory',   12 );
-		bp_register_template_stack( 'bp_get_theme_compat_dir',  14 );
+		bp_register_template_stack( 'get_template_directory', 12 );
+		bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
 	}
 
 	/**
-- 
2.22.0.windows.1