diff --git a/wp-content/themes/moonshine/functions.php b/wp-content/themes/moonshine/functions.php
index d5e23dd..173c936 100644
--- a/wp-content/themes/moonshine/functions.php
+++ b/wp-content/themes/moonshine/functions.php
@@ -6,3 +6,7 @@ require_once __DIR__ . '/includes/core/theme-setup.php';
 // Vendors
 require_once __DIR__ . '/includes/vendors/acf.php';
 require_once __DIR__ . '/includes/vendors/tinymce.php';
+require_once __DIR__ . '/includes/vendors/wpgraphql.php';
+
+// WPGraphQL
+require_once __DIR__ . '/includes/wpgraphql/term-connection.php';
diff --git a/wp-content/themes/moonshine/includes/vendors/wpgraphql.php b/wp-content/themes/moonshine/includes/vendors/wpgraphql.php
new file mode 100644
index 0000000..6bbab97
--- /dev/null
+++ b/wp-content/themes/moonshine/includes/vendors/wpgraphql.php
@@ -0,0 +1,17 @@
+<?php
+
+// Default WPGraphQL settings
+add_filter( 'graphql_get_setting_section_field_value', 'moonshine_wpgraphql_settings', 10, 5 );
+function moonshine_wpgraphql_settings( $value, $default_value, $option_name, $section_fields, $section_name ) {
+	if ( $section_name === 'graphql_general_settings' ) {
+		switch ( $option_name ) {
+			case 'graphql_endpoint':
+				$value = 'graphql';
+				break;
+			case "public_introspection_enabled":
+					$value = "on";
+				break;
+		}
+	}
+	return $value;
+}
diff --git a/wp-content/themes/moonshine/includes/wpgraphql/term-connection.php b/wp-content/themes/moonshine/includes/wpgraphql/term-connection.php
new file mode 100644
index 0000000..c67a1c2
--- /dev/null
+++ b/wp-content/themes/moonshine/includes/wpgraphql/term-connection.php
@@ -0,0 +1,13 @@
+<?php
+
+// Override TermConnection query args
+add_filter( 'graphql_term_object_connection_query_args', 'moonshine_graphql_term_object_connection_query_args', 10, 3 );
+function moonshine_graphql_term_object_connection_query_args( $query_args, $source, $args ) {
+	// Sort by 'order' meta value instead of legacy 'term_order' field
+	if ( 'term_order' === $args['where']['orderby'] ?? false ) {
+		$query_args['meta_key'] = 'order';
+		$query_args['orderby']  = 'meta_value_num';
+	}
+
+	return $query_args;
+}