diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java
deleted file mode 100644
index 019c6e50bc..0000000000
--- a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationBannerType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of SpongeAPI, licensed under the MIT License (MIT).
- *
- * Copyright (c) SpongePowered <https://www.spongepowered.org>
- * Copyright (c) contributors
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.spongepowered.api.map.decoration;
-
-import org.spongepowered.api.data.type.DyeColor;
-
-/**
- * An extension of {@link MapDecorationType} that represents a banner, and provides
- * the {@link org.spongepowered.api.data.type.DyeColor} of the banner it
- * represents.
- * <p>
- * Not all {@link MapDecorationType MapDecorationTypes} are {@link MapDecorationBannerType}.
- */
-public interface MapDecorationBannerType extends MapDecorationType {
-    /**
-     * Gets the corresponding {@link DyeColor} that this banner decoration type is.
-     *
-     * @return The {@link DyeColor} that this banner decoration type is.
-     */
-    DyeColor bannerColor();
-}
diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
index 9dd07eff60..72549a60d4 100644
--- a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
+++ b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationType.java
@@ -24,15 +24,23 @@
  */
 package org.spongepowered.api.map.decoration;
 
+import org.spongepowered.api.data.type.DyeColor;
 import org.spongepowered.api.map.MapCanvas;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.util.annotation.CatalogedBy;
 
+import java.util.Optional;
+
 /**
- * Represents a symbol that may be used on a {@link MapCanvas} as part of a
- * {@link MapDecoration}.
+ * Represents a symbol that may be used on a {@link MapCanvas} as part of a {@link MapDecoration}.
  */
 @CatalogedBy(MapDecorationTypes.class)
 public interface MapDecorationType extends DefaultedRegistryValue {
 
+    /**
+     * Gets the corresponding {@link DyeColor} that this banner decoration type is.
+     *
+     * @return The {@link DyeColor} that this banner decoration type is.
+     */
+    Optional<DyeColor> bannerColor();
 }
diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
index f36abe71a6..c7d3def677 100644
--- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
+++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
@@ -234,6 +234,8 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<JigsawPool> JIGSAW_POOL = RegistryTypes.minecraftKeyInServer("worldgen/template_pool");
 
+    public static final DefaultedRegistryType<MapDecorationType> MAP_DECORATION_TYPE = RegistryTypes.minecraftKeyInGame("map_decoration_type");
+
     public static final DefaultedRegistryType<NoiseGeneratorConfig> NOISE_GENERATOR_CONFIG = RegistryTypes.minecraftKeyInServer("worldgen/noise_settings");
 
     public static final DefaultedRegistryType<Noise> NOISE = RegistryTypes.minecraftKeyInServer("worldgen/noise");
@@ -401,8 +403,6 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<MapDecorationOrientation> MAP_DECORATION_ORIENTATION = RegistryTypes.spongeKeyInGame("map_decoration_orientation");
 
-    public static final DefaultedRegistryType<MapDecorationType> MAP_DECORATION_TYPE = RegistryTypes.spongeKeyInGame("map_decoration_type");
-
     public static final DefaultedRegistryType<MapShade> MAP_SHADE = RegistryTypes.spongeKeyInGame("map_shade");
 
     public static final DefaultedRegistryType<MatterType> MATTER_TYPE = RegistryTypes.spongeKeyInGame("matter_type");