diff --git a/.dev-lib b/.dev-lib
new file mode 100644
index 00000000000..cb76151efe1
--- /dev/null
+++ b/.dev-lib
@@ -0,0 +1 @@
+SYNC_README_MD=0
\ No newline at end of file
diff --git a/amp.php b/amp.php
index 1cbd389113c..7b080e33d08 100644
--- a/amp.php
+++ b/amp.php
@@ -5,25 +5,27 @@
  * Plugin URI: https://github.com/automattic/amp-wp
  * Author: Automattic
  * Author URI: https://automattic.com
- * Version: 0.5.1
+ * Version: 0.6.0-alpha
  * Text Domain: amp
  * Domain Path: /languages/
  * License: GPLv2 or later
+ *
+ * @package AMP
  */
 
 define( 'AMP__FILE__', __FILE__ );
 define( 'AMP__DIR__', dirname( __FILE__ ) );
-define( 'AMP__VERSION', '0.5.1' );
-
-require_once( AMP__DIR__ . '/back-compat/back-compat.php' );
-require_once( AMP__DIR__ . '/includes/amp-helper-functions.php' );
-require_once( AMP__DIR__ . '/includes/admin/functions.php' );
-require_once( AMP__DIR__ . '/includes/admin/class-amp-customizer.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php' );
-require_once( AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php' );
-
-require_once( AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php' );
-require_once( AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php' );
+define( 'AMP__VERSION', '0.6.0-alpha' );
+
+require_once AMP__DIR__ . '/back-compat/back-compat.php';
+require_once AMP__DIR__ . '/includes/amp-helper-functions.php';
+require_once AMP__DIR__ . '/includes/class-amp-post-type-support.php';
+require_once AMP__DIR__ . '/includes/admin/functions.php';
+require_once AMP__DIR__ . '/includes/admin/class-amp-customizer.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-settings.php';
+require_once AMP__DIR__ . '/includes/settings/class-amp-customizer-design-settings.php';
+require_once AMP__DIR__ . '/includes/actions/class-amp-frontend-actions.php';
+require_once AMP__DIR__ . '/includes/actions/class-amp-paired-post-actions.php';
 
 register_activation_hook( __FILE__, 'amp_activate' );
 function amp_activate() {
@@ -47,20 +49,19 @@ function amp_deactivate() {
 	flush_rewrite_rules();
 }
 
+AMP_Post_Type_Support::init();
+
 add_action( 'init', 'amp_init' );
 function amp_init() {
 	if ( false === apply_filters( 'amp_is_enabled', true ) ) {
 		return;
 	}
 
-	define( 'AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
-
 	do_action( 'amp_init' );
 
 	load_plugin_textdomain( 'amp', false, plugin_basename( AMP__DIR__ ) . '/languages' );
 
 	add_rewrite_endpoint( AMP_QUERY_VAR, EP_PERMALINK );
-	add_post_type_support( 'post', AMP_QUERY_VAR );
 
 	add_filter( 'request', 'amp_force_query_var_value' );
 	add_action( 'wp', 'amp_maybe_add_actions' );
@@ -73,6 +74,25 @@ function amp_init() {
 	}
 }
 
+/**
+ * Define AMP query var.
+ *
+ * This function must be invoked through the 'after_setup_theme' action to allow
+ * the AMP setting to declare the post types support earlier than plugins/theme.
+ *
+ * @since 0.6
+ */
+function define_query_var() {
+	/**
+	 * Filter the AMP query variable.
+	 *
+	 * @since 0.3.2
+	 * @param string $query_var The AMP query variable.
+	 */
+	define( 'AMP_QUERY_VAR', apply_filters( 'amp_query_var', 'amp' ) );
+}
+add_action( 'after_setup_theme', 'define_query_var', 3 );
+
 // Make sure the `amp` query var has an explicit value.
 // Avoids issues when filtering the deprecated `query_string` hook.
 function amp_force_query_var_value( $query_vars ) {
diff --git a/includes/admin/functions.php b/includes/admin/functions.php
index fd21e348385..a6a8e82e8fd 100644
--- a/includes/admin/functions.php
+++ b/includes/admin/functions.php
@@ -1,11 +1,13 @@
 <?php
 // Callbacks for adding AMP-related things to the admin.
 
-require_once( AMP__DIR__ . '/includes/options/class-amp-options-menu.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php' );
+require_once AMP__DIR__ . '/includes/options/class-amp-options-menu.php';
+require_once AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php';
 
 define( 'AMP_CUSTOMIZER_QUERY_VAR', 'customize_amp' );
 
+add_action( 'admin_init', 'AMP_Options_Manager::register_settings' );
+
 /**
  * Sets up the AMP template editor for the Customizer.
  */
@@ -80,15 +82,22 @@ function amp_add_customizer_link() {
 }
 
 /**
- * Registers a top-level menu for AMP configuration options
+ * Registers AMP settings.
  */
 function amp_add_options_menu() {
 	if ( ! is_admin() ) {
 		return;
 	}
 
-	$show_options_menu = apply_filters( 'amp_options_menu_is_enabled', true );
-	if ( true !== $show_options_menu ) {
+	/**
+	 * Filter whether to enable the AMP settings.
+	 *
+	 * @since 0.5
+	 * @param bool $enable Whether to enable the AMP settings. Default true.
+	 */
+	$short_circuit = apply_filters( 'amp_options_menu_is_enabled', true );
+
+	if ( true !== $short_circuit ) {
 		return;
 	}
 
diff --git a/includes/class-amp-content.php b/includes/class-amp-content.php
index beb3ea1029a..37ff1db939c 100644
--- a/includes/class-amp-content.php
+++ b/includes/class-amp-content.php
@@ -91,6 +91,7 @@ private function sanitize( $content ) {
 	}
 }
 
+// @todo Split this class out into a separate file.
 class AMP_Content_Sanitizer {
 	public static function sanitize( $content, array $sanitizer_classes, $global_args = array() ) {
 		$scripts = array();
diff --git a/includes/class-amp-post-type-support.php b/includes/class-amp-post-type-support.php
new file mode 100644
index 00000000000..df0be538543
--- /dev/null
+++ b/includes/class-amp-post-type-support.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * AMP Post type support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Class AMP_Post_Type_Support.
+ */
+class AMP_Post_Type_Support {
+
+	/**
+	 * Add hooks.
+	 */
+	public static function init() {
+		add_action( 'after_setup_theme', array( __CLASS__, 'add_post_type_support' ), 5 );
+	}
+
+	/**
+	 * Get post types that plugin supports out of the box (which cannot be disabled).
+	 *
+	 * @return string[] Post types.
+	 */
+	public static function get_builtin_supported_post_types() {
+		return array_filter( array( 'post' ), 'post_type_exists' );
+	}
+
+	/**
+	 * Get post types that are eligible for AMP support.
+	 *
+	 * @since 0.6
+	 * @return string[] Post types eligible for AMP.
+	 */
+	public static function get_eligible_post_types() {
+		return array_merge(
+			self::get_builtin_supported_post_types(),
+			array_values( get_post_types(
+				array(
+					'public'   => true,
+					'_builtin' => false,
+				),
+				'names'
+			) )
+		);
+	}
+
+	/**
+	 * Declare support for post types.
+	 *
+	 * This function should only be invoked through the 'after_setup_theme' action to
+	 * allow plugins/theme to overwrite the post types support.
+	 *
+	 * @since 0.6
+	 */
+	public static function add_post_type_support() {
+		$post_types = array_merge(
+			self::get_builtin_supported_post_types(),
+			AMP_Options_Manager::get_option( 'supported_post_types', array() )
+		);
+		foreach ( $post_types as $post_type ) {
+			add_post_type_support( $post_type, AMP_QUERY_VAR );
+		}
+	}
+}
diff --git a/includes/options/class-amp-analytics-options-submenu.php b/includes/options/class-amp-analytics-options-submenu.php
index 1e250ffac15..862c173f72a 100644
--- a/includes/options/class-amp-analytics-options-submenu.php
+++ b/includes/options/class-amp-analytics-options-submenu.php
@@ -37,7 +37,10 @@ private function add_submenu() {
 	public function amp_options_styles() {
 		?>
 		<style>
-			.analytics-data-container #delete {
+			.analytics-data-container .button.delete,
+			.analytics-data-container .button.delete:hover,
+			.analytics-data-container .button.delete:active,
+			.analytics-data-container .button.delete:focus {
 				background: red;
 				border-color: red;
 				text-shadow: 0 0 0;
diff --git a/includes/options/class-amp-options-menu.php b/includes/options/class-amp-options-menu.php
index 15494fd209c..88d299f3947 100644
--- a/includes/options/class-amp-options-menu.php
+++ b/includes/options/class-amp-options-menu.php
@@ -1,54 +1,137 @@
 <?php
+/**
+ * AMP Options.
+ *
+ * @package AMP
+ */
 
-require_once( AMP__DIR__ . '/includes/options/class-amp-analytics-options-submenu.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-menu-page.php' );
-require_once( AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php' );
+// Includes.
+require_once AMP__DIR__ . '/includes/options/class-amp-analytics-options-submenu.php';
+require_once AMP__DIR__ . '/includes/options/views/class-amp-options-manager.php';
 
+/**
+ * AMP_Options_Menu class.
+ */
 class AMP_Options_Menu {
-	const ICON_BASE64_SVG = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
-
-	private $menu_page;
-	private $menu_slug;
 
-	public function __construct() {
-		$this->menu_page = new AMP_Options_Menu_Page();
-		$this->menu_slug = 'amp-plugin-options';
-	}
+	/**
+	 * The AMP svg menu icon.
+	 *
+	 * @var string
+	 */
+	const ICON_BASE64_SVG = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB3aWR0aD0iNjJweCIgaGVpZ2h0PSI2MnB4IiB2aWV3Qm94PSIwIDAgNjIgNjIiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+QU1QLUJyYW5kLUJsYWNrLUljb248L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iYW1wLWxvZ28taW50ZXJuYWwtc2l0ZSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgICAgICA8ZyBpZD0iQU1QLUJyYW5kLUJsYWNrLUljb24iIGZpbGw9IiMwMDAwMDAiPiAgICAgICAgICAgIDxwYXRoIGQ9Ik00MS42Mjg4NjY3LDI4LjE2MTQzMzMgTDI4LjYyNDM2NjcsNDkuODAzNTY2NyBMMjYuMjY4MzY2Nyw0OS44MDM1NjY3IEwyOC41OTc1LDM1LjcwMTY2NjcgTDIxLjM4MzgsMzUuNzEwOTY2NyBDMjEuMzgzOCwzNS43MTA5NjY3IDIxLjMxNTYsMzUuNzEzMDMzMyAyMS4yODM1NjY3LDM1LjcxMzAzMzMgQzIwLjYzMzYsMzUuNzEzMDMzMyAyMC4xMDc2MzMzLDM1LjE4NzA2NjcgMjAuMTA3NjMzMywzNC41MzcxIEMyMC4xMDc2MzMzLDM0LjI1ODEgMjAuMzY3LDMzLjc4NTg2NjcgMjAuMzY3LDMzLjc4NTg2NjcgTDMzLjMyOTEzMzMsMTIuMTY5NTY2NyBMMzUuNzI0NCwxMi4xNzk5IEwzMy4zMzYzNjY3LDI2LjMwMzUgTDQwLjU4NzI2NjcsMjYuMjk0MiBDNDAuNTg3MjY2NywyNi4yOTQyIDQwLjY2NDc2NjcsMjYuMjkzMTY2NyA0MC43MDE5NjY3LDI2LjI5MzE2NjcgQzQxLjM1MTkzMzMsMjYuMjkzMTY2NyA0MS44Nzc5LDI2LjgxOTEzMzMgNDEuODc3OSwyNy40NjkxIEM0MS44Nzc5LDI3LjczMjYgNDEuNzc0NTY2NywyNy45NjQwNjY3IDQxLjYyNzgzMzMsMjguMTYwNCBMNDEuNjI4ODY2NywyOC4xNjE0MzMzIFogTTMxLDAgQzEzLjg3ODcsMCAwLDEzLjg3OTczMzMgMCwzMSBDMCw0OC4xMjEzIDEzLjg3ODcsNjIgMzEsNjIgQzQ4LjEyMDI2NjcsNjIgNjIsNDguMTIxMyA2MiwzMSBDNjIsMTMuODc5NzMzMyA0OC4xMjAyNjY3LDAgMzEsMCBMMzEsMCBaIiBpZD0iRmlsbC0xIj48L3BhdGg+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=';
 
+	/**
+	 * Initialize.
+	 */
 	public function init() {
 		add_action( 'admin_post_amp_analytics_options', 'AMP_Options_Manager::handle_analytics_submit' );
-
 		add_action( 'admin_menu', array( $this, 'add_menu_items' ) );
 	}
 
+	/**
+	 * Add menu.
+	 */
 	public function add_menu_items() {
+
 		add_menu_page(
 			__( 'AMP Options', 'amp' ),
 			__( 'AMP', 'amp' ),
 			'manage_options',
-			$this->menu_slug,
-			array( $this->menu_page, 'render' ),
+			AMP_Options_Manager::OPTION_NAME,
+			array( $this, 'render_screen' ),
 			self::ICON_BASE64_SVG
 		);
 
+		add_submenu_page(
+			AMP_Options_Manager::OPTION_NAME,
+			__( 'AMP Settings', 'amp' ),
+			__( 'General', 'amp' ),
+			'manage_options',
+			AMP_Options_Manager::OPTION_NAME
+		);
+
+		add_settings_section(
+			'post_types',
+			false,
+			'__return_false',
+			AMP_Options_Manager::OPTION_NAME
+		);
+		add_settings_field(
+			'supported_post_types',
+			__( 'Post Type Support', 'amp' ),
+			array( $this, 'render_post_types_support' ),
+			AMP_Options_Manager::OPTION_NAME,
+			'post_types'
+		);
+
 		$submenus = array(
-			new AMP_Analytics_Options_Submenu( $this->menu_slug ),
+			new AMP_Analytics_Options_Submenu( AMP_Options_Manager::OPTION_NAME ),
 		);
 
 		// Create submenu items and calls on the Submenu Page object to render the actual contents of the page.
 		foreach ( $submenus as $submenu ) {
-			$submenu->init( $this->menu_slug );
+			$submenu->init();
 		}
+	}
 
-		$this->remove_toplevel_menu_item();
+	/**
+	 * Post types support section renderer.
+	 *
+	 * @since 0.6
+	 */
+	public function render_post_types_support() {
+		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		$element_name    = AMP_Options_Manager::OPTION_NAME . '[supported_post_types][]';
+		?>
+		<fieldset>
+			<?php foreach ( array_map( 'get_post_type_object', AMP_Post_Type_Support::get_eligible_post_types() ) as $post_type ) : ?>
+				<?php
+				$element_id = AMP_Options_Manager::OPTION_NAME . "-supported_post_types-{$post_type->name}";
+				$is_builtin = in_array( $post_type->name, $builtin_support, true );
+				?>
+				<?php if ( $is_builtin ) : ?>
+					<input type="hidden" name="<?php echo esc_attr( $element_name ); ?>" value="<?php echo esc_attr( $post_type->name ); ?>">
+				<?php endif; ?>
+				<input
+					type="checkbox"
+					id="<?php echo esc_attr( $element_id ); ?>"
+					name="<?php echo esc_attr( $element_name ); ?>"
+					value="<?php echo esc_attr( $post_type->name ); ?>"
+					<?php checked( true, post_type_supports( $post_type->name, AMP_QUERY_VAR ) ); ?>
+					<?php disabled( $is_builtin ); ?>
+					>
+				<label for="<?php echo esc_attr( $element_id ); ?>">
+					<?php echo esc_html( $post_type->label ); ?>
+				</label>
+				<br>
+			<?php endforeach; ?>
+			<p class="description"><?php esc_html_e( 'Enable/disable AMP post type(s) support', 'amp' ); ?></p>
+		</fieldset>
+		<?php
 	}
 
-	// Helper function to avoid having the top-level menu as
-	// the first menu item
-	function remove_toplevel_menu_item() {
-		global $submenu;
-		if ( isset( $submenu['amp-plugin-options'][0] ) ) {
-			unset( $submenu['amp-plugin-options'][0] );
+	/**
+	 * Display Settings.
+	 *
+	 * @since 0.6
+	 */
+	public function render_screen() {
+		if ( ! empty( $_GET['settings-updated'] ) ) { // WPCS: CSRF ok.
+			AMP_Options_Manager::check_supported_post_type_update_errors();
 		}
+		?>
+		<div class="wrap">
+			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+			<?php settings_errors(); ?>
+			<form action="options.php" method="post">
+				<?php
+				settings_fields( AMP_Options_Manager::OPTION_NAME );
+				do_settings_sections( AMP_Options_Manager::OPTION_NAME );
+				submit_button();
+				?>
+			</form>
+		</div>
+		<?php
 	}
 }
diff --git a/includes/options/views/class-amp-analytics-options-submenu-page.php b/includes/options/views/class-amp-analytics-options-submenu-page.php
index 7068cd2c4e9..06787f86ac6 100644
--- a/includes/options/views/class-amp-analytics-options-submenu-page.php
+++ b/includes/options/views/class-amp-analytics-options-submenu-page.php
@@ -14,6 +14,12 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 		} else {
 			$analytics_title = __( 'Add new entry:', 'amp' );
 		}
+
+		if ( ! $is_existing_entry ) {
+			$id = '__new__';
+		}
+
+		$id_base = sprintf( '%s[analytics][%s]', AMP_Options_Manager::OPTION_NAME, $id );
 		?>
 		<div class="analytics-data-container">
 			<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
@@ -23,20 +29,20 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 				<div class="options">
 					<p>
 						<label>
-							<?php echo __( 'Type:', 'amp' ) ?>
-							<input class="option-input" type="text" name=vendor-type value="<?php echo esc_attr( $type ); ?>" />
+							<?php esc_html_e( 'Type:', 'amp' ); ?>
+							<input class="option-input" type="text" name="<?php echo esc_attr( $id_base . '[type]' ); ?>" value="<?php echo esc_attr( $type ); ?>" />
 						</label>
 						<label>
-							<?php echo __( 'ID:', 'amp' ) ?>
-							<input type="text" name=id value="<?php echo esc_attr( $id ); ?>" readonly />
+							<?php esc_html_e( 'ID:', 'amp' ); ?>
+							<input type="text" value="<?php echo esc_attr( $is_existing_entry ? $id : '' ); ?>" readonly />
 						</label>
-						<input type="hidden" name=id-value value="<?php echo esc_attr( $id ); ?>" />
+							<input type="hidden" name="<?php echo esc_attr( $id_base . '[id]' ); ?>" value="<?php echo esc_attr( $id ); ?>" />
 					</p>
 					<p>
 						<label>
-							<?php echo __( 'JSON Configuration:', 'amp' ) ?>
+							<?php esc_html_e( 'JSON Configuration:', 'amp' ); ?>
 							<br />
-							<textarea rows="10" cols="100" name="config"><?php echo esc_textarea( $config ); ?></textarea>
+							<textarea rows="10" cols="100" name="<?php echo esc_attr( $id_base . '[config]' ); ?>"><?php echo esc_textarea( $config ); ?></textarea>
 						</label>
 					</p>
 					<input type="hidden" name="action" value="amp_analytics_options">
@@ -46,7 +52,7 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 					wp_nonce_field( 'analytics-options', 'analytics-options' );
 					submit_button( __( 'Save', 'amp' ), 'primary', 'save', false );
 					if ( $is_existing_entry ) {
-						submit_button( __( 'Delete', 'amp' ), 'delete button-primary', 'delete', false );
+						submit_button( __( 'Delete', 'amp' ), 'delete button-primary', $id_base . '[delete]', false );
 					}
 					?>
 				</p>
@@ -55,33 +61,14 @@ private function render_entry( $id = '', $type = '', $config = '' ) {
 		<?php
 	}
 
+	/**
+	 * Render title.
+	 */
 	public function render_title() {
-		$admin_notice_text = false;
-		$admin_notice_type = false;
-		if ( isset( $_GET['valid'] ) ) {
-			$is_valid = (bool) $_GET['valid'];
-
-			if ( $is_valid ) {
-				$admin_notice_text = __( 'The analytics entry was successfully saved!', 'amp' );
-				$admin_notice_type = 'success';
-			} else {
-				$admin_notice_text = __( 'Failed to save the analytics entry. Please make sure that the JSON configuration is valid and unique.', 'amp' );
-				$admin_notice_type = 'error';
-			}
-		}
 		?>
 		<div class="wrap">
 			<h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
-			<?php
-			// If redirected from serializer, check if action succeeded
-			if ( $admin_notice_text ) : ?>
-				<div class="amp-analytics-options notice <?php echo esc_attr( 'notice-' . $admin_notice_type ); ?> is-dismissible">
-					<p><?php echo esc_html( $admin_notice_text ); ?></p>
-					<button type="button" class="notice-dismiss">
-						<span class="screen-reader-text"><?php __( 'Dismiss this notice.', 'amp' ) ?></span>
-					</button>
-				</div>
-			<?php endif; ?>
+			<?php settings_errors(); ?>
 		</div><!-- .wrap -->
 		<?php
 	}
@@ -91,11 +78,12 @@ public function render() {
 
 		$this->render_title();
 
-		// Render entries stored in the DB
+		// Render entries stored in the DB.
 		foreach ( $analytics_entries as $entry_id => $entry ) {
 			$this->render_entry( $entry_id, $entry['type'], $entry['config'] );
 		}
-		// Empty form for adding more entries
+
+		// Empty form for adding more entries.
 		$this->render_entry();
 	}
 }
diff --git a/includes/options/views/class-amp-options-manager.php b/includes/options/views/class-amp-options-manager.php
index 4c312471c9c..0a2c8594844 100644
--- a/includes/options/views/class-amp-options-manager.php
+++ b/includes/options/views/class-amp-options-manager.php
@@ -1,14 +1,58 @@
 <?php
-
-require_once( AMP__DIR__ . '/includes/utils/class-amp-html-utils.php' );
-
+/**
+ * AMP_Options_Manager class.
+ *
+ * @todo This file is located in the wrong directory.
+ * @package AMP
+ */
+
+require_once AMP__DIR__ . '/includes/utils/class-amp-html-utils.php';
+
+/**
+ * Class AMP_Options_Manager
+ */
 class AMP_Options_Manager {
+
+	/**
+	 * Option name.
+	 *
+	 * @var string
+	 */
 	const OPTION_NAME = 'amp-options';
 
+	/**
+	 * Register settings.
+	 */
+	public static function register_settings() {
+		register_setting(
+			self::OPTION_NAME,
+			self::OPTION_NAME,
+			array(
+				'type'              => 'array',
+				'sanitize_callback' => array( __CLASS__, 'validate_options' ),
+			)
+		);
+
+		add_action( 'update_option_' . self::OPTION_NAME, 'flush_rewrite_rules' );
+	}
+
+	/**
+	 * Get plugin options.
+	 *
+	 * @return array Options.
+	 */
 	public static function get_options() {
 		return get_option( self::OPTION_NAME, array() );
 	}
 
+	/**
+	 * Get plugin option.
+	 *
+	 * @param string $option  Plugin option name.
+	 * @param bool   $default Default value.
+	 *
+	 * @return mixed Option value.
+	 */
 	public static function get_option( $option, $default = false ) {
 		$amp_options = self::get_options();
 
@@ -19,6 +63,135 @@ public static function get_option( $option, $default = false ) {
 		return $amp_options[ $option ];
 	}
 
+	/**
+	 * Validate options.
+	 *
+	 * @param array $new_options Plugin options.
+	 * @return array Options.
+	 */
+	public static function validate_options( $new_options ) {
+		$defaults = array(
+			'supported_post_types' => array(),
+			'analytics'            => array(),
+		);
+
+		$options = array_merge(
+			$defaults,
+			self::get_options()
+		);
+
+		// Validate post type support.
+		if ( isset( $new_options['supported_post_types'] ) ) {
+			$options['supported_post_types'] = array();
+			foreach ( $new_options['supported_post_types'] as $post_type ) {
+				if ( ! post_type_exists( $post_type ) ) {
+					add_settings_error( self::OPTION_NAME, 'unknown_post_type', __( 'Unrecognized post type.', 'amp' ) );
+				} else {
+					$options['supported_post_types'][] = $post_type;
+				}
+			}
+		}
+
+		// Validate analytics.
+		if ( isset( $new_options['analytics'] ) ) {
+			foreach ( $new_options['analytics'] as $id => $data ) {
+
+				// Check save/delete pre-conditions and proceed if correct.
+				if ( empty( $data['type'] ) || empty( $data['config'] ) ) {
+					add_settings_error( self::OPTION_NAME, 'missing_analytics_vendor_or_config', __( 'Missing vendor type or config.', 'amp' ) );
+					continue;
+				}
+
+				// Validate JSON configuration.
+				$is_valid_json = AMP_HTML_Utils::is_valid_json( $data['config'] );
+				if ( ! $is_valid_json ) {
+					add_settings_error( self::OPTION_NAME, 'invalid_analytics_config_json', __( 'Invalid analytics config JSON.', 'amp' ) );
+					continue;
+				}
+
+				$entry_vendor_type = sanitize_key( $data['type'] );
+				$entry_config      = trim( $data['config'] );
+
+				if ( ! empty( $data['id'] ) && '__new__' !== $data['id'] ) {
+					$entry_id = sanitize_key( $data['id'] );
+				} else {
+
+					// Generate a hash string to uniquely identify this entry.
+					$entry_id = substr( md5( $entry_vendor_type . $entry_config ), 0, 12 );
+
+					// Avoid duplicates.
+					if ( isset( $options['analytics'][ $entry_id ] ) ) {
+						add_settings_error( self::OPTION_NAME, 'duplicate_analytics_entry', __( 'Duplicate analytics entry found.', 'amp' ) );
+						continue;
+					}
+				}
+
+				if ( isset( $data['delete'] ) ) {
+					unset( $options['analytics'][ $entry_id ] );
+				} else {
+					$options['analytics'][ $entry_id ] = array(
+						'type'   => $entry_vendor_type,
+						'config' => $entry_config,
+					);
+				}
+			}
+		}
+
+		return $options;
+	}
+
+
+	/**
+	 * Check for errors with updating the supported post types.
+	 *
+	 * @since 0.6
+	 * @see add_settings_error()
+	 */
+	public static function check_supported_post_type_update_errors() {
+		$builtin_support = AMP_Post_Type_Support::get_builtin_supported_post_types();
+		$supported_types = self::get_option( 'supported_post_types', array() );
+		foreach ( AMP_Post_Type_Support::get_eligible_post_types() as $name ) {
+			$post_type = get_post_type_object( $name );
+			if ( empty( $post_type ) || in_array( $post_type->name, $builtin_support, true ) ) {
+				continue;
+			}
+
+			$post_type_supported = post_type_supports( $post_type->name, AMP_QUERY_VAR );
+			$is_support_elected  = in_array( $post_type->name, $supported_types, true );
+
+			$error = null;
+			$code  = null;
+			if ( $is_support_elected && ! $post_type_supported ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be activated because support is removed by a plugin or theme', 'amp' );
+				$code  = sprintf( '%s_activation_error', $post_type->name );
+			} elseif ( ! $is_support_elected && $post_type_supported ) {
+				/* translators: %s: Post type name. */
+				$error = __( '"%s" could not be deactivated because support is added by a plugin or theme', 'amp' );
+				$code  = sprintf( '%s_deactivation_error', $post_type->name );
+			}
+
+			if ( isset( $error, $code ) ) {
+				add_settings_error(
+					self::OPTION_NAME,
+					$code,
+					sprintf(
+						$error,
+						isset( $post_type->label ) ? $post_type->label : $post_type->name
+					)
+				);
+			}
+		}
+	}
+
+	/**
+	 * Update plugin option.
+	 *
+	 * @param string $option Plugin option name.
+	 * @param mixed  $value  Plugin option value.
+	 *
+	 * @return bool Whether update succeeded.
+	 */
 	public static function update_option( $option, $value ) {
 		$amp_options = self::get_options();
 
@@ -27,58 +200,48 @@ public static function update_option( $option, $value ) {
 		return update_option( self::OPTION_NAME, $amp_options, false );
 	}
 
+	/**
+	 * Handle analytics submission.
+	 */
 	public static function handle_analytics_submit() {
-		// Request must come from user with right capabilities
+
+		// Request must come from user with right capabilities.
 		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Sorry, you do not have the necessary permissions to perform this action', 'amp' ) );
+			wp_die( esc_html__( 'Sorry, you do not have the necessary permissions to perform this action', 'amp' ) );
 		}
-		// Ensure request is coming from analytics option form
-		check_admin_referer( 'analytics-options', 'analytics-options' );
-
-		$status = AMP_Options_Manager::update_analytics_options( $_POST );
 
-		// Redirect to keep the user in the analytics options page
-		// Wrap in is_admin() to enable phpunit tests to exercise this code
-		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&valid=' . $status ) );
-		exit;
-	}
+		// Ensure request is coming from analytics option form.
+		check_admin_referer( 'analytics-options', 'analytics-options' );
 
-	public static function update_analytics_options( $data ) {
-		// Check save/delete pre-conditions and proceed if correct
-		if ( empty( $data['vendor-type'] ) || empty( $data['config'] ) ) {
-			return false;
-		}
+		if ( isset( $_POST['amp-options']['analytics'] ) ) {
+			self::update_option( 'analytics', wp_unslash( $_POST['amp-options']['analytics'] ) );
 
-		// Validate JSON configuration
-		$is_valid_json = AMP_HTML_Utils::is_valid_json( stripslashes( $data['config'] ) );
-		if ( ! $is_valid_json ) {
-			return false;
-		}
-		$amp_analytics = self::get_option( 'analytics', array() );
-
-		$entry_vendor_type = sanitize_key( $data['vendor-type'] );
-		$entry_config = stripslashes( trim( $data['config'] ) );
-
-		if ( ! empty( $data['id-value'] ) ) {
-			$entry_id = sanitize_key( $data['id-value'] );
-		} else {
-			// Generate a hash string to uniquely identify this entry
-			$entry_id = substr( md5( $entry_vendor_type . $entry_config ), 0, 12 );
-			// Avoid duplicates
-			if ( isset( $amp_analytics[ $entry_id ] ) ) {
-				return false;
+			$errors = get_settings_errors( self::OPTION_NAME );
+			if ( empty( $errors ) ) {
+				add_settings_error( self::OPTION_NAME, 'settings_updated', __( 'The analytics entry was successfully saved!', 'amp' ), 'updated' );
+				$errors = get_settings_errors( self::OPTION_NAME );
 			}
+			set_transient( 'settings_errors', $errors );
 		}
 
-		if ( isset( $data['delete'] ) ) {
-			unset( $amp_analytics[ $entry_id ] );
-		} else {
-			$amp_analytics[ $entry_id ] = array(
-				'type' => $entry_vendor_type,
-				'config' => $entry_config,
-			);
-		}
+		/*
+		 * Redirect to keep the user in the analytics options page.
+		 * Wrap in is_admin() to enable phpunit tests to exercise this code.
+		 */
+		wp_safe_redirect( admin_url( 'admin.php?page=amp-analytics-options&settings-updated=1' ) );
+		exit;
+	}
 
-		return self::update_option( 'analytics', $amp_analytics );
+	/**
+	 * Update analytics options.
+	 *
+	 * @codeCoverageIgnore
+	 * @deprecated
+	 * @param array $data Unsanitized unslashed data.
+	 * @return bool Whether options were updated.
+	 */
+	public static function update_analytics_options( $data ) {
+		_deprecated_function( __METHOD__, '0.6.0', __CLASS__ . '::update_option' );
+		return self::update_option( 'analytics', wp_unslash( $data ) );
 	}
 }
diff --git a/includes/options/views/class-amp-options-menu-page.php b/includes/options/views/class-amp-options-menu-page.php
deleted file mode 100644
index 1a729a3f65f..00000000000
--- a/includes/options/views/class-amp-options-menu-page.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-class AMP_Options_Menu_Page {
-	public function render() {
-		?>
-		<div class="ampoptions-admin-page">
-			<h1><?php echo __( 'AMP Plugin Options', 'amp' ) ?></h1>
-				<p>
-					<?php
-						__( 'This admin panel menu contains configuration options for the AMP Plugin.',
-							'amp' );
-					?>
-				</p>
-		</div>
-		<?php
-	}
-}
diff --git a/readme.md b/readme.md
index 92608c02aea..f9cbe3df5a2 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@ The plugin ships with its own Customizer that you can use to tweak various parts
 
 If you're using a completely custom template, you may want to disable the AMP Customizer:
 
-```
+```php
 add_filter( 'amp_customizer_is_enabled', '__return_false' );
 ``` 
 
@@ -650,7 +650,11 @@ Each analytics entry must include a unique array key and the following attribute
 
 ## Custom Post Type Support
 
-By default, the plugin only creates AMP content for posts. You can add support for other post_types using the post_type parameter used when registering the custom post type (assume our post_type is `xyz-review`):
+By default, the plugin only creates AMP content for posts.
+
+*NEW* You can enable AMP support for other post types via the AMP settings admin screen. Just enable the checkbox with each post type which is able to be served as AMP.
+
+You can also add support for other post types by adding `add_post_type_support()` calls in PHP for the desired post types. For example, assuming our post type is `xyz-review` you can add AMP support by adding the following to a theme or plugin:
 
 ```php
 add_action( 'amp_init', 'xyz_amp_add_review_cpt' );
@@ -659,7 +663,7 @@ function xyz_amp_add_review_cpt() {
 }
 ```
 
-You'll need to flush your rewrite rules after this.
+You'll need to flush your rewrite rules after this. You can do this by accessing the Permalinks admin screen or via running `wp rewrite flush` in WP-CLI.
 
 If you want a custom template for your post type:
 
diff --git a/readme.txt b/readme.txt
index 76db1d2c543..d17a10b24ce 100644
--- a/readme.txt
+++ b/readme.txt
@@ -53,6 +53,12 @@ A wise green Yoda once said, "Patience you must have, my young padawan." We're w
 
 == Changelog ==
 
+= 0.6.0 (unreleased) =
+
+- Add AMP settings admin screen for managing which post types have AMP support, eliminating the requirement to add `add_post_type_support()` calls in theme or plugin. See [#811](https://github.com/Automattic/amp-wp/pull/811). Props ThierryA, westonruter.
+- Add generator meta tag for AMP. See [#810](https://github.com/Automattic/amp-wp/pull/810). Props vaporwavre.
+- Add code quality checking via phpcs, eslint, jscs, and jshint. See [#795](https://github.com/Automattic/amp-wp/pull/795). Props westonruter.
+
 = 0.5.1 (2017-08-17) =
 
 - Fix: issues with invalid tags not being stripped out (e.g. script tags) (h/t tmmbecker, fahmi182, pppdog, seejacobscott, RavanH, jenniejj, lkraav, simonrperry for the reports).
diff --git a/tests/test-amp-analytics-options.php b/tests/test-amp-analytics-options.php
index 5c0d173c5d7..38493086b3b 100644
--- a/tests/test-amp-analytics-options.php
+++ b/tests/test-amp-analytics-options.php
@@ -2,6 +2,14 @@
 
 class AMP_Analytics_Options_Test extends WP_UnitTestCase {
 
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		parent::setUp();
+		AMP_Options_Manager::register_settings();
+	}
+
 	private $vendor = 'googleanalytics';
 
 	private $config_one = '{
@@ -59,12 +67,16 @@ private function render_post() {
 		return $amp_rendered;
 	}
 
-	private function insert_one_option( $vendor, $config ) {
-		$data = array();
-		$data['id-value'] = '';
-		$data['vendor-type'] = $vendor;
-		$data['config'] = $config;
-		AMP_Options_Manager::update_analytics_options( $data );
+	/**
+	 * Insert one analytics entry.
+	 *
+	 * @param string $type   Entry type (vendor).
+	 * @param string $config Entry config (JSON).
+	 */
+	private function insert_one_option( $type, $config ) {
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => compact( 'type', 'config' ),
+		) );
 	}
 
 	/**
diff --git a/tests/test-class-amp-options-manager.php b/tests/test-class-amp-options-manager.php
new file mode 100644
index 00000000000..afe0ffc0863
--- /dev/null
+++ b/tests/test-class-amp-options-manager.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Tests for AMP_Options_Manager.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Options_Manager.
+ *
+ * @covers AMP_Options_Manager
+ */
+class Test_AMP_Options_Manager extends WP_UnitTestCase {
+
+	/**
+	 * After a test method runs, reset any state in WordPress the test method might have changed.
+	 */
+	public function tearDown() {
+		parent::tearDown();
+		unregister_post_type( 'foo' );
+	}
+
+	/**
+	 * Test constants.
+	 */
+	public function test_constants() {
+		$this->assertEquals( 'amp-options', AMP_Options_Manager::OPTION_NAME );
+	}
+
+	/**
+	 * Test register_settings.
+	 *
+	 * @covers AMP_Options_Manager::register_settings()
+	 */
+	public function test_register_settings() {
+		AMP_Options_Manager::register_settings();
+		$registered_settings = get_registered_settings();
+		$this->assertArrayHasKey( AMP_Options_Manager::OPTION_NAME, $registered_settings );
+		$this->assertEquals( 'array', $registered_settings[ AMP_Options_Manager::OPTION_NAME ]['type'] );
+
+		$this->assertEquals( 10, has_action( 'update_option_' . AMP_Options_Manager::OPTION_NAME, 'flush_rewrite_rules' ) );
+	}
+
+	/**
+	 * Test get_options.
+	 *
+	 * @covers AMP_Options_Manager::get_options()
+	 * @covers AMP_Options_Manager::get_option()
+	 * @covers AMP_Options_Manager::update_option()
+	 * @covers AMP_Options_Manager::validate_options()
+	 */
+	public function test_get_and_set_options() {
+		global $wp_settings_errors;
+
+		AMP_Options_Manager::register_settings(); // Adds validate_options as filter.
+		delete_option( AMP_Options_Manager::OPTION_NAME );
+		$this->assertSame( array(), AMP_Options_Manager::get_options() );
+		$this->assertSame( false, AMP_Options_Manager::get_option( 'foo' ) );
+		$this->assertSame( 'default', AMP_Options_Manager::get_option( 'foo', 'default' ) );
+
+		// Test supported_post_types validation.
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'post', 'page', 'attachment' ) );
+		$this->assertSame(
+			array(
+				'post',
+				'page',
+				'attachment',
+			),
+			AMP_Options_Manager::get_option( 'supported_post_types' )
+		);
+
+		// Test analytics validation with missing fields.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'bad' => array(),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'missing_analytics_vendor_or_config', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Test analytics validation with bad JSON.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => 'BAD',
+			),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'invalid_analytics_config_json', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Test analytics validation with good fields.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => '{"good":true}',
+			),
+		) );
+		$this->assertEmpty( get_settings_errors( AMP_Options_Manager::OPTION_NAME ) );
+
+		// Test analytics validation with duplicate check.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'foo',
+				'config' => '{"good":true}',
+			),
+		) );
+		$errors = get_settings_errors( AMP_Options_Manager::OPTION_NAME );
+		$this->assertEquals( 'duplicate_analytics_entry', $errors[0]['code'] );
+		$wp_settings_errors = array();
+
+		// Confirm format of entry ID.
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$entry   = current( $entries );
+		$id      = substr( md5( $entry['type'] . $entry['config'] ), 0, 12 );
+		$this->assertArrayHasKey( $id, $entries );
+		$this->assertEquals( 'foo', $entries[ $id ]['type'] );
+		$this->assertEquals( '{"good":true}', $entries[ $id ]['config'] );
+
+		// Confirm adding another entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			'__new__' => array(
+				'type'   => 'bar',
+				'config' => '{"good":true}',
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertCount( 2, AMP_Options_Manager::get_option( 'analytics' ) );
+		$this->assertArrayHasKey( $id, $entries );
+
+		// Confirm updating an entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			$id => array(
+				'id'     => $id,
+				'type'   => 'foo',
+				'config' => '{"very_good":true}',
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertEquals( 'foo', $entries[ $id ]['type'] );
+		$this->assertEquals( '{"very_good":true}', $entries[ $id ]['config'] );
+
+		// Confirm deleting an entry works.
+		AMP_Options_Manager::update_option( 'analytics', array(
+			$id => array(
+				'id'     => $id,
+				'type'   => 'foo',
+				'config' => '{"very_good":true}',
+				'delete' => true,
+			),
+		) );
+		$entries = AMP_Options_Manager::get_option( 'analytics' );
+		$this->assertCount( 1, $entries );
+		$this->assertArrayNotHasKey( $id, $entries );
+	}
+
+	/**
+	 * Test check_supported_post_type_update_errors.
+	 *
+	 * @covers AMP_Options_Manager::check_supported_post_type_update_errors()
+	 */
+	public function test_check_supported_post_type_update_errors() {
+		global $wp_settings_errors;
+
+		register_post_type( 'foo', array(
+			'public' => true,
+			'label'  => 'Foo',
+		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'foo' ) );
+		AMP_Post_Type_Support::add_post_type_support();
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$this->assertEmpty( get_settings_errors() );
+
+		// Activation error.
+		remove_post_type_support( 'foo', AMP_QUERY_VAR );
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$errors = get_settings_errors();
+		$this->assertCount( 1, $errors );
+		$error = current( $errors );
+		$this->assertEquals( 'foo_activation_error', $error['code'] );
+		$wp_settings_errors = array();
+
+		// Deactivation error.
+		AMP_Options_Manager::update_option( 'supported_post_types', array() );
+		add_post_type_support( 'foo', AMP_QUERY_VAR );
+		AMP_Options_Manager::check_supported_post_type_update_errors();
+		$errors = get_settings_errors();
+		$this->assertCount( 1, $errors );
+		$error = current( $errors );
+		$this->assertEquals( 'foo_deactivation_error', $error['code'] );
+		$wp_settings_errors = array();
+	}
+}
diff --git a/tests/test-class-amp-options-menu.php b/tests/test-class-amp-options-menu.php
new file mode 100644
index 00000000000..ec5109d2612
--- /dev/null
+++ b/tests/test-class-amp-options-menu.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Tests for AMP_Options_Menu.
+ *
+ * @package AMP
+ */
+
+/**
+ * Tests for AMP_Options_Menu.
+ */
+class Test_AMP_Options_Menu extends WP_UnitTestCase {
+
+	/**
+	 * Instance of AMP_Options_Menu
+	 *
+	 * @var AMP_Options_Menu
+	 */
+	public $instance;
+
+	/**
+	 * Setup.
+	 *
+	 * @inheritdoc
+	 */
+	public function setUp() {
+		parent::setUp();
+		$this->instance = new AMP_Options_Menu();
+	}
+
+	/**
+	 * Test constants.
+	 *
+	 * @see AMP_Options_Menu::ICON_BASE64_SVG
+	 */
+	public function test_constants() {
+		$this->assertStringStartsWith( 'data:image/svg+xml;base64,', AMP_Options_Menu::ICON_BASE64_SVG );
+	}
+
+	/**
+	 * Test init.
+	 *
+	 * @see AMP_Options_Menu::init()
+	 */
+	public function test_init() {
+		$this->instance->init();
+		$this->assertEquals( 10, has_action( 'admin_menu', array( $this->instance, 'add_menu_items' ) ) );
+		$this->assertEquals( 10, has_action( 'admin_post_amp_analytics_options', 'AMP_Options_Manager::handle_analytics_submit' ) );
+	}
+
+	/**
+	 * Test admin_menu.
+	 *
+	 * @covers AMP_Options_Menu::add_menu_items()
+	 */
+	public function test_add_menu_items() {
+		global $_parent_pages, $submenu, $wp_settings_sections, $wp_settings_fields;
+
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		$this->instance->add_menu_items();
+		$this->assertArrayHasKey( 'amp-options', $_parent_pages );
+		$this->assertEquals( 'amp-options', $_parent_pages['amp-options'] );
+		$this->assertArrayHasKey( 'amp-analytics-options', $_parent_pages );
+		$this->assertEquals( 'amp-options', $_parent_pages['amp-analytics-options'] );
+
+		$this->assertArrayHasKey( 'amp-options', $submenu );
+		$this->assertCount( 2, $submenu['amp-options'] );
+		$this->assertEquals( 'amp-options', $submenu['amp-options'][0][2] );
+		$this->assertEquals( 'amp-analytics-options', $submenu['amp-options'][1][2] );
+
+		// Test add_setting_section().
+		$this->assertArrayHasKey( 'amp-options', $wp_settings_sections );
+		$this->assertArrayHasKey( 'post_types', $wp_settings_sections['amp-options'] );
+
+		// Test add_setting_field().
+		$this->assertArrayHasKey( 'amp-options', $wp_settings_fields );
+		$this->assertArrayHasKey( 'post_types', $wp_settings_fields['amp-options'] );
+		$this->assertArrayHasKey( 'supported_post_types', $wp_settings_fields['amp-options']['post_types'] );
+	}
+
+	/**
+	 * Test render_screen for admin users.
+	 *
+	 * @covers AMP_Options_Menu::render_screen()
+	 */
+	public function test_render_screen_for_admin_user() {
+		wp_set_current_user( $this->factory->user->create( array(
+			'role' => 'administrator',
+		) ) );
+
+		ob_start();
+		$this->instance->render_screen();
+		$this->assertContains( '<div class="wrap">', ob_get_clean() );
+	}
+}
diff --git a/tests/test-class-amp-post-type-support.php b/tests/test-class-amp-post-type-support.php
new file mode 100644
index 00000000000..70295e71fb1
--- /dev/null
+++ b/tests/test-class-amp-post-type-support.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Tests for Post Types Support.
+ *
+ * @package AMP
+ * @since 0.6
+ */
+
+/**
+ * Tests for Post Type Support.
+ *
+ * @covers AMP_Post_Type_Support
+ */
+class Test_AMP_Post_Type_Support extends WP_UnitTestCase {
+
+	/**
+	 * After a test method runs, reset any state in WordPress the test method might have changed.
+	 */
+	public function tearDown() {
+		parent::tearDown();
+		unregister_post_type( 'book' );
+		unregister_post_type( 'secret' );
+	}
+
+	/**
+	 * Test add_hooks().
+	 *
+	 * @covers AMP_Post_Type_Support::init()
+	 */
+	public function test_init() {
+		AMP_Post_Type_Support::init();
+		$this->assertEquals( 5, has_action( 'after_setup_theme', array( 'AMP_Post_Type_Support', 'add_post_type_support' ) ) );
+	}
+
+	/**
+	 * Test get_builtin_supported_post_types.
+	 *
+	 * @covers AMP_Post_Type_Support::get_builtin_supported_post_types()
+	 */
+	public function test_get_builtin_supported_post_types() {
+		$this->assertEquals( array( 'post' ), AMP_Post_Type_Support::get_builtin_supported_post_types() );
+	}
+
+	/**
+	 * Test get_eligible_post_types.
+	 *
+	 * @covers AMP_Post_Type_Support::get_eligible_post_types()
+	 */
+	public function test_get_eligible_post_types() {
+		register_post_type( 'book', array(
+			'label'  => 'Book',
+			'public' => true,
+		) );
+		register_post_type( 'secret', array(
+			'label'  => 'Secret',
+			'public' => false,
+		) );
+
+		$this->assertEquals(
+			array(
+				'post',
+				'book',
+			),
+			AMP_Post_Type_Support::get_eligible_post_types()
+		);
+	}
+
+	/**
+	 * Test add_post_type_support.
+	 *
+	 * @covers AMP_Post_Type_Support::add_post_type_support()
+	 */
+	public function test_add_post_type_support() {
+		register_post_type( 'book', array(
+			'label'  => 'Book',
+			'public' => true,
+		) );
+		register_post_type( 'poem', array(
+			'label'  => 'Poem',
+			'public' => true,
+		) );
+		AMP_Options_Manager::update_option( 'supported_post_types', array( 'poem' ) );
+
+		AMP_Post_Type_Support::add_post_type_support();
+		$this->assertTrue( post_type_supports( 'post', AMP_QUERY_VAR ) );
+		$this->assertTrue( post_type_supports( 'poem', AMP_QUERY_VAR ) );
+		$this->assertFalse( post_type_supports( 'book', AMP_QUERY_VAR ) );
+	}
+}