diff --git a/includes/class-fields.php b/includes/class-fields.php
index 3648e52..adb54ff 100644
--- a/includes/class-fields.php
+++ b/includes/class-fields.php
@@ -75,13 +75,7 @@ private static function register_required_fields(): void {
 				array(
 					Field::make( 'select', 'odw_language', __( 'In welcher Sprache sind die Daten?', 'open-data-wizard' ) )
 						->set_default_value( class_exists( 'ODW_Settings' ) ? (string) ODW_Settings::get( 'default_language' ) : '' )
-						->add_options(
-							array(
-								''   => __( '— Bitte wählen —', 'open-data-wizard' ),
-								'de' => __( 'Deutsch (DE)', 'open-data-wizard' ),
-								'en' => __( 'Englisch (EN)', 'open-data-wizard' ),
-							)
-						)
+						->add_options( self::get_language_options() )
 						->set_help_text( __( 'SPRACHE (dct:language)', 'open-data-wizard' ) . "\n\n" . __( 'Beispiel: Deutsch, Englisch', 'open-data-wizard' ) ),
 
 					Field::make( 'textarea', 'odw_keywords', __( 'Mit welchen Stichworten finde ich diese Daten?', 'open-data-wizard' ) )
@@ -127,6 +121,10 @@ private static function register_required_fields(): void {
 									->set_attribute( 'type', 'number' )
 									->set_attribute( 'min', '0' )
 									->set_help_text( __( 'DATEIGRÖSSE IN BYTES (dcat:byteSize)', 'open-data-wizard' ) . "\n\n" . __( 'Beispiel: 204800 (ca. 200 KB). Optional.', 'open-data-wizard' ) ),
+
+								Field::make( 'text', 'attribution_text', __( 'Welcher Namensnennungstext soll bei Weiternutzung angegeben werden?', 'open-data-wizard' ) )
+									->set_attribute( 'placeholder', __( 'optional – nur bei CC BY oder CC BY-SA', 'open-data-wizard' ) )
+									->set_help_text( __( 'NAMENSNENNUNGSTEXT (dcatde:licenseAttributionByText)', 'open-data-wizard' ) . "\n\n" . __( 'Empfohlen bei CC BY und CC BY-SA Lizenzen. Beispiel: Datensatz von Musterorganisation e.V., bereitgestellt unter CC BY 4.0', 'open-data-wizard' ) ),
 							)
 						)
 						->set_help_text( __( 'DISTRIBUTIONEN (dcat:distribution)', 'open-data-wizard' ) . "\n\n" . __( 'Sie können mehrere Dateiformate (z.B. CSV und JSON) als separate Distributionen anbieten.', 'open-data-wizard' ) ),
@@ -153,6 +151,10 @@ private static function register_required_fields(): void {
 					Field::make( 'html', 'odw_ext_hint_coverage' )
 						->set_html( '<h4 style="margin:16px 0 4px">' . esc_html__( 'Abdeckung', 'open-data-wizard' ) . '</h4>' ),
 
+					Field::make( 'select', 'odw_political_geocoding_level', __( 'Auf welcher Verwaltungsebene wurden diese Daten erhoben?', 'open-data-wizard' ) )
+						->add_options( self::get_political_geocoding_level_options() )
+						->set_help_text( __( 'VERWALTUNGSEBENE (dcatde:politicalGeocodingLevelURI)', 'open-data-wizard' ) . "\n\n" . __( 'Beispiel: Gemeinde, Landkreis, Land, Bund', 'open-data-wizard' ) ),
+
 					Field::make( 'text', 'odw_spatial', __( 'Welche geografische Region betreffen diese Daten?', 'open-data-wizard' ) )
 						->set_attribute( 'placeholder', __( 'z.B. Deutschland, Berlin oder GeoNames-URI', 'open-data-wizard' ) )
 						->set_help_text( __( 'GEOGRAPHISCHE ABDECKUNG (dct:spatial)', 'open-data-wizard' ) . "\n\n" . __( 'Freitext oder URI. Beispiel: Deutschland, Berlin, https://sws.geonames.org/2950159/', 'open-data-wizard' ) ),
@@ -293,21 +295,28 @@ public static function get_license_label( string $uri ): string {
 	}
 
 	/**
-	 * Themen-Vokabular als Label → Label Map für das DCAT-AP `dcat:theme`-Feld.
+	 * Themen-Vokabular als EU-Vocabulary-URI → Label Map für das DCAT-AP `dcat:theme`-Feld.
+	 * URIs entstammen dem EU Publications Office Data Theme Vocabulary.
 	 *
 	 * @return array<string, string> Erweiterbar via `add_filter('odw_theme_options', ...)`.
 	 */
 	public static function get_theme_options(): array {
+		$base    = 'http://publications.europa.eu/resource/authority/data-theme/';
 		$options = array(
-			''           => __( '— Bitte wählen —', 'open-data-wizard' ),
-			'Bildung'    => __( 'Bildung', 'open-data-wizard' ),
-			'Gesundheit' => __( 'Gesundheit', 'open-data-wizard' ),
-			'Soziales'   => __( 'Soziales', 'open-data-wizard' ),
-			'Umwelt'     => __( 'Umwelt', 'open-data-wizard' ),
-			'Wirtschaft' => __( 'Wirtschaft', 'open-data-wizard' ),
-			'Kultur'     => __( 'Kultur', 'open-data-wizard' ),
-			'Sport'      => __( 'Sport', 'open-data-wizard' ),
-			'Sonstiges'  => __( 'Sonstiges', 'open-data-wizard' ),
+			''             => __( '— Bitte wählen —', 'open-data-wizard' ),
+			$base . 'EDUC' => __( 'Bildung, Kultur & Sport', 'open-data-wizard' ),
+			$base . 'HEAL' => __( 'Gesundheit', 'open-data-wizard' ),
+			$base . 'SOCI' => __( 'Bevölkerung & Gesellschaft', 'open-data-wizard' ),
+			$base . 'ENVI' => __( 'Umwelt', 'open-data-wizard' ),
+			$base . 'ECON' => __( 'Wirtschaft & Finanzen', 'open-data-wizard' ),
+			$base . 'GOVE' => __( 'Verwaltung & öffentlicher Sektor', 'open-data-wizard' ),
+			$base . 'TECH' => __( 'Wissenschaft & Technologie', 'open-data-wizard' ),
+			$base . 'TRAN' => __( 'Verkehr', 'open-data-wizard' ),
+			$base . 'AGRI' => __( 'Landwirtschaft & Ernährung', 'open-data-wizard' ),
+			$base . 'ENER' => __( 'Energie', 'open-data-wizard' ),
+			$base . 'JUST' => __( 'Justiz & Sicherheit', 'open-data-wizard' ),
+			$base . 'REGI' => __( 'Regionen & Städte', 'open-data-wizard' ),
+			$base . 'INTR' => __( 'Internationale Themen', 'open-data-wizard' ),
 		);
 
 		return (array) apply_filters( 'odw_theme_options', $options );
@@ -374,6 +383,59 @@ public static function get_format_mime( string $format ): string {
 		return $map[ $format ] ?? $format;
 	}
 
+	/**
+	 * Maps a short format label to its EU Publications Office file-type URI.
+	 * Used in dct:format for DCAT-AP.de / Civora compliance.
+	 *
+	 * @param string $format Short format label (e.g. "CSV").
+	 * @return string EU file-type URI, or the original string if unknown.
+	 */
+	public static function get_format_eu_uri( string $format ): string {
+		$base = 'http://publications.europa.eu/resource/authority/file-type/';
+		$map  = array(
+			'CSV'     => $base . 'CSV',
+			'JSON'    => $base . 'JSON',
+			'XLSX'    => $base . 'XLSX',
+			'PDF'     => $base . 'PDF',
+			'GeoJSON' => $base . 'GEOJSON',
+			'XML'     => $base . 'XML',
+		);
+
+		return $map[ $format ] ?? $format;
+	}
+
+	/**
+	 * Language options as EU Publications Office language URI → label map.
+	 * Used in dct:language for DCAT-AP.de / Civora compliance.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function get_language_options(): array {
+		$base = 'http://publications.europa.eu/resource/authority/language/';
+		return array(
+			''            => __( '— Bitte wählen —', 'open-data-wizard' ),
+			$base . 'DEU' => __( 'Deutsch (DE)', 'open-data-wizard' ),
+			$base . 'ENG' => __( 'Englisch (EN)', 'open-data-wizard' ),
+		);
+	}
+
+	/**
+	 * Administrative geocoding level options from the DCAT-AP.de political geocoding vocabulary.
+	 * Used in dcatde:politicalGeocodingLevelURI for Civora compliance.
+	 *
+	 * @return array<string, string>
+	 */
+	public static function get_political_geocoding_level_options(): array {
+		$base = 'http://dcat-ap.de/def/politicalGeocoding/Level/';
+		return array(
+			''                               => __( '— Bitte wählen —', 'open-data-wizard' ),
+			$base . 'federal'                => __( 'Bund (Federal)', 'open-data-wizard' ),
+			$base . 'state'                  => __( 'Land (Bundesland)', 'open-data-wizard' ),
+			$base . 'administrativeDistrict' => __( 'Landkreis', 'open-data-wizard' ),
+			$base . 'municipality'           => __( 'Gemeinde', 'open-data-wizard' ),
+		);
+	}
+
 	/**
 	 * Generates the HTML for the JSON-LD preview tab.
 	 *
@@ -442,14 +504,15 @@ function odw_build_dataset_jsonld( int $post_id ): ?array {
 	$distributions = carbon_get_post_meta( $post_id, 'odw_distributions' );
 
 	// Extended DCAT-AP fields (Tab 4).
-	$landing_page        = (string) carbon_get_post_meta( $post_id, 'odw_landing_page' );
-	$accrual_periodicity = (string) carbon_get_post_meta( $post_id, 'odw_accrual_periodicity' );
-	$spatial             = (string) carbon_get_post_meta( $post_id, 'odw_spatial' );
-	$temporal_start      = (string) carbon_get_post_meta( $post_id, 'odw_temporal_start' );
-	$temporal_end        = (string) carbon_get_post_meta( $post_id, 'odw_temporal_end' );
-	$contact_name        = (string) carbon_get_post_meta( $post_id, 'odw_contact_name' );
-	$contact_email       = (string) carbon_get_post_meta( $post_id, 'odw_contact_email' );
-	$contact_url         = (string) carbon_get_post_meta( $post_id, 'odw_contact_url' );
+	$landing_page              = (string) carbon_get_post_meta( $post_id, 'odw_landing_page' );
+	$accrual_periodicity       = (string) carbon_get_post_meta( $post_id, 'odw_accrual_periodicity' );
+	$political_geocoding_level = (string) carbon_get_post_meta( $post_id, 'odw_political_geocoding_level' );
+	$spatial                   = (string) carbon_get_post_meta( $post_id, 'odw_spatial' );
+	$temporal_start            = (string) carbon_get_post_meta( $post_id, 'odw_temporal_start' );
+	$temporal_end              = (string) carbon_get_post_meta( $post_id, 'odw_temporal_end' );
+	$contact_name              = (string) carbon_get_post_meta( $post_id, 'odw_contact_name' );
+	$contact_email             = (string) carbon_get_post_meta( $post_id, 'odw_contact_email' );
+	$contact_url               = (string) carbon_get_post_meta( $post_id, 'odw_contact_url' );
 
 	$dataset = array(
 		'@type'           => 'dcat:Dataset',
@@ -460,11 +523,21 @@ function odw_build_dataset_jsonld( int $post_id ): ?array {
 			'@type'     => 'foaf:Organization',
 			'foaf:name' => $publisher,
 		),
-		'dct:license'     => $license,
 	);
 
+	if ( ! empty( $license ) ) {
+		$dataset['dct:license'] = array( '@id' => (string) $license );
+	}
+
 	if ( ! empty( $language ) ) {
-		$dataset['dct:language'] = $language;
+		// Normalize legacy ISO codes ('de', 'en') to EU language URIs.
+		$lang_base               = 'http://publications.europa.eu/resource/authority/language/';
+		$lang_legacy             = array(
+			'de' => $lang_base . 'DEU',
+			'en' => $lang_base . 'ENG',
+		);
+		$lang_uri                = $lang_legacy[ (string) $language ] ?? (string) $language;
+		$dataset['dct:language'] = array( '@id' => $lang_uri );
 	}
 
 	if ( ! empty( $keywords ) && is_string( $keywords ) ) {
@@ -475,7 +548,19 @@ function odw_build_dataset_jsonld( int $post_id ): ?array {
 	}
 
 	if ( ! empty( $theme ) ) {
-		$dataset['dcat:theme'] = $theme;
+		// Normalize legacy text labels to EU data-theme URIs.
+		$theme_base            = 'http://publications.europa.eu/resource/authority/data-theme/';
+		$theme_legacy          = array(
+			'Bildung'    => $theme_base . 'EDUC',
+			'Gesundheit' => $theme_base . 'HEAL',
+			'Soziales'   => $theme_base . 'SOCI',
+			'Umwelt'     => $theme_base . 'ENVI',
+			'Wirtschaft' => $theme_base . 'ECON',
+			'Kultur'     => $theme_base . 'EDUC',
+			'Sport'      => $theme_base . 'EDUC',
+			'Sonstiges'  => $theme_base . 'GOVE',
+		);
+		$dataset['dcat:theme'] = array( '@id' => $theme_legacy[ (string) $theme ] ?? (string) $theme );
 	}
 
 	if ( ! empty( $issued ) ) {
@@ -507,13 +592,21 @@ function odw_build_dataset_jsonld( int $post_id ): ?array {
 			);
 
 			if ( ! empty( $dist['format'] ) ) {
-				$dist_item['dct:format'] = ODW_Fields::get_format_mime( $dist['format'] );
+				$dist_item['dct:format'] = array( '@id' => ODW_Fields::get_format_eu_uri( $dist['format'] ) );
 			}
 
 			if ( isset( $dist['byte_size'] ) && '' !== $dist['byte_size'] && is_numeric( $dist['byte_size'] ) && (int) $dist['byte_size'] >= 0 ) {
 				$dist_item['dcat:byteSize'] = (int) $dist['byte_size'];
 			}
 
+			if ( ! empty( $license ) ) {
+				$dist_item['dct:license'] = array( '@id' => (string) $license );
+			}
+
+			if ( ! empty( $dist['attribution_text'] ) ) {
+				$dist_item['dcatde:licenseAttributionByText'] = (string) $dist['attribution_text'];
+			}
+
 			$dist_list[] = $dist_item;
 		}
 
@@ -532,6 +625,10 @@ function odw_build_dataset_jsonld( int $post_id ): ?array {
 		$dataset['dct:accrualPeriodicity'] = array( '@id' => $accrual_periodicity );
 	}
 
+	if ( ! empty( $political_geocoding_level ) ) {
+		$dataset['dcatde:politicalGeocodingLevelURI'] = array( '@id' => $political_geocoding_level );
+	}
+
 	if ( ! empty( $spatial ) ) {
 		$dataset['dct:spatial'] = array(
 			'@type'          => 'dct:Location',
diff --git a/includes/class-rest-api.php b/includes/class-rest-api.php
index a36f17d..878979c 100644
--- a/includes/class-rest-api.php
+++ b/includes/class-rest-api.php
@@ -27,16 +27,17 @@ class ODW_Rest_API {
 	private const CACHE_TTL = 300;
 
 	/**
-	 * DCAT-AP 3.0 JSON-LD @context inkl. Plugin-eigenem odw:-Namespace für Qualitätsdaten.
+	 * DCAT-AP 3.0 / DCAT-AP.de JSON-LD @context inkl. Plugin-eigenem odw:-Namespace.
 	 */
 	private const JSONLD_CONTEXT = array(
-		'dcat'  => 'https://www.w3.org/ns/dcat#',
-		'dct'   => 'http://purl.org/dc/terms/',
-		'foaf'  => 'http://xmlns.com/foaf/0.1/',
-		'xsd'   => 'http://www.w3.org/2001/XMLSchema#',
-		'vcard' => 'http://www.w3.org/2006/vcard/ns#',
-		'skos'  => 'http://www.w3.org/2004/02/skos/core#',
-		'odw'   => 'https://github.com/daimpad/OpenDataWizard/ns#',
+		'dcat'   => 'https://www.w3.org/ns/dcat#',
+		'dct'    => 'http://purl.org/dc/terms/',
+		'foaf'   => 'http://xmlns.com/foaf/0.1/',
+		'xsd'    => 'http://www.w3.org/2001/XMLSchema#',
+		'vcard'  => 'http://www.w3.org/2006/vcard/ns#',
+		'skos'   => 'http://www.w3.org/2004/02/skos/core#',
+		'dcatde' => 'http://dcat-ap.de/def/dcatde/',
+		'odw'    => 'https://github.com/daimpad/OpenDataWizard/ns#',
 	);
 
 	/**
@@ -219,6 +220,13 @@ public static function get_catalog( WP_REST_Request $request ): WP_REST_Response
 			get_bloginfo( 'name' ) . ' — Datenkatalog'
 		);
 
+		/**
+		 * Filters the catalog description in the JSON-LD output.
+		 *
+		 * @param string $description The catalog description (empty by default).
+		 */
+		$catalog_description = (string) apply_filters( 'odw_catalog_description', '' );
+
 		$catalog = array(
 			'@context'      => self::JSONLD_CONTEXT,
 			'@type'         => 'dcat:Catalog',
@@ -230,6 +238,10 @@ public static function get_catalog( WP_REST_Request $request ): WP_REST_Response
 			'dcat:dataset'  => $datasets,
 		);
 
+		if ( '' !== $catalog_description ) {
+			$catalog['dct:description'] = $catalog_description;
+		}
+
 		set_transient(
 			$cache_key,
 			array(
diff --git a/includes/class-settings.php b/includes/class-settings.php
index eefd439..abee54f 100644
--- a/includes/class-settings.php
+++ b/includes/class-settings.php
@@ -7,6 +7,7 @@
  *
  * Verfügbare Einstellungen:
  *   catalog_title       — Titel des Datenkatalogs (REST API dct:title)
+ *   catalog_description — Beschreibung des Datenkatalogs (REST API dct:description)
  *   default_publisher   — Vorausgefüllter Herausgeber für neue Datensätze
  *   default_license     — Vorausgewählte Lizenz für neue Datensätze
  *   default_language    — Vorausgewählte Sprache für neue Datensätze
@@ -39,6 +40,7 @@ public static function init(): void {
 		add_action( 'admin_init', array( self::class, 'register_settings' ) );
 		add_action( 'admin_post_odw_recalculate_quality', array( self::class, 'handle_recalculate_quality' ) );
 		add_filter( 'odw_catalog_title', array( self::class, 'filter_catalog_title' ) );
+		add_filter( 'odw_catalog_description', array( self::class, 'filter_catalog_description' ) );
 	}
 
 	// -------------------------------------------------------------------------
@@ -138,6 +140,7 @@ static function (): void {
 		);
 
 		add_settings_field( 'catalog_title', __( 'Katalog-Titel', 'open-data-wizard' ), array( self::class, 'field_catalog_title' ), 'odw-settings', 'odw_section_catalog' );
+		add_settings_field( 'catalog_description', __( 'Katalog-Beschreibung', 'open-data-wizard' ), array( self::class, 'field_catalog_description' ), 'odw-settings', 'odw_section_catalog' );
 		add_settings_field( 'default_publisher', __( 'Herausgebende Organisation', 'open-data-wizard' ), array( self::class, 'field_default_publisher' ), 'odw-settings', 'odw_section_catalog' );
 
 		// --- Standardwerte ---
@@ -196,6 +199,21 @@ class="regular-text"
 		<?php
 	}
 
+	/**
+	 * Renders the catalog description settings field.
+	 */
+	public static function field_catalog_description(): void {
+		$value = self::get( 'catalog_description' );
+		?>
+		<textarea
+			name="<?php echo esc_attr( self::OPTION_KEY . '[catalog_description]' ); ?>"
+			rows="3"
+			class="large-text"
+		><?php echo esc_textarea( $value ); ?></textarea>
+		<p class="description"><?php esc_html_e( 'Kurze Beschreibung des Katalogs — erscheint als dct:description in der REST-API-Antwort (Pflichtfeld gemäß DCAT-AP.de).', 'open-data-wizard' ); ?></p>
+		<?php
+	}
+
 	/**
 	 * Renders the default publisher settings field.
 	 */
@@ -236,10 +254,9 @@ public static function field_default_license(): void {
 	 */
 	public static function field_default_language(): void {
 		$current = self::get( 'default_language' );
-		$options = array(
-			''   => __( '— Kein Standard —', 'open-data-wizard' ),
-			'de' => __( 'Deutsch (DE)', 'open-data-wizard' ),
-			'en' => __( 'Englisch (EN)', 'open-data-wizard' ),
+		$options = array_merge(
+			array( '' => __( '— Kein Standard —', 'open-data-wizard' ) ),
+			array_slice( ODW_Fields::get_language_options(), 1 )
 		);
 		?>
 		<select name="<?php echo esc_attr( self::OPTION_KEY . '[default_language]' ); ?>">
@@ -306,11 +323,19 @@ public static function sanitize( array $input ): array {
 
 		$output                        = array();
 		$output['catalog_title']       = sanitize_text_field( $input['catalog_title'] ?? '' );
+		$output['catalog_description'] = sanitize_textarea_field( $input['catalog_description'] ?? '' );
 		$output['default_publisher']   = sanitize_text_field( $input['default_publisher'] ?? '' );
 		$output['default_license']     = sanitize_text_field( $input['default_license'] ?? '' );
-		$output['default_language']    = sanitize_text_field( $input['default_language'] ?? '' );
 		$output['delete_on_uninstall'] = ! empty( $input['delete_on_uninstall'] ) ? '1' : '0';
 
+		// Migrate legacy ISO language codes to EU language URIs.
+		$lang_raw                   = sanitize_text_field( $input['default_language'] ?? '' );
+		$lang_map                   = array(
+			'de' => 'http://publications.europa.eu/resource/authority/language/DEU',
+			'en' => 'http://publications.europa.eu/resource/authority/language/ENG',
+		);
+		$output['default_language'] = $lang_map[ $lang_raw ] ?? $lang_raw;
+
 		$ttl                 = (int) ( $input['cache_ttl'] ?? $defaults['cache_ttl'] );
 		$output['cache_ttl'] = max( 60, min( 86400, $ttl ) );
 
@@ -376,6 +401,17 @@ public static function filter_catalog_title( string $odw_default ): string {
 		return '' !== $custom ? $custom : $odw_default;
 	}
 
+	/**
+	 * Filter callback for `odw_catalog_description`: returns stored catalog description.
+	 *
+	 * @param string $fallback Fallback empty string provided by the caller.
+	 * @return string Catalog description when set, otherwise fallback.
+	 */
+	public static function filter_catalog_description( string $fallback ): string {
+		$stored = trim( (string) self::get( 'catalog_description' ) );
+		return '' !== $stored ? $stored : $fallback;
+	}
+
 	// -------------------------------------------------------------------------
 	// Datenzugriff
 	// -------------------------------------------------------------------------
@@ -405,6 +441,7 @@ public static function get( string $key = '' ) {
 	private static function get_defaults(): array {
 		return array(
 			'catalog_title'       => '',
+			'catalog_description' => '',
 			'default_publisher'   => '',
 			'default_license'     => '',
 			'default_language'    => '',
diff --git a/tests/test-fields-extended.php b/tests/test-fields-extended.php
index badae40..091131c 100644
--- a/tests/test-fields-extended.php
+++ b/tests/test-fields-extended.php
@@ -157,6 +157,9 @@ function ( $path ) {
 				}
 			);
 
+		\WP_Mock::userFunction( 'esc_url_raw' )
+			->andReturnArg( 0 );
+
 		\WP_Mock::userFunction( 'apply_filters' )
 			->andReturnArg( 1 );
 	}
@@ -406,4 +409,193 @@ public function test_build_omits_contact_point_when_empty(): void {
 		$this->assertIsArray( $result );
 		$this->assertArrayNotHasKey( 'dcat:contactPoint', $result );
 	}
+
+	// -------------------------------------------------------------------------
+	// Civora / DCAT-AP.de compliance tests
+	// -------------------------------------------------------------------------
+
+	/**
+	 * The dcat:theme key is emitted as an @id object referencing the EU data-theme URI.
+	 */
+	public function test_build_theme_is_emitted_as_id_reference(): void {
+		$this->load_fields();
+
+		$uri = 'http://publications.europa.eu/resource/authority/data-theme/ENVI';
+		$this->setup_jsonld_mocks( 20, 'odw_dataset', array( 'odw_theme' => $uri ) );
+
+		$result = odw_build_dataset_jsonld( 20 );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'dcat:theme', $result );
+		$this->assertSame( array( '@id' => $uri ), $result['dcat:theme'] );
+	}
+
+	/**
+	 * Legacy text theme labels are mapped to their EU data-theme URI equivalents.
+	 */
+	public function test_build_theme_maps_legacy_text_to_eu_uri(): void {
+		$this->load_fields();
+
+		$this->setup_jsonld_mocks( 21, 'odw_dataset', array( 'odw_theme' => 'Umwelt' ) );
+
+		$result = odw_build_dataset_jsonld( 21 );
+
+		$this->assertIsArray( $result );
+		$this->assertSame(
+			array( '@id' => 'http://publications.europa.eu/resource/authority/data-theme/ENVI' ),
+			$result['dcat:theme']
+		);
+	}
+
+	/**
+	 * The dct:language key is emitted as an @id object referencing the EU language URI.
+	 */
+	public function test_build_language_is_emitted_as_id_reference(): void {
+		$this->load_fields();
+
+		$uri = 'http://publications.europa.eu/resource/authority/language/DEU';
+		$this->setup_jsonld_mocks( 22, 'odw_dataset', array( 'odw_language' => $uri ) );
+
+		$result = odw_build_dataset_jsonld( 22 );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'dct:language', $result );
+		$this->assertSame( array( '@id' => $uri ), $result['dct:language'] );
+	}
+
+	/**
+	 * Legacy 'de' language code is migrated to the EU language URI for German.
+	 */
+	public function test_build_language_maps_legacy_de_code(): void {
+		$this->load_fields();
+
+		$this->setup_jsonld_mocks( 23, 'odw_dataset', array( 'odw_language' => 'de' ) );
+
+		$result = odw_build_dataset_jsonld( 23 );
+
+		$this->assertIsArray( $result );
+		$this->assertSame(
+			array( '@id' => 'http://publications.europa.eu/resource/authority/language/DEU' ),
+			$result['dct:language']
+		);
+	}
+
+	/**
+	 * The dct:format in a distribution uses the EU file-type URI (not a MIME type).
+	 */
+	public function test_build_distribution_format_uses_eu_uri(): void {
+		$this->load_fields();
+
+		$this->setup_jsonld_mocks(
+			24,
+			'odw_dataset',
+			array(
+				'odw_distributions' => array(
+					array(
+						'access_url' => 'https://example.com/data.csv',
+						'format'     => 'CSV',
+						'byte_size'  => '',
+					),
+				),
+			)
+		);
+
+		$result = odw_build_dataset_jsonld( 24 );
+
+		$this->assertIsArray( $result );
+		$dist = $result['dcat:distribution'][0];
+		$this->assertSame(
+			array( '@id' => 'http://publications.europa.eu/resource/authority/file-type/CSV' ),
+			$dist['dct:format']
+		);
+	}
+
+	/**
+	 * Each distribution carries the dataset-level license as dct:license @id.
+	 */
+	public function test_build_distribution_inherits_license(): void {
+		$this->load_fields();
+
+		$license_uri = 'https://creativecommons.org/publicdomain/zero/1.0/';
+		$this->setup_jsonld_mocks(
+			25,
+			'odw_dataset',
+			array(
+				'odw_license'       => $license_uri,
+				'odw_distributions' => array(
+					array(
+						'access_url' => 'https://example.com/data.csv',
+						'format'     => 'CSV',
+						'byte_size'  => '',
+					),
+				),
+			)
+		);
+
+		$result = odw_build_dataset_jsonld( 25 );
+
+		$this->assertIsArray( $result );
+		$dist = $result['dcat:distribution'][0];
+		$this->assertSame( array( '@id' => $license_uri ), $dist['dct:license'] );
+	}
+
+	/**
+	 * The dcatde:licenseAttributionByText is included in distribution when set.
+	 */
+	public function test_build_distribution_attribution_text(): void {
+		$this->load_fields();
+
+		$this->setup_jsonld_mocks(
+			26,
+			'odw_dataset',
+			array(
+				'odw_distributions' => array(
+					array(
+						'access_url'       => 'https://example.com/data.csv',
+						'format'           => 'CSV',
+						'byte_size'        => '',
+						'attribution_text' => 'Daten von Musterorganisation e.V.',
+					),
+				),
+			)
+		);
+
+		$result = odw_build_dataset_jsonld( 26 );
+
+		$this->assertIsArray( $result );
+		$dist = $result['dcat:distribution'][0];
+		$this->assertSame( 'Daten von Musterorganisation e.V.', $dist['dcatde:licenseAttributionByText'] );
+	}
+
+	/**
+	 * The dcatde:politicalGeocodingLevelURI is emitted as an @id reference.
+	 */
+	public function test_build_includes_political_geocoding_level_uri(): void {
+		$this->load_fields();
+
+		$uri = 'http://dcat-ap.de/def/politicalGeocoding/Level/municipality';
+		$this->setup_jsonld_mocks( 27, 'odw_dataset', array( 'odw_political_geocoding_level' => $uri ) );
+
+		$result = odw_build_dataset_jsonld( 27 );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'dcatde:politicalGeocodingLevelURI', $result );
+		$this->assertSame( array( '@id' => $uri ), $result['dcatde:politicalGeocodingLevelURI'] );
+	}
+
+	/**
+	 * The dct:license at dataset level is emitted as an @id reference.
+	 */
+	public function test_build_dataset_license_is_id_reference(): void {
+		$this->load_fields();
+
+		$license_uri = 'https://creativecommons.org/licenses/by/4.0/';
+		$this->setup_jsonld_mocks( 28, 'odw_dataset', array( 'odw_license' => $license_uri ) );
+
+		$result = odw_build_dataset_jsonld( 28 );
+
+		$this->assertIsArray( $result );
+		$this->assertArrayHasKey( 'dct:license', $result );
+		$this->assertSame( array( '@id' => $license_uri ), $result['dct:license'] );
+	}
 }
diff --git a/tests/test-fields.php b/tests/test-fields.php
index 9dfe9bb..67c5bfb 100644
--- a/tests/test-fields.php
+++ b/tests/test-fields.php
@@ -89,4 +89,95 @@ public function test_get_format_mime_returns_format_for_unknown(): void {
 
 		$this->assertSame( 'CUSTOM', ODW_Fields::get_format_mime( 'CUSTOM' ) );
 	}
+
+	/**
+	 * All non-empty theme option keys use EU Publications Office data-theme URIs.
+	 */
+	public function test_get_theme_options_uses_eu_vocabulary_uris(): void {
+		\WP_Mock::userFunction( 'apply_filters' )->andReturnArg( 1 );
+		\WP_Mock::userFunction( '__' )->andReturnArg( 0 );
+
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$base    = 'http://publications.europa.eu/resource/authority/data-theme/';
+		$options = ODW_Fields::get_theme_options();
+
+		foreach ( array_keys( $options ) as $key ) {
+			if ( '' === $key ) {
+				continue;
+			}
+			$this->assertStringStartsWith( $base, $key );
+		}
+	}
+
+	/**
+	 * Maps "CSV" to the EU Publications Office file-type URI.
+	 */
+	public function test_get_format_eu_uri_maps_csv(): void {
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$this->assertSame(
+			'http://publications.europa.eu/resource/authority/file-type/CSV',
+			ODW_Fields::get_format_eu_uri( 'CSV' )
+		);
+	}
+
+	/**
+	 * Returns the format string unchanged when the format is not in the EU vocabulary.
+	 */
+	public function test_get_format_eu_uri_returns_format_for_unknown(): void {
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$this->assertSame( 'CUSTOM', ODW_Fields::get_format_eu_uri( 'CUSTOM' ) );
+	}
+
+	/**
+	 * All non-empty language option keys use EU Publications Office language URIs.
+	 */
+	public function test_get_language_options_uses_eu_uris(): void {
+		\WP_Mock::userFunction( '__' )->andReturnArg( 0 );
+
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$base    = 'http://publications.europa.eu/resource/authority/language/';
+		$options = ODW_Fields::get_language_options();
+
+		foreach ( array_keys( $options ) as $key ) {
+			if ( '' === $key ) {
+				continue;
+			}
+			$this->assertStringStartsWith( $base, $key );
+		}
+	}
+
+	/**
+	 * The political geocoding level options include the federal-level URI.
+	 */
+	public function test_get_political_geocoding_level_options_has_federal(): void {
+		\WP_Mock::userFunction( '__' )->andReturnArg( 0 );
+
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$options = ODW_Fields::get_political_geocoding_level_options();
+		$this->assertArrayHasKey( 'http://dcat-ap.de/def/politicalGeocoding/Level/federal', $options );
+	}
+
+	/**
+	 * All non-empty political geocoding level keys use the dcatde geocoding URI base.
+	 */
+	public function test_get_political_geocoding_level_options_all_use_correct_base(): void {
+		\WP_Mock::userFunction( '__' )->andReturnArg( 0 );
+
+		require_once ODW_PLUGIN_DIR . 'includes/class-fields.php';
+
+		$base    = 'http://dcat-ap.de/def/politicalGeocoding/Level/';
+		$options = ODW_Fields::get_political_geocoding_level_options();
+
+		foreach ( array_keys( $options ) as $key ) {
+			if ( '' === $key ) {
+				continue;
+			}
+			$this->assertStringStartsWith( $base, $key );
+		}
+	}
 }