diff --git a/README.md b/README.md
index 1266899..210d92d 100644
--- a/README.md
+++ b/README.md
@@ -23,51 +23,57 @@ Also, please bear in mind that B3 is a work in progress and can't (yet) be consi
 
 The B3 REST API Extensions plugin enables the following additional endpoints.
 
-To make it easier to tell B3 extensions apart from the other endpoints, all of our additions are prepended by `b3:`.
+To make it easier to tell B3 extensions apart from the other endpoints, all of our additions are prepended by `b3_`.
 
 ### Comments
 
 We provide an alternative implementation of the Comments resource that allows retrieving comments without having to know which post they belong to.
 
-* `GET` `/b3:comments/<id>`
-* `GET` `/b3:comments/<id>/b3:replies`
-* `POST` `/b3:comments/<id>/b3:replies`
-* `GET` `/media/<id>/b3:replies`
-* `POST` `/media/<id>/b3:replies`
-* `GET` `/pages/<id>/b3:replies`
-* `POST` `/pages/<id>/b3:replies`
-* `GET` `/posts/<id>/b3:replies`
-* `POST` `/posts/<id>/b3:replies`
+* `GET` `/b3_comments/<id>`
+* `GET` `/b3_comments/<id>/b3_replies`
+* `POST` `/b3_comments/<id>/b3_replies`
+* `GET` `/media/<id>/b3_replies`
+* `POST` `/media/<id>/b3_replies`
+* `GET` `/pages/<id>/b3_replies`
+* `POST` `/pages/<id>/b3_replies`
+* `GET` `/posts/<id>/b3_replies`
+* `POST` `/posts/<id>/b3_replies`
 
 ### Media
 
 This endpoint provides a way to fetch a media attachment by its slug.
 
-* `GET` `/media/b3:slug:<slug>`
+* `GET` `/media/b3_slug:<slug>`
 
 ### Posts
 
 This endpoint provides a way to fetch a post by its slug.
 
-* `GET` `/posts/b3:slug:<slug>`
+* `GET` `/posts/b3_slug:<slug>`
 
 ### Menus
 
 We provide endpoints to fetch all Menus registered by the theme as well as the menu items configured in the WordPress Admin.
 
-* `GET` `/b3:menus`
-* `GET` `/b3:menus/<location>`
+* `GET` `/b3_menus`
+* `GET` `/b3_menus/<location>`
 
 ### Sidebars
 
 Similar to Menus, we allow fetching all widget areas registered by the theme as well as their widgets and widget content.
 
-* `GET` `/b3:sidebars`
-* `GET` `/b3:sidebars/<index>`
+* `GET` `/b3_sidebars`
+* `GET` `/b3_sidebars/<index>`
 
 ### Settings
 
 Finally, this plugin exposes WordPress settings through the API.  It wraps the `get_bloginfo()` function but exposes a few additional site options as well as the pretty permalinks table.
 
-* `GET` `/b3:settings`
-* `GET` `/b3:settings/<option>`
+* `GET` `/b3_settings`
+* `GET` `/b3_settings/<option>`
+
+### ACF (Advanced Custom Fields) Options Page fields
+
+Exposes all fields from a ACF options page if available.
+
+* `GET` `/b3_acf/options`
diff --git a/b3-rest-api.php b/b3-rest-api.php
index ef6c81a..45f8df3 100644
--- a/b3-rest-api.php
+++ b/b3-rest-api.php
@@ -75,6 +75,7 @@ public function __construct() {
 			'B3_Post'     => null,
 			'B3_Settings' => null,
 			'B3_Sidebar'  => null,
+			'B3_ACF_Options' => null
 		);
 
 		add_action( 'init', array( $this, 'init' ), 99 );
diff --git a/resources/B3_ACF_Options.php b/resources/B3_ACF_Options.php
new file mode 100644
index 0000000..8614aa2
--- /dev/null
+++ b/resources/B3_ACF_Options.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package B3
+ * @subpackage B3/API
+ */
+
+if (!defined('WPINC')) {
+	die;
+}
+
+/**
+ * Extends the default Post resource API.
+ */
+class B3_ACF_Options extends B3_API {
+
+	/**
+	 * Register new API routes for the Post resource.
+	 *
+	 * @param  array $routes API routes.
+	 * @return array         Changed API routes.
+	 */
+	public function register_routes($routes) {
+
+		$option_routes = array(
+			'/b3_acf/options' => array(
+				array(array($this, 'get_options'), WP_JSON_Server::READABLE),
+			)
+			// ,
+			// '/B3_acf/options/(?P<slug>\w+)' => array(
+			// 	array(array($this, 'get_options'), WP_JSON_Server::READABLE),
+			// )
+		);
+
+		return array_merge($routes, $option_routes);
+	}
+
+	/**
+	 * Retrieve all ACF options.
+	 *
+	 * @param  string         $context Context in which the post appears.
+	 *
+	 * @return array|WP_Error          Options entity, or error.
+	 */
+	public function get_options($context = 'view') {
+		global $wp_json_posts;
+		
+		$option = get_fields('option', false);
+
+		if (!$option) {
+			return B3_JSON_REST_API::error('json_option_invalid_slug',
+				__('Invalid option slug.', 'b3-rest-api'), 404);
+		}
+
+		return $option;
+	}
+
+
+
+
+
+	/**
+	 * Retrieve all ACF options by slug.
+	 *
+	 * @param  string         $slug    Options slug.
+	 * @param  string         $context Context in which the post appears.
+	 *
+	 * @return array|WP_Error          Options entity, or error.
+	 */
+	// public function get_options($slug, $context = 'view') {
+	// 	global $wp_json_posts;
+
+	// 	// if (empty($slug)) {
+	// 	// 	return B3_JSON_REST_API::error('json_option_invalid_slug',
+	// 	// 		__('Invalid option slug.'), 404);
+	// 	// }
+		
+	// 	$option = get_fields('option', false);
+
+	// 	if (!$option) {
+	// 		return B3_JSON_REST_API::error('json_option_invalid_slug',
+	// 			__('Invalid option slug.', 'b3-rest-api'), 404);
+	// 	}
+
+	// 	return $option;
+
+	// 	// return $wp_json_posts->get_options($post->ID, $context);
+	// }
+
+}
diff --git a/resources/B3_Comment.php b/resources/B3_Comment.php
index cebde2f..8aa2cea 100644
--- a/resources/B3_Comment.php
+++ b/resources/B3_Comment.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -20,27 +20,27 @@ class B3_Comment extends B3_API {
 	 *
 	 * @return array Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$comment_routes = array(
-			'/(posts|pages|media)/(?P<id>\d+)/b3:replies' => array(
-				array( array( $this, 'get_post_replies' ), WP_JSON_Server::READABLE ),
-				array( array( $this, 'new_post_reply' ), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON ),
+			'/(posts|pages|media)/(?P<id>\d+)/b3_replies' => array(
+				array(array($this, 'get_post_replies'), WP_JSON_Server::READABLE),
+				array(array($this, 'new_post_reply'), WP_JSON_Server::CREATABLE|WP_JSON_Server::ACCEPT_JSON),
 			),
 
-			'/b3:comments/(?P<id>\d+)' => array(
-				array( array( $this, 'get_comment' ), WP_JSON_Server::READABLE ),
+			'/b3_comments/(?P<id>\d+)' => array(
+				array(array($this, 'get_comment'), WP_JSON_Server::READABLE),
 				// array( array( $this, 'update_comment' ), WP_JSON_Server::EDITABLE | WP_JSON_Server::ACCEPT_JSON ),
 				// array( array( $this, 'delete_comment' ), WP_JSON_Server::DELETABLE ),
 			),
 
-			'/b3:comments/(?P<id>\d+)/b3:replies' => array(
-				array( array( $this, 'get_comment_replies' ), WP_JSON_Server::READABLE ),
-				array( array( $this, 'new_comment_reply' ), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON ),
+			'/b3_comments/(?P<id>\d+)/b3_replies' => array(
+				array(array($this, 'get_comment_replies'), WP_JSON_Server::READABLE),
+				array(array($this, 'new_comment_reply'), WP_JSON_Server::CREATABLE|WP_JSON_Server::ACCEPT_JSON),
 			),
 		);
 
-		return array_merge( $comment_routes, $routes );
+		return array_merge($comment_routes, $routes);
 	}
 
 	/**
@@ -50,26 +50,26 @@ public function register_routes( $routes ) {
 	 *
 	 * @return array|WP_Error List of Comment entities, or error.
 	 */
-	public function get_post_replies( $id ) {
+	public function get_post_replies($id) {
 
-		$post = get_post( $id, ARRAY_A );
+		$post = get_post($id, ARRAY_A);
 
-		if ( empty( $post['ID'] ) ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_id',
-				__( 'Invalid post ID.', 'b3-rest-api' ), 404 );
+		if (empty($post['ID'])) {
+			return B3_JSON_REST_API::error('json_post_invalid_id',
+				__('Invalid post ID.', 'b3-rest-api'), 404);
 		}
 
-		if ( ! $this->check_read_permission( $post ) ) {
-			return B3_JSON_REST_API::error( 'json_user_cannot_read',
-				__( 'Sorry, you cannot read this post.', 'b3-rest-api' ), 401 );
+		if (!$this->check_read_permission($post)) {
+			return B3_JSON_REST_API::error('json_user_cannot_read',
+				__('Sorry, you cannot read this post.', 'b3-rest-api'), 401);
 		}
 
-		$comments = get_comments( array( 'post_id' => $id ) );
+		$comments = get_comments(array('post_id' => $id));
 
 		$response = array();
 
-		foreach ( $comments as $comment ) {
-			$response[] = $this->prepare_comment( $comment, array( 'comment', 'meta' ), 'collection' );
+		foreach ($comments as $comment) {
+			$response[] = $this->prepare_comment($comment, array('comment', 'meta'), 'collection');
 		}
 
 		return $response;
@@ -83,24 +83,24 @@ public function get_post_replies( $id ) {
 	 *
 	 * @return array|WP_Error Comment entity for the new comment, or error.
 	 */
-	public function new_post_reply( $id, $data ) {
+	public function new_post_reply($id, $data) {
 
-		$post = get_post( $id, ARRAY_A );
+		$post = get_post($id, ARRAY_A);
 
-		$new_comment = $this->prepare_new_comment( $data, $post );
+		$new_comment = $this->prepare_new_comment($data, $post);
 
-		if ( is_wp_error( $new_comment ) ) {
+		if (is_wp_error($new_comment)) {
 			return $new_comment;
 		}
 
-		$comment_ID  = wp_new_comment( $new_comment );
+		$comment_ID = wp_new_comment($new_comment);
 
-		if ( ! $comment_ID ) {
-			return B3_JSON_REST_API::error( 'json_insert_error',
-				__( 'There was an error processing your comment.', 'b3-rest-api' ), 500 );
+		if (!$comment_ID) {
+			return B3_JSON_REST_API::error('json_insert_error',
+				__('There was an error processing your comment.', 'b3-rest-api'), 500);
 		}
 
-		return $this->get_comment( $comment_ID );
+		return $this->get_comment($comment_ID);
 	}
 
 	/**
@@ -110,23 +110,23 @@ public function new_post_reply( $id, $data ) {
 	 *
 	 * @return array|WP_Error Comment entity, or error.
 	 */
-	public function get_comment( $id ) {
+	public function get_comment($id) {
 
-		$comment = get_comment( $id );
+		$comment = get_comment($id);
 
-		if ( empty( $comment->comment_ID ) ) {
-			return B3_JSON_REST_API::error( 'json_comment_invalid_id',
-				__( 'Invalid comment ID.', 'b3-rest-api' ), 404 );
+		if (empty($comment->comment_ID)) {
+			return B3_JSON_REST_API::error('json_comment_invalid_id',
+				__('Invalid comment ID.', 'b3-rest-api'), 404);
 		}
 
-		$post = get_post( $comment->comment_post_ID, ARRAY_A );
+		$post = get_post($comment->comment_post_ID, ARRAY_A);
 
-		if ( ! $this->check_read_permission( $post ) ) {
-			return B3_JSON_REST_API::error( 'json_user_cannot_read',
-				__( 'Sorry, you cannot read replies to this post.', 'b3-rest-api' ), 403 );
+		if (!$this->check_read_permission($post)) {
+			return B3_JSON_REST_API::error('json_user_cannot_read',
+				__('Sorry, you cannot read replies to this post.', 'b3-rest-api'), 403);
 		}
 
-		return $this->prepare_comment( $comment, array( 'comment', 'meta' ), 'single' );
+		return $this->prepare_comment($comment, array('comment', 'meta'), 'single');
 	}
 
 	/**
@@ -139,9 +139,9 @@ public function get_comment( $id ) {
 	 *
 	 * @todo
 	 */
-	public function update_comment( $id, $data ) {
-		return B3_JSON_REST_API::error( 'json_not_implemented',
-			__( 'Not yet implemented.', 'b3-rest-api' ), 501 );
+	public function update_comment($id, $data) {
+		return B3_JSON_REST_API::error('json_not_implemented',
+			__('Not yet implemented.', 'b3-rest-api'), 501);
 	}
 
 	/**
@@ -153,9 +153,9 @@ public function update_comment( $id, $data ) {
 	 *
 	 * @todo
 	 */
-	public function delete_comment( $id ) {
-		return B3_JSON_REST_API::error( 'json_not_implemented',
-			__( 'Not yet implemented.', 'b3-rest-api' ), 501 );
+	public function delete_comment($id) {
+		return B3_JSON_REST_API::error('json_not_implemented',
+			__('Not yet implemented.', 'b3-rest-api'), 501);
 	}
 
 	/**
@@ -166,28 +166,28 @@ public function delete_comment( $id ) {
 	 *
 	 * @return array|WP_Error Collection of Comment entities, or error.
 	 */
-	public function get_comment_replies( $id ) {
+	public function get_comment_replies($id) {
 
-		$comment = get_comment( $id );
+		$comment = get_comment($id);
 
-		if ( empty( $comment->comment_ID ) ) {
-			return B3_JSON_REST_API::error( 'json_comment_invalid_id',
-				__( 'Invalid comment ID.', 'b3-rest-api' ), 404 );
+		if (empty($comment->comment_ID)) {
+			return B3_JSON_REST_API::error('json_comment_invalid_id',
+				__('Invalid comment ID.', 'b3-rest-api'), 404);
 		}
 
-		$post = get_post( $comment->comment_post_ID, ARRAY_A );
+		$post = get_post($comment->comment_post_ID, ARRAY_A);
 
-		if ( ! $this->check_read_permission( $post ) ) {
-			return B3_JSON_REST_API::error( 'json_user_cannot_read',
-				__( 'Sorry, you cannot read this post.', 'b3-rest-api' ), 401 );
+		if (!$this->check_read_permission($post)) {
+			return B3_JSON_REST_API::error('json_user_cannot_read',
+				__('Sorry, you cannot read this post.', 'b3-rest-api'), 401);
 		}
 
-		$comments = get_comments( array( 'parent' => $id ) );
+		$comments = get_comments(array('parent' => $id));
 
 		$response = array();
 
-		foreach ( $comments as $comment ) {
-			$response[] = $this->prepare_comment( $comment, array( 'comment', 'meta' ), 'collection' );
+		foreach ($comments as $comment) {
+			$response[] = $this->prepare_comment($comment, array('comment', 'meta'), 'collection');
 		}
 
 		return $response;
@@ -201,31 +201,31 @@ public function get_comment_replies( $id ) {
 	 *
 	 * @return array The newly created comment entity.
 	 */
-	public function new_comment_reply( $id, $data ) {
+	public function new_comment_reply($id, $data) {
 
-		$comment = get_comment( $id );
+		$comment = get_comment($id);
 
-		if ( empty( $comment->comment_ID ) ) {
-			return B3_JSON_REST_API::error( 'json_comment_invalid_id',
-				__( 'Invalid comment ID.', 'b3-rest-api' ), 404 );
+		if (empty($comment->comment_ID)) {
+			return B3_JSON_REST_API::error('json_comment_invalid_id',
+				__('Invalid comment ID.', 'b3-rest-api'), 404);
 		}
 
-		$post = get_post( $comment->comment_post_ID, ARRAY_A );
+		$post = get_post($comment->comment_post_ID, ARRAY_A);
 
-		$new_comment = $this->prepare_new_comment( $data, $post, $comment );
+		$new_comment = $this->prepare_new_comment($data, $post, $comment);
 
-		if ( is_wp_error( $new_comment ) ) {
+		if (is_wp_error($new_comment)) {
 			return $new_comment;
 		}
 
-		$comment_ID  = wp_new_comment( $new_comment );
+		$comment_ID = wp_new_comment($new_comment);
 
-		if ( ! $comment_ID ) {
-			return B3_JSON_REST_API::error( 'json_insert_error',
-				__( 'There was an error processing your comment.', 'b3-rest-api' ), 500 );
+		if (!$comment_ID) {
+			return B3_JSON_REST_API::error('json_insert_error',
+				__('There was an error processing your comment.', 'b3-rest-api'), 500);
 		}
 
-		return $this->get_comment( $comment_ID );
+		return $this->get_comment($comment_ID);
 	}
 
 	/**
@@ -235,31 +235,31 @@ public function new_comment_reply( $id, $data ) {
 	 *
 	 * @return boolean Whether the current user is allowed to read this post.
 	 */
-	protected function check_read_permission( $post ) {
-		$post_type = get_post_type_object( $post['post_type'] );
+	protected function check_read_permission($post) {
+		$post_type = get_post_type_object($post['post_type']);
 
 		// Ensure the post type can be read
-		if ( ! $post_type->show_in_json ) {
+		if (!$post_type->show_in_json) {
 			return false;
 		}
 
 		// Can we read the post?
-		if ( 'publish' === $post['post_status'] || current_user_can( $post_type->cap->read_post, $post['ID'] ) ) {
+		if ('publish' === $post['post_status'] || current_user_can($post_type->cap->read_post, $post['ID'])) {
 			return true;
 		}
 
 		// Can we read the parent if we're inheriting?
-		if ( 'inherit' === $post['post_status'] && $post['post_parent'] > 0 ) {
-			$parent = get_post( $post['post_parent'], ARRAY_A );
+		if ('inherit' === $post['post_status'] && $post['post_parent'] > 0) {
+			$parent = get_post($post['post_parent'], ARRAY_A);
 
-			if ( $this->check_read_permission( $parent ) ) {
+			if ($this->check_read_permission($parent)) {
 				return true;
 			}
 		}
 
 		// If we don't have a parent, but the status is set to inherit, assume
 		// it's published (as per get_post_status())
-		if ( 'inherit' === $post['post_status'] ) {
+		if ('inherit' === $post['post_status']) {
 			return true;
 		}
 
@@ -274,8 +274,8 @@ protected function check_read_permission( $post ) {
 	 * @return boolean Whether the current user is allowed to comment on this
 	 *                 post.
 	 */
-	protected function check_reply_permission( $post ) {
-		return comments_open( $post['ID'] );
+	protected function check_reply_permission($post) {
+		return comments_open($post['ID']);
 	}
 
 	/**
@@ -288,7 +288,7 @@ protected function check_reply_permission( $post ) {
 	 *
 	 * @todo
 	 */
-	protected function check_edit_permission( $comment ) {
+	protected function check_edit_permission($comment) {
 		return false;
 	}
 
@@ -302,7 +302,7 @@ protected function check_edit_permission( $comment ) {
 	 *
 	 * @todo
 	 */
-	protected function check_delete_permission( $comment ) {
+	protected function check_delete_permission($comment) {
 		return false;
 	}
 
@@ -315,22 +315,22 @@ protected function check_delete_permission( $comment ) {
 	 *
 	 * @return array Prepared comment entity.
 	 */
-	protected function prepare_comment( $comment, $requested_fields = array( 'comment', 'meta' ), $context = 'single' ) {
+	protected function prepare_comment($comment, $requested_fields = array('comment', 'meta'), $context = 'single') {
 		$fields = array(
-			'ID'   => (int) $comment->comment_ID,
+			'ID' => (int) $comment->comment_ID,
 			'post' => (int) $comment->comment_post_ID,
 		);
 
 		// Content
-		$fields['content'] = apply_filters( 'comment_text', $comment->comment_content, $comment );
+		$fields['content'] = apply_filters('comment_text', $comment->comment_content, $comment);
 
 		// Status
-		$fields['status'] = $this->get_comment_status( $comment );
+		$fields['status'] = $this->get_comment_status($comment);
 
 		// Type
-		$fields['type'] = apply_filters( 'get_comment_type', $comment->comment_type );
+		$fields['type'] = apply_filters('get_comment_type', $comment->comment_type);
 
-		if ( empty( $fields['type'] ) ) {
+		if (empty($fields['type'])) {
 			$fields['type'] = 'comment';
 		}
 
@@ -338,34 +338,34 @@ protected function prepare_comment( $comment, $requested_fields = array( 'commen
 		$fields['parent'] = (int) $comment->comment_parent;
 
 		// Author
-		$fields['author'] = $this->get_comment_author( $comment );
+		$fields['author'] = $this->get_comment_author($comment);
 
 		// Date
 		$timezone = json_get_timezone();
 
-		$date               = WP_JSON_DateTime::createFromFormat( 'Y-m-d H:i:s', $comment->comment_date, $timezone );
-		$fields['date']     = $date->format( 'c' );
-		$fields['date_tz']  = $date->format( 'e' );
-		$fields['date_gmt'] = date( 'c', strtotime( $comment->comment_date_gmt ) );
+		$date = WP_JSON_DateTime::createFromFormat('Y-m-d H:i:s', $comment->comment_date, $timezone);
+		$fields['date'] = $date->format('c');
+		$fields['date_tz'] = $date->format('e');
+		$fields['date_gmt'] = date('c', strtotime($comment->comment_date_gmt));
 
 		// Remove unneeded fields
 		$data = array();
 
-		if ( in_array( 'comment', $requested_fields ) ) {
-			$data = array_merge( $data, $fields );
+		if (in_array('comment', $requested_fields)) {
+			$data = array_merge($data, $fields);
 		}
 
-		if ( in_array( 'meta', $requested_fields ) ) {
-			$data['meta'] = $this->prepare_comment_meta( $comment, $context );
+		if (in_array('meta', $requested_fields)) {
+			$data['meta'] = $this->prepare_comment_meta($comment, $context);
 		}
 
-		return apply_filters( 'b3_prepare_comment', $data, $comment, $context );
+		return apply_filters('b3_prepare_comment', $data, $comment, $context);
 	}
 
 	/**
 	 * Alter Post entities returned by the service.
 	 *
-	 * - Changes the reply link to use the `/{type}/{id}/b3:replies` endpoint.
+	 * - Changes the reply link to use the `/{type}/{id}/b3_replies` endpoint.
 	 *
 	 * @param array  $_post   Post entity data.
 	 * @param array  $post    Raw post data.
@@ -373,12 +373,12 @@ protected function prepare_comment( $comment, $requested_fields = array( 'commen
 	 *
 	 * @return array Changed post entity data.
 	 */
-	public function prepare_post( $_post, $post, $context ) {
+	public function prepare_post($_post, $post, $context) {
 
-		if ( 'view-revision' !== $context ) {
+		if ('view-revision' !== $context) {
 			$replies = $_post['meta']['links']['replies'];
-			$replies = preg_replace( '/\/comments$/', '/b3:replies', $replies );
-			$_post['meta']['links']['b3:replies'] = $replies;
+			$replies = preg_replace('/\/comments$/', '/b3_replies', $replies);
+			$_post['meta']['links']['b3_replies'] = $replies;
 		}
 
 		return $_post;
@@ -390,9 +390,9 @@ public function prepare_post( $_post, $post, $context ) {
 	 * @param  object $comment Raw comment data.
 	 * @return string          Comment status.
 	 */
-	protected function get_comment_status( $comment ) {
+	protected function get_comment_status($comment) {
 
-		switch ( $comment->comment_approved ) {
+		switch ($comment->comment_approved) {
 			case 'hold':
 			case '0':
 				$status = 'hold';
@@ -417,26 +417,26 @@ protected function get_comment_status( $comment ) {
 	 * @param  object $comment Raw comment data.
 	 * @return array           Comment author data.
 	 */
-	protected function get_comment_author( $comment ) {
+	protected function get_comment_author($comment) {
 
-		if ( (int) $comment->user_id > 0 ) {
-			$user = get_user_by( 'id', $comment->user_id );
+		if ((int) $comment->user_id > 0) {
+			$user = get_user_by('id', $comment->user_id);
 
-			if ( ! empty( $user ) && ! is_wp_error( $user ) ) {
+			if (!empty($user) && !is_wp_error($user)) {
 				return array(
-					'ID'     => (int) $user->ID,
-					'name'   => $user->display_name,
-					'URL'    => $user->user_url,
-					'avatar' => json_get_avatar_url( $user->user_email ),
+					'ID' => (int) $user->ID,
+					'name' => $user->display_name,
+					'URL' => $user->user_url,
+					'avatar' => json_get_avatar_url($user->user_email),
 				);
 			}
 		}
 
 		return array(
-			'ID'     => 0,
-			'name'   => $comment->comment_author,
-			'URL'    => $comment->comment_author_url,
-			'avatar' => json_get_avatar_url( $comment->comment_author_email ),
+			'ID' => 0,
+			'name' => $comment->comment_author,
+			'URL' => $comment->comment_author_url,
+			'avatar' => json_get_avatar_url($comment->comment_author_email),
 		);
 	}
 
@@ -448,20 +448,20 @@ protected function get_comment_author( $comment ) {
 	 *
 	 * @return array Comment meta data.
 	 */
-	protected function prepare_comment_meta( $comment, $context = 'single' ) {
+	protected function prepare_comment_meta($comment, $context = 'single') {
 
 		$meta = array(
 			'links' => array(
-				'up' => json_url( sprintf( '/posts/%d', (int) $comment->comment_post_ID ) ),
+				'up' => json_url(sprintf('/posts/%d', (int) $comment->comment_post_ID)),
 			),
 		);
 
-		if ( 0 !== (int) $comment->comment_parent ) {
-			$meta['links']['in-reply-to'] = json_url( sprintf( '/b3:comments/%d', (int) $comment->comment_parent ) );
+		if (0 !== (int) $comment->comment_parent) {
+			$meta['links']['in-reply-to'] = json_url(sprintf('/b3_comments/%d', (int) $comment->comment_parent));
 		}
 
-		if ( 'single' !== $context ) {
-			$meta['links']['self'] = json_url( sprintf( '/b3:comments/%d', (int) $comment->comment_ID ) );
+		if ('single' !== $context) {
+			$meta['links']['self'] = json_url(sprintf('/b3_comments/%d', (int) $comment->comment_ID));
 		}
 
 		return $meta;
@@ -479,39 +479,39 @@ protected function prepare_comment_meta( $comment, $context = 'single' ) {
 	 *
 	 * @return array Prepared comment data.
 	 */
-	protected function prepare_new_comment( $data, $post, $comment = null ) {
+	protected function prepare_new_comment($data, $post, $comment = null) {
 
-		if ( empty( $post['ID'] ) ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_id',
-				__( 'Invalid post ID.', 'b3-rest-api' ), 404 );
+		if (empty($post['ID'])) {
+			return B3_JSON_REST_API::error('json_post_invalid_id',
+				__('Invalid post ID.', 'b3-rest-api'), 404);
 		}
 
-		if ( ! $this->check_read_permission( $post ) ) {
-			return B3_JSON_REST_API::error( 'json_user_cannot_read',
-				__( 'Sorry, you cannot read replies to this post.', 'b3-rest-api' ), 403 );
+		if (!$this->check_read_permission($post)) {
+			return B3_JSON_REST_API::error('json_user_cannot_read',
+				__('Sorry, you cannot read replies to this post.', 'b3-rest-api'), 403);
 		}
 
-		if ( ! $this->check_reply_permission( $post ) ) {
-			return B3_JSON_REST_API::error( 'json_user_cannot_reply',
-				__( 'Sorry, you cannot reply to this post.', 'b3-rest-api' ), 403 );
+		if (!$this->check_reply_permission($post)) {
+			return B3_JSON_REST_API::error('json_user_cannot_reply',
+				__('Sorry, you cannot reply to this post.', 'b3-rest-api'), 403);
 		}
 
 		$new_comment = array(
-			'comment_post_ID'      => $post['ID'],
-			'comment_parent'       => ifsetor( $data['parent_comment'] ),
-			'comment_content'      => ifsetor( $data['content'] ),
-			'comment_author'       => ifsetor( $data['author']['name'] ),
-			'comment_author_email' => ifsetor( $data['author']['email'] ),
-			'comment_author_url'   => ifsetor( $data['author']['URL'] ),
+			'comment_post_ID' => $post['ID'],
+			'comment_parent' => ifsetor($data['parent_comment']),
+			'comment_content' => ifsetor($data['content']),
+			'comment_author' => ifsetor($data['author']['name']),
+			'comment_author_email' => ifsetor($data['author']['email']),
+			'comment_author_url' => ifsetor($data['author']['URL']),
 		);
 
-		if ( ! empty( $comment ) ) {
+		if (!empty($comment)) {
 			$new_comment['comment_parent'] = $comment->comment_ID;
 		}
 
-		$new_comment = $this->prepare_new_comment_author( $new_comment );
+		$new_comment = $this->prepare_new_comment_author($new_comment);
 
-		return $this->validate_comment( $new_comment );
+		return $this->validate_comment($new_comment);
 	}
 
 	/**
@@ -521,16 +521,16 @@ protected function prepare_new_comment( $data, $post, $comment = null ) {
 	 *
 	 * @return array New comment data with author information.
 	 */
-	protected function prepare_new_comment_author( $comment ) {
-		if ( is_user_logged_in() ) {
+	protected function prepare_new_comment_author($comment) {
+		if (is_user_logged_in()) {
 			$user = wp_get_current_user();
 
-			if ( $user && $user->ID ) {
-				$comment['user_ID']              = $user->ID;
-				$comment['user_id']              = $user->ID;
-				$comment['comment_author']       = $user->display_name;
+			if ($user && $user->ID) {
+				$comment['user_ID'] = $user->ID;
+				$comment['user_id'] = $user->ID;
+				$comment['comment_author'] = $user->display_name;
 				$comment['comment_author_email'] = $user->user_email;
-				$comment['comment_author_url']   = $user->user_url;
+				$comment['comment_author_url'] = $user->user_url;
 			}
 		}
 
@@ -544,22 +544,22 @@ protected function prepare_new_comment_author( $comment ) {
 	 *
 	 * @return array|WP_Error Validated comment or error.
 	 */
-	protected function validate_comment( $comment ) {
-		if ( get_option( 'require_name_email' ) ) {
-			if ( empty( $comment['comment_author_email'] ) || '' == $comment['comment_author'] ) {
-				return B3_JSON_REST_API::error( 'json_bad_comment',
-					__( 'Comment author name and email are required.', 'b3-rest-api' ), 400 );
+	protected function validate_comment($comment) {
+		if (get_option('require_name_email')) {
+			if (empty($comment['comment_author_email']) || '' == $comment['comment_author']) {
+				return B3_JSON_REST_API::error('json_bad_comment',
+					__('Comment author name and email are required.', 'b3-rest-api'), 400);
 			}
 
-			if ( ! is_email( $comment['comment_author_email'] ) ) {
-				return B3_JSON_REST_API::error( 'json_bad_comment',
-					__( 'A valid email address is required.', 'b3-rest-api' ), 400 );
+			if (!is_email($comment['comment_author_email'])) {
+				return B3_JSON_REST_API::error('json_bad_comment',
+					__('A valid email address is required.', 'b3-rest-api'), 400);
 			}
 		}
 
-		if ( empty( $comment['comment_content'] ) ) {
-			return B3_JSON_REST_API::error( 'json_bad_comment',
-				__( 'Your comment must not be empty.', 'b3-rest-api' ), 400 );
+		if (empty($comment['comment_content'])) {
+			return B3_JSON_REST_API::error('json_bad_comment',
+				__('Your comment must not be empty.', 'b3-rest-api'), 400);
 		}
 
 		return $comment;
diff --git a/resources/B3_Media.php b/resources/B3_Media.php
index d110335..9f4f292 100644
--- a/resources/B3_Media.php
+++ b/resources/B3_Media.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -19,15 +19,15 @@ class B3_Media extends B3_API {
 	 * @param  array $routes API routes.
 	 * @return array         Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$post_routes = array(
-			'/media/b3:slug:(?P<slug>.+)' => array(
-				array( array( $this, 'get_post' ), WP_JSON_Server::READABLE ),
+			'/media/b3_slug:(?P<slug>.+)' => array(
+				array(array($this, 'get_post'), WP_JSON_Server::READABLE),
 			),
 		);
 
-		return array_merge( $routes, $post_routes );
+		return array_merge($routes, $post_routes);
 	}
 
 	/**
@@ -38,26 +38,26 @@ public function register_routes( $routes ) {
 	 *
 	 * @return array|WP_Error          Attachment entity, or error.
 	 */
-	public function get_post( $slug, $context = 'view' ) {
+	public function get_post($slug, $context = 'view') {
 		global $wp_json_media;
 
-		if ( empty( $slug ) ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_slug',
-				__( 'Invalid post slug.' ), 404 );
+		if (empty($slug)) {
+			return B3_JSON_REST_API::error('json_post_invalid_slug',
+				__('Invalid post slug.'), 404);
 		}
 
-		$posts = get_posts( array(
-			'name'           => $slug,
-			'post_type'      => 'attachment',
+		$posts = get_posts(array(
+			'name' => $slug,
+			'post_type' => 'attachment',
 			'posts_per_page' => 1,
-		) );
+		));
 
-		if ( empty( $posts ) ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_slug',
-				__( 'Invalid post slug.', 'b3-rest-api' ), 404 );
+		if (empty($posts)) {
+			return B3_JSON_REST_API::error('json_post_invalid_slug',
+				__('Invalid post slug.', 'b3-rest-api'), 404);
 		}
 
-		return $wp_json_media->get_post( $posts[0]->ID, $context );
+		return $wp_json_media->get_post($posts[0]->ID, $context);
 	}
 
 }
diff --git a/resources/B3_Menu.php b/resources/B3_Menu.php
index 17454c3..4289f0c 100644
--- a/resources/B3_Menu.php
+++ b/resources/B3_Menu.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -19,19 +19,19 @@ class B3_Menu extends B3_API {
 	 * @param  array $routes API routes.
 	 * @return array         Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$menu_routes = array(
-			'/b3:menus' => array(
-				array( array( $this, 'get_menus' ), WP_JSON_Server::READABLE ),
+			'/b3_menus' => array(
+				array(array($this, 'get_menus'), WP_JSON_Server::READABLE),
 			),
 
-			'/b3:menus/(?P<location>\w+)' => array(
-				array( array( $this, 'get_menu' ), WP_JSON_Server::READABLE ),
+			'/b3_menus/(?P<location>\w+)' => array(
+				array(array($this, 'get_menu'), WP_JSON_Server::READABLE),
 			),
 		);
 
-		return array_merge( $routes, $menu_routes );
+		return array_merge($routes, $menu_routes);
 	}
 
 	/**
@@ -40,7 +40,7 @@ public function register_routes( $routes ) {
 	 * @return array Collection of menu entities.
 	 */
 	public function get_menus() {
-		return $this->prepare_location( get_registered_nav_menus() );
+		return $this->prepare_location(get_registered_nav_menus());
 	}
 
 	/**
@@ -51,18 +51,18 @@ public function get_menus() {
 	 *
 	 * @return array|WP_Error           Menu entity.
 	 */
-	public function get_menu( $location, $context = 'single' ) {
+	public function get_menu($location, $context = 'single') {
 
 		$menus = get_registered_nav_menus();
 
-		if ( ! isset( $menus[ $location ] ) ) {
-			return B3_JSON_REST_API::error( 'json_menu_invalid_id',
-				__( 'Invalid menu location.', 'b3-rest-api' ), 404 );
+		if (!isset($menus[$location])) {
+			return B3_JSON_REST_API::error('json_menu_invalid_id',
+				__('Invalid menu location.', 'b3-rest-api'), 404);
 		}
 
-		$menus = $this->prepare_location( array( $location => $menus[ $location ] ), $location );
+		$menus = $this->prepare_location(array($location => $menus[$location]), $location);
 
-		return $menus[ $location ];
+		return $menus[$location];
 	}
 
 	/**
@@ -72,34 +72,34 @@ public function get_menu( $location, $context = 'single' ) {
 	 * @param  string $context    The context for the prepared menu. (single|collection)
 	 * @return array              Menu location entity data.
 	 */
-	protected function prepare_location( $_locations, $context = null ) {
+	protected function prepare_location($_locations, $context = null) {
 
 		$locations = array();
 
-		foreach ( $_locations as $location => $name ) {
-			$locations[ $location ] = array(
+		foreach ($_locations as $location => $name) {
+			$locations[$location] = array(
 				'location' => $location,
-				'name'     => $name,
-				'meta'     => array(
+				'name' => $name,
+				'meta' => array(
 					'links' => array(
-						'self'       => json_url( sprintf( '/b3:menus/%s', $location ) ),
-						'collection' => json_url( '/b3:menus' ),
+						'self' => json_url(sprintf('/b3:menus/%s', $location)),
+						'collection' => json_url('/b3:menus'),
 					),
 				),
 			);
 
-			if ( ! empty( $context ) ) {
+			if (!empty($context)) {
 				$menu_locations = get_nav_menu_locations();
-				$menu_id        = ifsetor( $menu_locations[ $context ], false );
+				$menu_id = ifsetor($menu_locations[$context], false);
 
-				if ( $menu_id ) {
-					$menu = get_term_by( 'id', $menu_id, 'nav_menu' );
-					$locations[ $location ]['menu'] = $this->prepare_menu( $menu );
+				if ($menu_id) {
+					$menu = get_term_by('id', $menu_id, 'nav_menu');
+					$locations[$location]['menu'] = $this->prepare_menu($menu);
 				}
 			}
 		}
 
-		return apply_filters( 'b3_menu_locations', $locations, $_locations, $context );
+		return apply_filters('b3_menu_locations', $locations, $_locations, $context);
 	}
 
 	/**
@@ -107,18 +107,18 @@ protected function prepare_location( $_locations, $context = null ) {
 	 * @param  [type] $_menu [description]
 	 * @return [type]        [description]
 	 */
-	protected function prepare_menu( $_menu ) {
+	protected function prepare_menu($_menu) {
 
 		$menu = array(
-			'ID'          => $_menu->term_id,
-			'name'        => $_menu->name,
-			'slug'        => $_menu->slug,
+			'ID' => $_menu->term_id,
+			'name' => $_menu->name,
+			'slug' => $_menu->slug,
 			'description' => $_menu->description,
-			'count'       => $_menu->count,
-			'items'       => $this->prepare_menu_items( wp_get_nav_menu_items( $_menu ) ),
+			'count' => $_menu->count,
+			'items' => $this->prepare_menu_items(wp_get_nav_menu_items($_menu)),
 		);
 
-		return apply_filters( 'b3_menu', $menu );
+		return apply_filters('b3_menu', $menu);
 	}
 
 	/**
@@ -127,39 +127,39 @@ protected function prepare_menu( $_menu ) {
 	 * @param  [type] $menu   [description]
 	 * @return [type]         [description]
 	 */
-	protected function prepare_menu_items( $_items ) {
+	protected function prepare_menu_items($_items) {
 
 		$items = array();
 
-		foreach ( $_items as $_item ) {
+		foreach ($_items as $_item) {
 			$item = array(
-				'ID'            => (int) $_item->ID,
-				'parent'        => (int) $_item->menu_item_parent,
-				'order'         => (int) $_item->menu_order,
-				'type'          => $_item->post_type,
-				'guid'          => $_item->guid,
-				'object'        => (int) $_item->object_id,
+				'ID' => (int) $_item->ID,
+				'parent' => (int) $_item->menu_item_parent,
+				'order' => (int) $_item->menu_order,
+				'type' => $_item->post_type,
+				'guid' => $_item->guid,
+				'object' => (int) $_item->object_id,
 				'object_parent' => (int) $_item->post_parent,
-				'object_type'   => $_item->object,
-				'link'          => $_item->url,
-				'title'         => $_item->title,
-				'attr_title'    => $_item->attr_title,
-				'description'   => $_item->description,
-				'classes'       => $_item->classes,
-				'target'        => $_item->target,
-				'xfn'           => $_item->xfn,
+				'object_type' => $_item->object,
+				'link' => $_item->url,
+				'title' => $_item->title,
+				'attr_title' => $_item->attr_title,
+				'description' => $_item->description,
+				'classes' => $_item->classes,
+				'target' => $_item->target,
+				'xfn' => $_item->xfn,
 			);
 
-			$link = $this->get_object_link( $_item );
+			$link = $this->get_object_link($_item);
 
-			if ( ! empty( $link ) ) {
-				$item['meta'] = array( 'links' => array( 'object' => $link ) );
+			if (!empty($link)) {
+				$item['meta'] = array('links' => array('object' => $link));
 			}
 
 			$items[] = $item;
 		}
 
-		return apply_filters( 'b3_menu_items', $items );
+		return apply_filters('b3_menu_items', $items);
 	}
 
 	/**
@@ -167,18 +167,18 @@ protected function prepare_menu_items( $_items ) {
 	 * @param  [type] $item [description]
 	 * @return [type]       [description]
 	 */
-	protected function get_object_link( $item ) {
+	protected function get_object_link($item) {
 
 		$link = false;
 
-		if ( 'post_type' === $item->type ) {
-			$link = $this->get_post_type_link( $item );
+		if ('post_type' === $item->type) {
+			$link = $this->get_post_type_link($item);
 
-		} elseif ( 'taxonomy' === $item->type ) {
-			$link = $this->get_term_link( $item );
+		} elseif ('taxonomy' === $item->type) {
+			$link = $this->get_term_link($item);
 		}
 
-		return apply_filters( 'b3_item_link', $link, $item );
+		return apply_filters('b3_item_link', $link, $item);
 	}
 
 	/**
@@ -186,19 +186,19 @@ protected function get_object_link( $item ) {
 	 * @param  [type] $item [description]
 	 * @return [type]       [description]
 	 */
-	protected function get_post_type_link( $item ) {
+	protected function get_post_type_link($item) {
 
-		switch ( $item->object ) {
+		switch ($item->object) {
 			case 'page':
-				$link = json_url( sprintf( '/pages/%s', get_page_uri( $item->object_id ) ) );
+				$link = json_url(sprintf('/pages/%s', get_page_uri($item->object_id)));
 				break;
 
 			default:
-				$link = json_url( sprintf( '/posts/%d', $item->object_id ) );
+				$link = json_url(sprintf('/posts/%d', $item->object_id));
 				break;
 		}
 
-		return apply_filters( 'b3_post_type_link', $link, $item->object_id, $item->object );
+		return apply_filters('b3_post_type_link', $link, $item->object_id, $item->object);
 	}
 
 	/**
@@ -206,9 +206,9 @@ protected function get_post_type_link( $item ) {
 	 * @param  [type] $item [description]
 	 * @return [type]       [description]
 	 */
-	protected function get_term_link( $item ) {
+	protected function get_term_link($item) {
 
-		switch ( $item->object ) {
+		switch ($item->object) {
 			case 'tag':
 				$taxonomy = 'post_tag';
 				break;
@@ -218,9 +218,9 @@ protected function get_term_link( $item ) {
 				break;
 		}
 
-		$link = json_url( sprintf( '/taxonomies/%s/terms/%d', $taxonomy, $item->object_id ) );
+		$link = json_url(sprintf('/taxonomies/%s/terms/%d', $taxonomy, $item->object_id));
 
-		return apply_filters( 'b3_taxonomy_link', $link, $item->object_id, $item->object );
+		return apply_filters('b3_taxonomy_link', $link, $item->object_id, $item->object);
 	}
 
 }
diff --git a/resources/B3_Post.php b/resources/B3_Post.php
index f35691d..8b10542 100644
--- a/resources/B3_Post.php
+++ b/resources/B3_Post.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -19,15 +19,15 @@ class B3_Post extends B3_API {
 	 * @param  array $routes API routes.
 	 * @return array         Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$post_routes = array(
-			'/posts/b3:slug:(?P<slug>.+)' => array(
-				array( array( $this, 'get_post' ), WP_JSON_Server::READABLE ),
+			'/posts/b3_slug:(?P<slug>.+)' => array(
+				array(array($this, 'get_post'), WP_JSON_Server::READABLE),
 			),
 		);
 
-		return array_merge( $routes, $post_routes );
+		return array_merge($routes, $post_routes);
 	}
 
 	/**
@@ -38,22 +38,22 @@ public function register_routes( $routes ) {
 	 *
 	 * @return array|WP_Error          Post entity, or error.
 	 */
-	public function get_post( $slug, $context = 'view' ) {
+	public function get_post($slug, $context = 'view') {
 		global $wp_json_posts;
 
-		if ( empty( $slug ) ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_slug',
-				__( 'Invalid post slug.' ), 404 );
+		if (empty($slug)) {
+			return B3_JSON_REST_API::error('json_post_invalid_slug',
+				__('Invalid post slug.'), 404);
 		}
 
-		$post = get_page_by_path( $slug, OBJECT, get_post_types( array( 'show_in_json' => true ) ) );
+		$post = get_page_by_path($slug, OBJECT, get_post_types(array('show_in_json' => true)));
 
-		if ( ! $post ) {
-			return B3_JSON_REST_API::error( 'json_post_invalid_slug',
-				__( 'Invalid post slug.', 'b3-rest-api' ), 404 );
+		if (!$post) {
+			return B3_JSON_REST_API::error('json_post_invalid_slug',
+				__('Invalid post slug.', 'b3-rest-api'), 404);
 		}
 
-		return $wp_json_posts->get_post( $post->ID, $context );
+		return $wp_json_posts->get_post($post->ID, $context);
 	}
 
 }
diff --git a/resources/B3_Settings.php b/resources/B3_Settings.php
index 95dbbf6..26f0965 100644
--- a/resources/B3_Settings.php
+++ b/resources/B3_Settings.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -45,8 +45,8 @@ class B3_Settings extends B3_API {
 	 *
 	 * @param WP_JSON_ResponseHandler $server The REST API response handler.
 	 */
-	public function __construct( WP_JSON_ResponseHandler $server ) {
-		parent::__construct( $server );
+	public function __construct(WP_JSON_ResponseHandler $server) {
+		parent::__construct($server);
 
 		$this->settings = new B3_SettingsHelper();
 	}
@@ -57,19 +57,19 @@ public function __construct( WP_JSON_ResponseHandler $server ) {
 	 * @param  array $routes API routes.
 	 * @return array         Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$sidebar_routes = array(
-			'/b3:settings' => array(
-				array( array( $this, 'get_options' ), WP_JSON_Server::READABLE ),
+			'/b3_settings' => array(
+				array(array($this, 'get_options'), WP_JSON_Server::READABLE),
 			),
 
-			'/b3:settings/(?P<option>\w+)' => array(
-				array( array( $this, 'get_option' ), WP_JSON_Server::READABLE ),
+			'/b3_settings/(?P<option>\w+)' => array(
+				array(array($this, 'get_option'), WP_JSON_Server::READABLE),
 			),
 		);
 
-		return array_merge( $routes, $sidebar_routes );
+		return array_merge($routes, $sidebar_routes);
 	}
 
 	/**
@@ -79,11 +79,11 @@ public function register_routes( $routes ) {
 	public function get_options() {
 		$settings = array();
 
-		foreach ( $this->options as $option ) {
-			$settings[ $option ] = $this->settings->$option;
+		foreach ($this->options as $option) {
+			$settings[$option] = $this->settings->$option;
 		}
 
-		return $this->prepare_settings( $settings );
+		return $this->prepare_settings($settings);
 	}
 
 	/**
@@ -92,13 +92,13 @@ public function get_options() {
 	 * @param  mixed $option Name of the opttion to retrieve.
 	 * @return array         Settings entity.
 	 */
-	public function get_option( $option ) {
+	public function get_option($option) {
 
 		$settings = array(
 			$option => $this->settings->$option,
 		);
 
-		return $this->prepare_settings( $settings, $option );
+		return $this->prepare_settings($settings, $option);
 	}
 
 	/**
@@ -109,33 +109,33 @@ public function get_option( $option ) {
 	 *
 	 * @return array            Changed settings entity data.
 	 */
-	protected function prepare_settings( $_settings, $context = null ) {
+	protected function prepare_settings($_settings, $context = null) {
 		$settings = array();
 
-		foreach ( $_settings as $option => $value ) {
-			if ( ! in_array( $option, $this->options ) ) {
+		foreach ($_settings as $option => $value) {
+			if (!in_array($option, $this->options)) {
 				continue;
 			}
 
-			$settings[ $option ] = array(
-				'value' => apply_filters( 'b3_settings_option', $value, $option, $context ),
+			$settings[$option] = array(
+				'value' => apply_filters('b3_settings_option', $value, $option, $context),
 				'meta' => array(
 					'links' => array(
-						'self' => json_url( sprintf( '/b3:settings/%s', $option ) ),
+						'self' => json_url(sprintf('/b3_settings/%s', $option)),
 					),
 				),
 			);
 
-			if ( 'page_on_front' === $option && ! empty( $value ) ) {
-				$settings[ $option ]['meta']['links']['page'] = json_url( '/pages/' . $value );
+			if ('page_on_front' === $option && !empty($value)) {
+				$settings[$option]['meta']['links']['page'] = json_url('/pages/' . $value);
 			}
 
-			if ( $context !== null ) {
-				$settings[ $option ]['meta']['links']['collection'] = json_url( '/b3:settings' );
+			if ($context !== null) {
+				$settings[$option]['meta']['links']['collection'] = json_url('/b3_settings');
 			}
 		}
 
-		return apply_filters( 'b3_settings', $settings, $_settings, $context );
+		return apply_filters('b3_settings', $settings, $_settings, $context);
 	}
 
 }
diff --git a/resources/B3_Sidebar.php b/resources/B3_Sidebar.php
index f04dcf1..8f3642e 100644
--- a/resources/B3_Sidebar.php
+++ b/resources/B3_Sidebar.php
@@ -4,7 +4,7 @@
  * @subpackage B3/API
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -19,19 +19,19 @@ class B3_Sidebar extends B3_API {
 	 * @param  array $routes API routes.
 	 * @return array         Changed API routes.
 	 */
-	public function register_routes( $routes ) {
+	public function register_routes($routes) {
 
 		$sidebar_routes = array(
-			'/b3:sidebars' => array(
-				array( array( $this, 'get_sidebars' ), WP_JSON_Server::READABLE ),
+			'/b3_sidebars' => array(
+				array(array($this, 'get_sidebars'), WP_JSON_Server::READABLE),
 			),
 
-			'/b3:sidebars/(?P<index>\w+)' => array(
-				array( array( $this, 'get_sidebar' ), WP_JSON_Server::READABLE ),
+			'/b3_sidebars/(?P<index>\w+)' => array(
+				array(array($this, 'get_sidebar'), WP_JSON_Server::READABLE),
 			),
 		);
 
-		return array_merge( $routes, $sidebar_routes );
+		return array_merge($routes, $sidebar_routes);
 	}
 
 	/**
@@ -42,7 +42,7 @@ public function register_routes( $routes ) {
 	public function get_sidebars() {
 		global $wp_registered_sidebars;
 
-		return $this->prepare_sidebar( $wp_registered_sidebars, 'collection' );
+		return $this->prepare_sidebar($wp_registered_sidebars, 'collection');
 	}
 
 	/**
@@ -52,70 +52,70 @@ public function get_sidebars() {
 	 * @param  string $context Context in which the sidebar appears.
 	 * @return array           Sidebar entity.
 	 */
-	public function get_sidebar( $index, $context = 'single' ) {
+	public function get_sidebar($index, $context = 'single') {
 		global $wp_registered_sidebars, $wp_registered_widgets;
 
-		if ( ! is_active_sidebar( $index ) ) {
-			return B3_JSON_REST_API::error( 'json_sidebar_invalid_id',
-				__( 'Sidebar is not active.', 'b3-rest-api' ), 404 );
+		if (!is_active_sidebar($index)) {
+			return B3_JSON_REST_API::error('json_sidebar_invalid_id',
+				__('Sidebar is not active.', 'b3-rest-api'), 404);
 		}
 
-		if ( ! is_dynamic_sidebar( $index ) ) {
-			return B3_JSON_REST_API::error( 'json_sidebar_invalid_id',
-				__( 'Sidebar has no active widgets.', 'b3-rest-api' ), 404 );
+		if (!is_dynamic_sidebar($index)) {
+			return B3_JSON_REST_API::error('json_sidebar_invalid_id',
+				__('Sidebar has no active widgets.', 'b3-rest-api'), 404);
 		}
 
-		$sidebar = $wp_registered_sidebars[ $index ];
+		$sidebar = $wp_registered_sidebars[$index];
 
 		$sidebars_widgets = wp_get_sidebars_widgets();
 
 		$widgets = array();
 
-		foreach ( (array) $sidebars_widgets[ $index ] as $id ) {
-			if ( ! isset( $wp_registered_widgets[ $id ] ) ) {
+		foreach ((array) $sidebars_widgets[$index] as $id) {
+			if (!isset($wp_registered_widgets[$id])) {
 				continue;
 			}
 
-			$callback    = $wp_registered_widgets[ $id ]['callback'];
+			$callback = $wp_registered_widgets[$id]['callback'];
 			$option_name = $callback[0]->option_name;
-			$number      = $callback[0]->number;
-			$options     = get_option( $option_name );
+			$number = $callback[0]->number;
+			$options = get_option($option_name);
 
 			$widget = array(
-				'widget_id'    => $id,
-				'widget_name'  => $wp_registered_widgets[ $id ]['name'],
-				'widget_title' => $options[ $number ]['title'],
+				'widget_id' => $id,
+				'widget_name' => $wp_registered_widgets[$id]['name'],
+				'widget_title' => $options[$number]['title'],
 			);
 
 			$params = array_merge(
-				array( array_merge( $sidebar, $widget ) ),
-				(array) $wp_registered_widgets[ $id ]['params']
+				array(array_merge($sidebar, $widget)),
+				(array) $wp_registered_widgets[$id]['params']
 			);
 
 			$classes = array();
-			foreach ( (array) $wp_registered_widgets[ $id ]['classname'] as $cn ) {
-				if ( is_string( $cn ) ) {
+			foreach ((array) $wp_registered_widgets[$id]['classname'] as $cn) {
+				if (is_string($cn)) {
 					$cn = '_' . $cn;
 
-				} elseif ( is_object( $cn ) ) {
-					$cn = '_' . get_class( $cn );
+				} elseif (is_object($cn)) {
+					$cn = '_' . get_class($cn);
 				}
 
-				$classes[] = ltrim( $cn, '_' );
+				$classes[] = ltrim($cn, '_');
 			}
 
 			$widget['class'] = $classes;
 
 			$params[0]['before_widget'] = '';
-			$params[0]['after_widget']  = '';
-			$params[0]['before_title']  = '<!-- ';
-			$params[0]['after_title']   = ' -->';
+			$params[0]['after_widget'] = '';
+			$params[0]['before_title'] = '<!-- ';
+			$params[0]['after_title'] = ' -->';
 
-			$params = apply_filters( 'dynamic_sidebar_params', $params );
+			$params = apply_filters('dynamic_sidebar_params', $params);
 
-			if ( is_callable( $callback ) ) {
+			if (is_callable($callback)) {
 				ob_start();
-				call_user_func_array( $callback, $params );
+				call_user_func_array($callback, $params);
 				$widget['widget_content'] = ob_get_clean();
 			}
 
@@ -124,7 +124,7 @@ public function get_sidebar( $index, $context = 'single' ) {
 
 		$sidebar['widgets'] = $widgets;
 
-		return $this->prepare_sidebar( $sidebar, 'single' );
+		return $this->prepare_sidebar($sidebar, 'single');
 	}
 
 	/**
@@ -134,38 +134,38 @@ public function get_sidebar( $index, $context = 'single' ) {
 	 * @param  string $context   The context for the prepared sidebar. (single|collection)
 	 * @return array             Sidebar entity data.
 	 */
-	protected function prepare_sidebar( $_sidebars, $context = 'single' ) {
+	protected function prepare_sidebar($_sidebars, $context = 'single') {
 
 		$single_id = 0;
-		$keys      = array( 'name', 'id', 'description', 'class', 'meta' );
+		$keys = array('name', 'id', 'description', 'class', 'meta');
 
-		if ( 'single' === $context ) {
+		if ('single' === $context) {
 			$single_id = $_sidebars['id'];
-			$_sidebars = array( $single_id => $_sidebars );
-			$keys[]    = 'widgets';
+			$_sidebars = array($single_id => $_sidebars);
+			$keys[] = 'widgets';
 		}
 
 		$sidebars = array();
 
-		foreach ( $_sidebars as $index => $sidebar ) {
-			foreach ( $keys as $key ) {
-				if ( isset( $sidebar[ $key ] ) ) {
-					$sidebars[ $index ][ $key ] = $sidebar[ $key ];
+		foreach ($_sidebars as $index => $sidebar) {
+			foreach ($keys as $key) {
+				if (isset($sidebar[$key])) {
+					$sidebars[$index][$key] = $sidebar[$key];
 				}
 			}
 
-			$sidebars[ $index ]['meta'] = array(
+			$sidebars[$index]['meta'] = array(
 				'links' => array(
-					'self' => json_url( sprintf( '/b3:sidebars/%s', $index ) ),
+					'self' => json_url(sprintf('/b3_sidebars/%s', $index)),
 				),
 			);
 		}
 
-		if ( 'single' === $context ) {
-			$sidebars = $sidebars[ $single_id ];
+		if ('single' === $context) {
+			$sidebars = $sidebars[$single_id];
 		}
 
-		return apply_filters( 'b3_sidebars', $sidebars, $_sidebars, $context );
+		return apply_filters('b3_sidebars', $sidebars, $_sidebars, $context);
 	}
 
 }