diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index 91edacf76f..841f61c77f 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -365,6 +365,33 @@ function create_initial_post_types() {
 		)
 	);
 
+	register_post_type(
+		'wp_global_styles',
+		array(
+			'label'        => __( 'Global Styles', 'gutenberg' ),
+			'description'  => 'CPT to store user design tokens',
+			'public'       => false,
+			'show_ui'      => false,
+			'show_in_rest' => false,
+			'rewrite'      => false,
+			'capabilities' => array(
+				'read'                   => 'edit_theme_options',
+				'create_posts'           => 'edit_theme_options',
+				'edit_posts'             => 'edit_theme_options',
+				'edit_published_posts'   => 'edit_theme_options',
+				'delete_published_posts' => 'edit_theme_options',
+				'edit_others_posts'      => 'edit_theme_options',
+				'delete_others_posts'    => 'edit_theme_options',
+			),
+			'map_meta_cap' => true,
+			'supports'     => array(
+				'title',
+				'editor',
+				'revisions',
+			),
+		)
+	);
+
 	register_post_status(
 		'publish',
 		array(
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 5b1acb4fc6..79a5bdab52 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -175,7 +175,7 @@ function create_initial_taxonomies() {
 
 	register_taxonomy(
 		'wp_theme',
-		array( 'wp_template' ),
+		array( 'wp_template', 'wp_global_styles' ),
 		array(
 			'public'            => false,
 			'hierarchical'      => false,