diff --git a/app/Events/Wiki/Group/GroupDeleting.php b/app/Events/Wiki/Group/GroupDeleting.php
index 161fb2475..89c334f49 100644
--- a/app/Events/Wiki/Group/GroupDeleting.php
+++ b/app/Events/Wiki/Group/GroupDeleting.php
@@ -50,7 +50,7 @@ class GroupDeleting extends BaseEvent implements UpdateRelatedIndicesEvent
         if ($group->isForceDeleting()) {
             $group->animethemes->each(function (AnimeTheme $theme) {
                 AnimeTheme::withoutEvents(function () use ($theme) {
-                    $theme->theme_group()->dissociate();
+                    $theme->group()->dissociate();
                     $theme->save();
                 });
                 $theme->searchable();
diff --git a/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php b/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php
deleted file mode 100644
index 614322ba0..000000000
--- a/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Api\Field\Wiki\Anime\Theme;
-
-use App\Contracts\Http\Api\Field\CreatableField;
-use App\Contracts\Http\Api\Field\UpdatableField;
-use App\Http\Api\Field\StringField;
-use App\Http\Api\Schema\Schema;
-use App\Models\Wiki\Anime\AnimeTheme;
-use Illuminate\Http\Request;
-
-/**
- * Class ThemeGroupField.
- */
-class ThemeGroupField extends StringField implements CreatableField, UpdatableField
-{
-    /**
-     * Create a new field instance.
-     *
-     * @param  Schema  $schema
-     */
-    public function __construct(Schema $schema)
-    {
-        parent::__construct($schema, AnimeTheme::ATTRIBUTE_GROUP);
-    }
-
-    /**
-     * Set the creation validation rules for the field.
-     *
-     * @param  Request  $request
-     * @return array
-     */
-    public function getCreationRules(Request $request): array
-    {
-        return [
-            'sometimes',
-            'required',
-            'string',
-            'max:192',
-        ];
-    }
-
-    /**
-     * Set the update validation rules for the field.
-     *
-     * @param  Request  $request
-     * @return array
-     */
-    public function getUpdateRules(Request $request): array
-    {
-        return [
-            'sometimes',
-            'required',
-            'string',
-            'max:192',
-        ];
-    }
-}
diff --git a/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupIdField.php b/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupIdField.php
index 4df9f8b85..d5bbb18a0 100644
--- a/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupIdField.php
+++ b/app/Http/Api/Field/Wiki/Anime/Theme/ThemeGroupIdField.php
@@ -27,7 +27,7 @@ class ThemeGroupIdField extends Field implements CreatableField, UpdatableField,
      */
     public function __construct(Schema $schema)
     {
-        parent::__construct($schema, AnimeTheme::ATTRIBUTE_THEME_GROUP);
+        parent::__construct($schema, AnimeTheme::ATTRIBUTE_GROUP);
     }
 
     /**
diff --git a/app/Http/Api/Schema/Admin/FeaturedThemeSchema.php b/app/Http/Api/Schema/Admin/FeaturedThemeSchema.php
index 9075749fd..3184395d5 100644
--- a/app/Http/Api/Schema/Admin/FeaturedThemeSchema.php
+++ b/app/Http/Api/Schema/Admin/FeaturedThemeSchema.php
@@ -57,7 +57,7 @@ class FeaturedThemeSchema extends EloquentSchema
             new AllowedInclude(new UserSchema(), FeaturedTheme::RELATION_USER),
             new AllowedInclude(new VideoSchema(), FeaturedTheme::RELATION_VIDEO),
 
-            new AllowedInclude(new GroupSchema(), 'animethemeentry.animetheme.theme_group'),
+            new AllowedInclude(new GroupSchema(), 'animethemeentry.animetheme.group'),
         ];
     }
 
diff --git a/app/Http/Api/Schema/List/Playlist/TrackSchema.php b/app/Http/Api/Schema/List/Playlist/TrackSchema.php
index 514f8a009..dcd5878bd 100644
--- a/app/Http/Api/Schema/List/Playlist/TrackSchema.php
+++ b/app/Http/Api/Schema/List/Playlist/TrackSchema.php
@@ -55,7 +55,7 @@ class TrackSchema extends EloquentSchema
             new AllowedInclude(new TrackSchema(), PlaylistTrack::RELATION_PREVIOUS),
             new AllowedInclude(new VideoSchema(), PlaylistTrack::RELATION_VIDEO),
 
-            new AllowedInclude(new GroupSchema(), 'video.animethemeentries.animetheme.theme_group'),
+            new AllowedInclude(new GroupSchema(), 'video.animethemeentries.animetheme.group'),
         ];
     }
 
diff --git a/app/Http/Api/Schema/Wiki/Anime/ThemeSchema.php b/app/Http/Api/Schema/Wiki/Anime/ThemeSchema.php
index a9ed198c8..17a7efdf4 100644
--- a/app/Http/Api/Schema/Wiki/Anime/ThemeSchema.php
+++ b/app/Http/Api/Schema/Wiki/Anime/ThemeSchema.php
@@ -8,7 +8,6 @@ use App\Contracts\Http\Api\Schema\SearchableSchema;
 use App\Http\Api\Field\Base\IdField;
 use App\Http\Api\Field\Field;
 use App\Http\Api\Field\Wiki\Anime\Theme\ThemeAnimeIdField;
-use App\Http\Api\Field\Wiki\Anime\Theme\ThemeGroupField;
 use App\Http\Api\Field\Wiki\Anime\Theme\ThemeGroupIdField;
 use App\Http\Api\Field\Wiki\Anime\Theme\ThemeSequenceField;
 use App\Http\Api\Field\Wiki\Anime\Theme\ThemeSlugField;
@@ -81,7 +80,6 @@ class ThemeSchema extends EloquentSchema implements SearchableSchema
             parent::fields(),
             [
                 new IdField($this, AnimeTheme::ATTRIBUTE_ID),
-                new ThemeGroupField($this),
                 new ThemeSequenceField($this),
                 new ThemeSlugField($this),
                 new ThemeTypeField($this),
diff --git a/app/Http/Api/Schema/Wiki/AnimeSchema.php b/app/Http/Api/Schema/Wiki/AnimeSchema.php
index b3fb44506..c11d7c71a 100644
--- a/app/Http/Api/Schema/Wiki/AnimeSchema.php
+++ b/app/Http/Api/Schema/Wiki/AnimeSchema.php
@@ -81,7 +81,7 @@ class AnimeSchema extends EloquentSchema implements InteractsWithPivots, Searcha
             new AllowedInclude(new VideoSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.animethemeentries.videos'),
             new AllowedInclude(new AudioSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.animethemeentries.videos.audio'),
             new AllowedInclude(new ArtistSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.song.artists'),
-            new AllowedInclude(new GroupSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.theme_group'),
+            new AllowedInclude(new GroupSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.group'),
             new AllowedInclude(new ExternalResourceSchema(), 'animethemes.animethemeentries.videos.animethemeentries.animetheme.song.resources'),
             new AllowedInclude(new ExternalResourceSchema(), 'animethemes.song.resources'),
             new AllowedInclude(new ImageSchema(), 'animethemes.song.artists.images'),
diff --git a/app/Http/Api/Schema/Wiki/SeriesSchema.php b/app/Http/Api/Schema/Wiki/SeriesSchema.php
index fc0b43ab1..b378446f7 100644
--- a/app/Http/Api/Schema/Wiki/SeriesSchema.php
+++ b/app/Http/Api/Schema/Wiki/SeriesSchema.php
@@ -42,7 +42,7 @@ class SeriesSchema extends EloquentSchema implements SearchableSchema
             // Undocumented paths needed for client builds
             new AllowedInclude(new ImageSchema(), 'anime.images'),
             new AllowedInclude(new VideoSchema(), 'anime.animethemes.animethemeentries.videos'),
-            new AllowedInclude(new GroupSchema(), 'anime.animethemes.theme_group'),
+            new AllowedInclude(new GroupSchema(), 'anime.animethemes.group'),
             new AllowedInclude(new SongSchema(), 'anime.animethemes.song'),
         ];
     }
diff --git a/app/Http/Api/Schema/Wiki/SongSchema.php b/app/Http/Api/Schema/Wiki/SongSchema.php
index 9a1d04a3e..a085e730a 100644
--- a/app/Http/Api/Schema/Wiki/SongSchema.php
+++ b/app/Http/Api/Schema/Wiki/SongSchema.php
@@ -58,6 +58,7 @@ class SongSchema extends EloquentSchema implements InteractsWithPivots, Searchab
             new AllowedInclude(new AnimeSchema(), Song::RELATION_ANIME),
             new AllowedInclude(new ArtistSchema(), Song::RELATION_ARTISTS),
             new AllowedInclude(new ExternalResourceSchema(), Song::RELATION_RESOURCES),
+            new AllowedInclude(new GroupSchema(), Song::RELATION_THEME_GROUPS),
             new AllowedInclude(new ThemeSchema(), Song::RELATION_ANIMETHEMES),
         ];
     }
diff --git a/app/Http/Api/Schema/Wiki/StudioSchema.php b/app/Http/Api/Schema/Wiki/StudioSchema.php
index 9a92e99a9..8c0e2490e 100644
--- a/app/Http/Api/Schema/Wiki/StudioSchema.php
+++ b/app/Http/Api/Schema/Wiki/StudioSchema.php
@@ -60,7 +60,7 @@ class StudioSchema extends EloquentSchema implements InteractsWithPivots, Search
             new AllowedInclude(new ImageSchema(), 'anime.images'),
             new AllowedInclude(new VideoSchema(), 'anime.animethemes.animethemeentries.videos'),
             new AllowedInclude(new SongSchema(), 'anime.animethemes.song'),
-            new AllowedInclude(new GroupSchema(), 'anime.animethemes.theme_group'),
+            new AllowedInclude(new GroupSchema(), 'anime.animethemes.group'),
         ];
     }
 
diff --git a/app/Http/Api/Schema/Wiki/VideoSchema.php b/app/Http/Api/Schema/Wiki/VideoSchema.php
index ab5d33bc4..f4513bb9d 100644
--- a/app/Http/Api/Schema/Wiki/VideoSchema.php
+++ b/app/Http/Api/Schema/Wiki/VideoSchema.php
@@ -58,6 +58,7 @@ class VideoSchema extends EloquentSchema implements SearchableSchema
             new AllowedInclude(new AnimeSchema(), Video::RELATION_ANIME),
             new AllowedInclude(new AudioSchema(), Video::RELATION_AUDIO),
             new AllowedInclude(new EntrySchema(), Video::RELATION_ANIMETHEMEENTRIES),
+            new AllowedInclude(new GroupSchema(), Video::RELATION_GROUP),
             new AllowedInclude(new ScriptSchema(), Video::RELATION_SCRIPT),
             new AllowedInclude(new ThemeSchema(), Video::RELATION_ANIMETHEME),
             new AllowedInclude(new TrackSchema(), Video::RELATION_TRACKS),
@@ -65,7 +66,6 @@ class VideoSchema extends EloquentSchema implements SearchableSchema
             // Undocumented paths needed for client builds
             new AllowedInclude(new SongSchema(), 'animethemeentries.animetheme.song'),
             new AllowedInclude(new ArtistSchema(), 'animethemeentries.animetheme.song.artists'),
-            new AllowedInclude(new GroupSchema(), 'animethemeentries.animetheme.theme_group'),
             new AllowedInclude(new ImageSchema(), 'animethemeentries.animetheme.anime.images'),
         ];
     }
diff --git a/app/Models/Wiki/Anime.php b/app/Models/Wiki/Anime.php
index df98e7a8d..a532b597f 100644
--- a/app/Models/Wiki/Anime.php
+++ b/app/Models/Wiki/Anime.php
@@ -67,7 +67,7 @@ class Anime extends BaseModel
     final public const RELATION_ARTISTS = 'animethemes.song.artists';
     final public const RELATION_AUDIO = 'animethemes.animethemeentries.videos.audio';
     final public const RELATION_ENTRIES = 'animethemes.animethemeentries';
-    final public const RELATION_GROUPS = 'animethemes.theme_group';
+    final public const RELATION_GROUPS = 'animethemes.group';
     final public const RELATION_IMAGES = 'images';
     final public const RELATION_RESOURCES = 'resources';
     final public const RELATION_SCRIPTS = 'animethemes.animethemeentries.videos.videoscript';
diff --git a/app/Models/Wiki/Anime/AnimeTheme.php b/app/Models/Wiki/Anime/AnimeTheme.php
index d18b3ff97..0c371582e 100644
--- a/app/Models/Wiki/Anime/AnimeTheme.php
+++ b/app/Models/Wiki/Anime/AnimeTheme.php
@@ -29,8 +29,7 @@ use Laravel\Nova\Actions\Actionable;
  * @property Anime $anime
  * @property int $anime_id
  * @property Collection<int, AnimeThemeEntry> $animethemeentries
- * @property string|null $group
- * @property Group|null $theme_group
+ * @property Group|null $group
  * @property int|null $group_id
  * @property int|null $sequence
  * @property string $slug
@@ -49,19 +48,18 @@ class AnimeTheme extends BaseModel
     final public const TABLE = 'anime_themes';
 
     final public const ATTRIBUTE_ANIME = 'anime_id';
-    final public const ATTRIBUTE_GROUP = 'group';
     final public const ATTRIBUTE_ID = 'theme_id';
+    final public const ATTRIBUTE_GROUP = 'group_id';
     final public const ATTRIBUTE_SEQUENCE = 'sequence';
     final public const ATTRIBUTE_SLUG = 'slug';
     final public const ATTRIBUTE_SONG = 'song_id';
-    final public const ATTRIBUTE_THEME_GROUP = 'group_id';
     final public const ATTRIBUTE_TYPE = 'type';
 
     final public const RELATION_ANIME = 'anime';
     final public const RELATION_ARTISTS = 'song.artists';
     final public const RELATION_AUDIO = 'animethemeentries.videos.audio';
     final public const RELATION_ENTRIES = 'animethemeentries';
-    final public const RELATION_GROUP = 'theme_group';
+    final public const RELATION_GROUP = 'group';
     final public const RELATION_IMAGES = 'anime.images';
     final public const RELATION_SONG = 'song';
     final public const RELATION_SYNONYMS = 'anime.animesynonyms';
@@ -75,7 +73,6 @@ class AnimeTheme extends BaseModel
     protected $fillable = [
         AnimeTheme::ATTRIBUTE_ANIME,
         AnimeTheme::ATTRIBUTE_GROUP,
-        AnimeTheme::ATTRIBUTE_THEME_GROUP,
         AnimeTheme::ATTRIBUTE_SEQUENCE,
         AnimeTheme::ATTRIBUTE_SLUG,
         AnimeTheme::ATTRIBUTE_SONG,
@@ -176,9 +173,9 @@ class AnimeTheme extends BaseModel
      *
      * @return BelongsTo
      */
-    public function theme_group(): BelongsTo
+    public function group(): BelongsTo
     {
-        return $this->belongsTo(Group::class, AnimeTheme::ATTRIBUTE_THEME_GROUP);
+        return $this->belongsTo(Group::class, AnimeTheme::ATTRIBUTE_GROUP);
     }
 
     /**
diff --git a/app/Models/Wiki/Artist.php b/app/Models/Wiki/Artist.php
index 730f4bcd9..e75e83df1 100644
--- a/app/Models/Wiki/Artist.php
+++ b/app/Models/Wiki/Artist.php
@@ -56,7 +56,7 @@ class Artist extends BaseModel
     final public const RELATION_MEMBERS = 'members';
     final public const RELATION_RESOURCES = 'resources';
     final public const RELATION_SONGS = 'songs';
-    final public const RELATION_THEME_GROUPS = 'songs.animethemes.theme_group';
+    final public const RELATION_THEME_GROUPS = 'songs.animethemes.group';
 
     /**
      * The attributes that are mass assignable.
diff --git a/app/Models/Wiki/Group.php b/app/Models/Wiki/Group.php
index 61dbf9e79..5b6e6514c 100644
--- a/app/Models/Wiki/Group.php
+++ b/app/Models/Wiki/Group.php
@@ -101,6 +101,6 @@ class Group extends BaseModel
      */
     public function animethemes(): HasMany
     {
-        return $this->hasMany(AnimeTheme::class, AnimeTheme::ATTRIBUTE_THEME_GROUP);
+        return $this->hasMany(AnimeTheme::class, AnimeTheme::ATTRIBUTE_GROUP);
     }
 }
diff --git a/app/Models/Wiki/Song.php b/app/Models/Wiki/Song.php
index f443da8a4..3bb24a943 100644
--- a/app/Models/Wiki/Song.php
+++ b/app/Models/Wiki/Song.php
@@ -47,6 +47,7 @@ class Song extends BaseModel
     final public const RELATION_ANIMETHEMES = 'animethemes';
     final public const RELATION_ARTISTS = 'artists';
     final public const RELATION_RESOURCES = 'resources';
+    final public const RELATION_THEME_GROUPS = 'animethemes.group';
     final public const RELATION_VIDEOS = 'animethemes.animethemeentries.videos';
 
     /**
diff --git a/app/Models/Wiki/Video.php b/app/Models/Wiki/Video.php
index 18780e5db..9aea34547 100644
--- a/app/Models/Wiki/Video.php
+++ b/app/Models/Wiki/Video.php
@@ -84,6 +84,7 @@ class Video extends BaseModel implements Streamable, Viewable
     final public const RELATION_ANIMESYNONYMS = 'animethemeentries.animetheme.anime.animesynonyms';
     final public const RELATION_ANIMETHEME = 'animethemeentries.animetheme';
     final public const RELATION_ANIMETHEMEENTRIES = 'animethemeentries';
+    final public const RELATION_GROUP = 'animethemeentries.animetheme.group';
     final public const RELATION_AUDIO = 'audio';
     final public const RELATION_SCRIPT = 'videoscript';
     final public const RELATION_SONG = 'animethemeentries.animetheme.song';
diff --git a/app/Nova/Resources/Wiki/Anime/Theme.php b/app/Nova/Resources/Wiki/Anime/Theme.php
index 5e5504be7..51121faea 100644
--- a/app/Nova/Resources/Wiki/Anime/Theme.php
+++ b/app/Nova/Resources/Wiki/Anime/Theme.php
@@ -198,17 +198,6 @@ class Theme extends BaseResource
                 ->filterable()
                 ->showWhenPeeking(),
 
-            Text::make(__('nova.fields.anime_theme.group.name'), AnimeTheme::ATTRIBUTE_GROUP)
-                ->sortable()
-                ->nullable()
-                ->rules(['nullable', 'max:192'])
-                ->help(__('nova.fields.anime_theme.group.help'))
-                ->showOnPreview()
-                ->filterable()
-                ->maxlength(192)
-                ->enforceMaxlength()
-                ->showWhenPeeking(),
-
             Text::make(__('nova.fields.anime_theme.slug.name'), AnimeTheme::ATTRIBUTE_SLUG)
                 ->sortable()
                 ->rules(['required', 'max:192', 'alpha_dash'])
diff --git a/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php b/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php
deleted file mode 100644
index fe31bef35..000000000
--- a/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeGroupField.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Scout\Elasticsearch\Api\Field\Wiki\Anime\Theme;
-
-use App\Models\Wiki\Anime\AnimeTheme;
-use App\Scout\Elasticsearch\Api\Field\StringField;
-use App\Scout\Elasticsearch\Api\Schema\Schema;
-
-/**
- * Class ThemeGroupField.
- */
-class ThemeGroupField extends StringField
-{
-    /**
-     * Create a new field instance.
-     *
-     * @param  Schema  $schema
-     */
-    public function __construct(Schema $schema)
-    {
-        parent::__construct($schema, AnimeTheme::ATTRIBUTE_GROUP);
-    }
-}
diff --git a/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeSlugField.php b/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeSlugField.php
index 5abccf82f..70ef3a0ef 100644
--- a/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeSlugField.php
+++ b/app/Scout/Elasticsearch/Api/Field/Wiki/Anime/Theme/ThemeSlugField.php
@@ -9,7 +9,7 @@ use App\Scout\Elasticsearch\Api\Field\StringField;
 use App\Scout\Elasticsearch\Api\Schema\Schema;
 
 /**
- * Class ThemeGroupField.
+ * Class ThemeSlugField.
  */
 class ThemeSlugField extends StringField
 {
diff --git a/app/Scout/Elasticsearch/Api/Schema/Wiki/Anime/ThemeSchema.php b/app/Scout/Elasticsearch/Api/Schema/Wiki/Anime/ThemeSchema.php
index cbf68ceb1..aaf157313 100644
--- a/app/Scout/Elasticsearch/Api/Schema/Wiki/Anime/ThemeSchema.php
+++ b/app/Scout/Elasticsearch/Api/Schema/Wiki/Anime/ThemeSchema.php
@@ -11,7 +11,6 @@ use App\Http\Resources\Wiki\Anime\Resource\ThemeResource;
 use App\Models\Wiki\Anime\AnimeTheme;
 use App\Scout\Elasticsearch\Api\Field\Base\IdField;
 use App\Scout\Elasticsearch\Api\Field\Field;
-use App\Scout\Elasticsearch\Api\Field\Wiki\Anime\Theme\ThemeGroupField;
 use App\Scout\Elasticsearch\Api\Field\Wiki\Anime\Theme\ThemeSequenceField;
 use App\Scout\Elasticsearch\Api\Field\Wiki\Anime\Theme\ThemeSlugField;
 use App\Scout\Elasticsearch\Api\Field\Wiki\Anime\Theme\ThemeTypeField;
@@ -85,7 +84,6 @@ class ThemeSchema extends Schema
             parent::fields(),
             [
                 new IdField($this, AnimeTheme::ATTRIBUTE_ID),
-                new ThemeGroupField($this),
                 new ThemeSequenceField($this),
                 new ThemeSlugField($this),
                 new ThemeTypeField($this),
diff --git a/app/Scout/Elasticsearch/Api/Schema/Wiki/AnimeSchema.php b/app/Scout/Elasticsearch/Api/Schema/Wiki/AnimeSchema.php
index df3b23c62..379ef67ff 100644
--- a/app/Scout/Elasticsearch/Api/Schema/Wiki/AnimeSchema.php
+++ b/app/Scout/Elasticsearch/Api/Schema/Wiki/AnimeSchema.php
@@ -7,6 +7,7 @@ namespace App\Scout\Elasticsearch\Api\Schema\Wiki;
 use App\Http\Api\Include\AllowedInclude;
 use App\Http\Api\Schema\Wiki\AudioSchema;
 use App\Http\Api\Schema\Wiki\ExternalResourceSchema;
+use App\Http\Api\Schema\Wiki\GroupSchema;
 use App\Http\Api\Schema\Wiki\ImageSchema;
 use App\Http\Api\Schema\Wiki\Video\ScriptSchema;
 use App\Http\Resources\Wiki\Resource\AnimeResource;
@@ -63,6 +64,7 @@ class AnimeSchema extends Schema
             new AllowedInclude(new AudioSchema(), Anime::RELATION_AUDIO),
             new AllowedInclude(new EntrySchema(), Anime::RELATION_ENTRIES),
             new AllowedInclude(new ExternalResourceSchema(), Anime::RELATION_RESOURCES),
+            new AllowedInclude(new GroupSchema(), Anime::RELATION_GROUPS),
             new AllowedInclude(new ImageSchema(), Anime::RELATION_IMAGES),
             new AllowedInclude(new ScriptSchema(), Anime::RELATION_SCRIPTS),
             new AllowedInclude(new SeriesSchema(), Anime::RELATION_SERIES),
diff --git a/app/Scout/Elasticsearch/Api/Schema/Wiki/ArtistSchema.php b/app/Scout/Elasticsearch/Api/Schema/Wiki/ArtistSchema.php
index b12a567ac..861bce640 100644
--- a/app/Scout/Elasticsearch/Api/Schema/Wiki/ArtistSchema.php
+++ b/app/Scout/Elasticsearch/Api/Schema/Wiki/ArtistSchema.php
@@ -6,6 +6,7 @@ namespace App\Scout\Elasticsearch\Api\Schema\Wiki;
 
 use App\Http\Api\Include\AllowedInclude;
 use App\Http\Api\Schema\Wiki\ExternalResourceSchema;
+use App\Http\Api\Schema\Wiki\GroupSchema;
 use App\Http\Api\Schema\Wiki\ImageSchema;
 use App\Http\Resources\Wiki\Resource\ArtistResource;
 use App\Models\Wiki\Artist;
@@ -55,6 +56,7 @@ class ArtistSchema extends Schema
             new AllowedInclude(new ArtistSchema(), Artist::RELATION_GROUPS),
             new AllowedInclude(new ArtistSchema(), Artist::RELATION_MEMBERS),
             new AllowedInclude(new ExternalResourceSchema(), Artist::RELATION_RESOURCES),
+            new AllowedInclude(new GroupSchema(), Artist::RELATION_THEME_GROUPS),
             new AllowedInclude(new ImageSchema(), Artist::RELATION_IMAGES),
             new AllowedInclude(new SongSchema(), Artist::RELATION_SONGS),
             new AllowedInclude(new ThemeSchema(), Artist::RELATION_ANIMETHEMES),
diff --git a/app/Scout/Elasticsearch/Api/Schema/Wiki/SongSchema.php b/app/Scout/Elasticsearch/Api/Schema/Wiki/SongSchema.php
index 7613351e1..ff8f63a69 100644
--- a/app/Scout/Elasticsearch/Api/Schema/Wiki/SongSchema.php
+++ b/app/Scout/Elasticsearch/Api/Schema/Wiki/SongSchema.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Scout\Elasticsearch\Api\Schema\Wiki;
 
 use App\Http\Api\Include\AllowedInclude;
+use App\Http\Api\Schema\Wiki\GroupSchema;
 use App\Http\Resources\Wiki\Resource\SongResource;
 use App\Models\Wiki\Song;
 use App\Scout\Elasticsearch\Api\Field\Base\IdField;
@@ -50,6 +51,7 @@ class SongSchema extends Schema
         return [
             new AllowedInclude(new AnimeSchema(), Song::RELATION_ANIME),
             new AllowedInclude(new ArtistSchema(), Song::RELATION_ARTISTS),
+            new AllowedInclude(new GroupSchema(), Song::RELATION_THEME_GROUPS),
             new AllowedInclude(new ThemeSchema(), Song::RELATION_ANIMETHEMES),
         ];
     }
diff --git a/app/Scout/Elasticsearch/Api/Schema/Wiki/VideoSchema.php b/app/Scout/Elasticsearch/Api/Schema/Wiki/VideoSchema.php
index e3109adbb..bd7994ff1 100644
--- a/app/Scout/Elasticsearch/Api/Schema/Wiki/VideoSchema.php
+++ b/app/Scout/Elasticsearch/Api/Schema/Wiki/VideoSchema.php
@@ -6,6 +6,7 @@ namespace App\Scout\Elasticsearch\Api\Schema\Wiki;
 
 use App\Http\Api\Include\AllowedInclude;
 use App\Http\Api\Schema\Wiki\AudioSchema;
+use App\Http\Api\Schema\Wiki\GroupSchema;
 use App\Http\Resources\Wiki\Resource\VideoResource;
 use App\Models\Wiki\Video;
 use App\Scout\Elasticsearch\Api\Field\Base\IdField;
@@ -64,6 +65,7 @@ class VideoSchema extends Schema
             new AllowedInclude(new AnimeSchema(), Video::RELATION_ANIME),
             new AllowedInclude(new AudioSchema(), Video::RELATION_AUDIO),
             new AllowedInclude(new EntrySchema(), Video::RELATION_ANIMETHEMEENTRIES),
+            new AllowedInclude(new GroupSchema(), Video::RELATION_GROUP),
             new AllowedInclude(new ThemeSchema(), Video::RELATION_ANIMETHEME),
         ];
     }
diff --git a/database/migrations/2020_05_05_045028_create_anime_themes_table.php b/database/migrations/2020_05_05_045028_create_anime_themes_table.php
index 2b7216a24..28af68ab2 100644
--- a/database/migrations/2020_05_05_045028_create_anime_themes_table.php
+++ b/database/migrations/2020_05_05_045028_create_anime_themes_table.php
@@ -24,7 +24,6 @@ return new class extends Migration
                 $table->id(AnimeTheme::ATTRIBUTE_ID);
                 $table->timestamps(6);
                 $table->softDeletes(BaseModel::ATTRIBUTE_DELETED_AT, 6);
-                $table->string(AnimeTheme::ATTRIBUTE_GROUP)->nullable();
                 $table->integer(AnimeTheme::ATTRIBUTE_TYPE)->nullable();
                 $table->integer(AnimeTheme::ATTRIBUTE_SEQUENCE)->nullable();
                 $table->string(AnimeTheme::ATTRIBUTE_SLUG);
diff --git a/database/migrations/2024_04_26_140035_add_theme_group_attribute_to_anime_theme.php b/database/migrations/2024_04_26_140035_add_theme_group_attribute_to_anime_theme.php
index 9170551fb..17d6117c1 100644
--- a/database/migrations/2024_04_26_140035_add_theme_group_attribute_to_anime_theme.php
+++ b/database/migrations/2024_04_26_140035_add_theme_group_attribute_to_anime_theme.php
@@ -15,10 +15,10 @@ return new class extends Migration
      */
     public function up(): void
     {
-        if (! Schema::hasColumn(AnimeTheme::TABLE, AnimeTheme::ATTRIBUTE_THEME_GROUP)) {
+        if (! Schema::hasColumn(AnimeTheme::TABLE, AnimeTheme::ATTRIBUTE_GROUP)) {
             Schema::table(AnimeTheme::TABLE, function (Blueprint $table) {
-                $table->unsignedBigInteger(AnimeTheme::ATTRIBUTE_THEME_GROUP)->nullable();
-                $table->foreign(AnimeTheme::ATTRIBUTE_THEME_GROUP)->references(Group::ATTRIBUTE_ID)->on(Group::TABLE)->nullOnDelete();
+                $table->unsignedBigInteger(AnimeTheme::ATTRIBUTE_GROUP)->nullable();
+                $table->foreign(AnimeTheme::ATTRIBUTE_GROUP)->references(Group::ATTRIBUTE_ID)->on(Group::TABLE)->nullOnDelete();
             });
         }
     }
@@ -28,9 +28,9 @@ return new class extends Migration
      */
     public function down(): void
     {
-        if (Schema::hasColumn(AnimeTheme::TABLE, AnimeTheme::ATTRIBUTE_THEME_GROUP)) {
+        if (Schema::hasColumn(AnimeTheme::TABLE, AnimeTheme::ATTRIBUTE_GROUP)) {
             Schema::table(AnimeTheme::TABLE, function (Blueprint $table) {
-                $table->dropConstrainedForeignId(AnimeTheme::ATTRIBUTE_THEME_GROUP);
+                $table->dropConstrainedForeignId(AnimeTheme::ATTRIBUTE_GROUP);
             });
         }
     }
diff --git a/elastic/migrations/2020_12_22_034505_create_entry_index.php b/elastic/migrations/2020_12_22_034505_create_entry_index.php
index 7fbc59599..c6ab5482d 100644
--- a/elastic/migrations/2020_12_22_034505_create_entry_index.php
+++ b/elastic/migrations/2020_12_22_034505_create_entry_index.php
@@ -100,7 +100,30 @@ final class CreateEntryIndex implements MigrationInterface
                         'type' => 'date',
                     ],
                     'group' => [
-                        'type' => 'text',
+                        'type' => 'nested',
+                        'properties' => [
+                            'created_at' => [
+                                'type' => 'date',
+                            ],
+                            'group_id' => [
+                                'type' => 'long',
+                            ],
+                            'name' => [
+                                'type' => 'text',
+                            ],
+                            'slug' => [
+                                'type' => 'text',
+                            ],
+                            'video_filename' => [
+                                'type' => 'text',
+                            ],
+                            'updated_at' => [
+                                'type' => 'date',
+                            ],
+                        ],
+                    ],
+                    'group_id' => [
+                        'type' => 'long',
                     ],
                     'sequence' => [
                         'type' => 'long',
diff --git a/elastic/migrations/2020_12_22_034557_create_theme_index.php b/elastic/migrations/2020_12_22_034557_create_theme_index.php
index fbcb1d5ac..a2c1f3acf 100644
--- a/elastic/migrations/2020_12_22_034557_create_theme_index.php
+++ b/elastic/migrations/2020_12_22_034557_create_theme_index.php
@@ -73,13 +73,29 @@ final class CreateThemeIndex implements MigrationInterface
             $mapping->long('anime_id');
             $mapping->text('anime_slug');
             $mapping->date('created_at');
-            $mapping->text('group', [
-                'fields' => [
-                    'keyword' => [
-                        'type' => 'keyword',
+            $mapping->nested('group', [
+                'properties' => [
+                    'created_at' => [
+                        'type' => 'date',
+                    ],
+                    'group_id' => [
+                        'type' => 'long',
+                    ],
+                    'name' => [
+                        'type' => 'text',
+                    ],
+                    'slug' => [
+                        'type' => 'text',
+                    ],
+                    'video_filename' => [
+                        'type' => 'text',
+                    ],
+                    'updated_at' => [
+                        'type' => 'date',
                     ],
                 ],
             ]);
+            $mapping->long('group_id');
             $mapping->long('sequence');
             $mapping->text('slug', [
                 'copy_to' => [
diff --git a/elastic/migrations/2020_12_22_034601_create_video_index.php b/elastic/migrations/2020_12_22_034601_create_video_index.php
index 75cb4a533..b23f4f181 100644
--- a/elastic/migrations/2020_12_22_034601_create_video_index.php
+++ b/elastic/migrations/2020_12_22_034601_create_video_index.php
@@ -110,7 +110,30 @@ final class CreateVideoIndex implements MigrationInterface
                                 'type' => 'date',
                             ],
                             'group' => [
-                                'type' => 'text',
+                                'type' => 'nested',
+                                'properties' => [
+                                    'created_at' => [
+                                        'type' => 'date',
+                                    ],
+                                    'group_id' => [
+                                        'type' => 'long',
+                                    ],
+                                    'name' => [
+                                        'type' => 'text',
+                                    ],
+                                    'slug' => [
+                                        'type' => 'text',
+                                    ],
+                                    'video_filename' => [
+                                        'type' => 'text',
+                                    ],
+                                    'updated_at' => [
+                                        'type' => 'date',
+                                    ],
+                                ],
+                            ],
+                            'group_id' => [
+                                'type' => 'long',
                             ],
                             'sequence' => [
                                 'type' => 'long',
diff --git a/lang/en/nova.php b/lang/en/nova.php
index 0011b9297..ed38fe36c 100644
--- a/lang/en/nova.php
+++ b/lang/en/nova.php
@@ -423,10 +423,6 @@ return [
             ],
         ],
         'anime_theme' => [
-            'group' => [
-                'help' => 'For separating sequences belonging to dubs, rebroadcasts, remasters, etc. By default, leave blank.',
-                'name' => 'Group',
-            ],
             'sequence' => [
                 'help' => 'Numeric ordering of theme. If only one theme of this type exists for the show, this can be left blank.',
                 'name' => 'Sequence',
diff --git a/tests/Unit/Models/Wiki/Anime/AnimeThemeTest.php b/tests/Unit/Models/Wiki/Anime/AnimeThemeTest.php
index 87e7b5102..7c18802ef 100644
--- a/tests/Unit/Models/Wiki/Anime/AnimeThemeTest.php
+++ b/tests/Unit/Models/Wiki/Anime/AnimeThemeTest.php
@@ -107,8 +107,8 @@ class AnimeThemeTest extends TestCase
             ->for(Group::factory())
             ->createOne();
 
-        static::assertInstanceOf(BelongsTo::class, $theme->theme_group());
-        static::assertInstanceOf(Group::class, $theme->theme_group()->first());
+        static::assertInstanceOf(BelongsTo::class, $theme->group());
+        static::assertInstanceOf(Group::class, $theme->group()->first());
     }
 
     /**