diff --git a/assets/components/container/container.vue b/assets/components/container/container.vue
index b035cad20..e778e2b72 100644
--- a/assets/components/container/container.vue
+++ b/assets/components/container/container.vue
@@ -111,4 +111,12 @@ export default {
 		transform: translate(-100%, 0);
 	}
 }
+
+.column {
+    width: 1200px;
+    max-width: 100%;
+    padding: 0 1rem;
+    margin: 0 auto;
+    box-sizing: border-box;
+}
 </style>
diff --git a/assets/components/releases/details.vue b/assets/components/releases/details.vue
new file mode 100644
index 000000000..5f2a0a113
--- /dev/null
+++ b/assets/components/releases/details.vue
@@ -0,0 +1,223 @@
+<template>
+	<div class="details">
+		<div class="column">
+			<div class="tidbits">
+				<a
+					v-if="release.date"
+					:title="release.url && `View scene on ${release.entity.name}`"
+					:href="release.url"
+					:class="{ link: release.url }"
+					target="_blank"
+					rel="noopener noreferrer"
+					class="tidbit date nolink"
+				>
+					<span class="date-compact">{{ formatDate(release.date, 'MMM D, YYYY', release.datePrecision) }}</span>
+					<span class="date-full">{{ formatDate(release.date, 'MMMM D, YYYY', release.datePrecision) }}</span>
+
+					<Icon
+						v-if="release.url"
+						icon="share2"
+					/>
+				</a>
+			</div>
+
+			<div class="site">
+				<template v-if="release.entity.parent && !release.entity.independent">
+					<a
+						v-if="release.entity.parent.hasLogo"
+						:href="`/network/${release.entity.parent.slug}`"
+						class="logo-link"
+					>
+						<img
+							:src="`/img/logos/${release.entity.parent.slug}/thumbs/network.png`"
+							:title="release.entity.parent.name"
+							:alt="release.entity.parent.name"
+							class="logo logo-parent"
+						>
+					</a>
+
+					<a
+						v-else
+						:href="`/network/${release.entity.parent.slug}`"
+						class="logo-link logo-name"
+					>{{ release.entity.parent.name }}</a>
+
+					<span class="chain">presents</span>
+
+					<a
+						v-if="release.entity.hasLogo"
+						:href="`/${release.entity.type}/${release.entity.slug}`"
+						class="logo-link"
+					>
+						<img
+							v-if="release.entity.type === 'network'"
+							:src="`/img/logos/${release.entity.slug}/thumbs/network.png`"
+							:title="release.entity.name"
+							class="logo logo-site"
+						>
+
+						<img
+							v-else
+							:src="`/img/logos/${release.entity.parent.slug}/thumbs/${release.entity.slug}.png`"
+							:title="release.entity.name"
+							class="logo logo-site"
+						>
+					</a>
+
+					<a
+						v-else
+						:href="`/${release.entity.type}/${release.entity.slug}`"
+						class="logo-link logo-name"
+					>{{ release.entity.name }}</a>
+				</template>
+
+				<a
+					v-else
+					:href="`/${release.entity.type}/${release.entity.slug}`"
+				>
+					<img
+						:src="`/img/logos/${release.entity.slug}/thumbs/network.png`"
+						:title="release.entity.name"
+						class="logo logo-site"
+					>
+				</a>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		release: {
+			type: Object,
+			default: null,
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import 'breakpoints';
+
+.details {
+    background: var(--profile);
+    color: var(--text-light);
+    box-shadow: 0 0 3px var(--shadow-weak);
+    cursor: default;
+
+    .column {
+		height: 100%;
+        display: flex;
+		justify-content: space-between;
+        align-items: center;
+        padding: 0 1rem;
+    }
+
+    .link {
+        color: var(--text-light);
+
+		.icon {
+			fill: var(--lighten);
+		}
+
+		&:hover {
+			color: var(--text-light);
+
+			.icon {
+				fill: var(--text-light);
+			}
+		}
+    }
+}
+
+.tidbits {
+	flex-shrink: 0;
+	height: 100%;
+}
+
+.tidbit {
+    display: inline-flex;
+	align-items: center;
+    height: 100%;
+
+	&.date {
+        flex-shrink: 0;
+		font-weight: bold;
+
+		.icon {
+			fill: var(--lighten);
+			margin: -.2rem 0 0 .75rem;
+		}
+    }
+}
+
+.site {
+    display: inline-flex;
+    align-items: center;
+    padding: .25rem 0;
+    font-size: 0;
+}
+
+.logo {
+    display: inline-block;
+}
+
+.logo-link {
+	text-decoration: none;
+}
+
+.logo-site {
+    height: 2.5rem;
+    max-width: 15rem;
+	margin: .25rem 0;
+    object-fit: contain;
+    object-position: 100% 50%;
+}
+
+.logo-parent {
+    height: 1.5rem;
+    max-width: 10rem;
+    object-fit: contain;
+    object-position: 100% 50%;
+}
+
+.logo-name {
+	padding: .5rem 0;
+	color: var(--text-light);
+	font-size: 1.25rem;
+	font-weight: bold;
+}
+
+.chain {
+    color: var(--lighten);
+    padding: 0 .5rem;
+    font-weight: bold;
+    font-size: .8rem;
+}
+
+.date-compact {
+	display: none;
+}
+
+@media(max-width: $breakpoint-mega) {
+    .logo-parent,
+    .chain {
+        display: none;
+    }
+
+	.logo-site {
+		width: 100%;
+	}
+}
+
+@media(max-width: $breakpoint) {
+	.date-full {
+		display: none;
+	}
+
+	.date-compact {
+		display: inline-block;
+	}
+}
+</style>
diff --git a/assets/components/releases/media.vue b/assets/components/releases/media.vue
index 8031bec38..28ea11f62 100644
--- a/assets/components/releases/media.vue
+++ b/assets/components/releases/media.vue
@@ -71,7 +71,7 @@
 
 		<div
 			v-for="photo in photos"
-			:key="`media-${photo.index}`"
+			:key="`media-${photo.id}`"
 			class="item-container"
 		>
 			<a
diff --git a/assets/components/movies/tile.vue b/assets/components/releases/movie-tile.vue
similarity index 52%
rename from assets/components/movies/tile.vue
rename to assets/components/releases/movie-tile.vue
index d18533a31..b36f3aeab 100644
--- a/assets/components/movies/tile.vue
+++ b/assets/components/releases/movie-tile.vue
@@ -12,60 +12,6 @@
 			</router-link>
 
 			<div class="info">
-				<div class="details">
-					<span
-						v-if="movie.entity.type !== 'network' && !movie.entity.independent && movie.entity.parent"
-						class="entity"
-					>
-						<router-link
-							v-tooltip.bottom="`Part of ${movie.entity.parent.name}`"
-							:title="`Part of ${movie.entity.parent.name}`"
-							:to="`/${movie.entity.parent.type}/${movie.entity.parent.slug}`"
-							class="entity-link"
-						><img
-							:src="`/img/logos/${movie.entity.parent.slug}/favicon.png`"
-							class="favicon"
-						></router-link>
-
-						<router-link
-							v-tooltip.bottom="`More from ${movie.entity.name}`"
-							:title="`More from ${movie.entity.name}`"
-							:to="`/${movie.entity.type}/${movie.entity.slug}`"
-							class="entity-link"
-						>{{ movie.entity.name }}</router-link>
-					</span>
-
-					<router-link
-						v-else
-						:to="`/${movie.entity.type}/${movie.entity.slug}`"
-						class="entity entity-link"
-					><img
-						:src="`/img/logos/${movie.entity.slug}/favicon.png`"
-						class="favicon"
-					>{{ movie.entity.name }}</router-link>
-
-					<a
-						v-if="movie.date"
-						v-tooltip.bottom="movie.url && `View movie on ${movie.entity.name}`"
-						:title="movie.url && `View movie on ${movie.entity.name}`"
-						:href="movie.url"
-						:class="{ upcoming: isAfter(movie.date, new Date()) }"
-						target="_blank"
-						rel="noopener noreferrer"
-						class="date"
-					><Icon icon="share2" />{{ formatDate(movie.date, 'MMMM D, YYYY', movie.datePrecision) }}</a>
-
-					<a
-						v-else
-						:href="movie.url"
-						:class="{ upcoming: isAfter(movie.date, new Date()), new: movie.isNew }"
-						title="Scene date N/A, showing date added"
-						target="_blank"
-						rel="noopener noreferrer"
-						class="date"
-					>{{ `(${formatDate(movie.dateAdded, 'MMMM D, YYYY')})` }}</a>
-				</div>
-
 				<router-link
 					:to="{ name: 'movie', params: { movieId: movie.id, movieSlug: movie.slug } }"
 					class="title-link"
@@ -102,11 +48,18 @@
 				</ul>
 			</div>
 		</div>
+
+		<Details :release="movie" />
 	</div>
 </template>
 
 <script>
+import Details from './tile-details.vue';
+
 export default {
+	components: {
+		Details,
+	},
 	props: {
 		movie: {
 			type: Object,
@@ -117,6 +70,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import 'breakpoints';
+
 .tile {
 	display: flex;
 	flex-direction: column;
@@ -134,41 +89,6 @@ export default {
 	text-decoration: none;
 }
 
-.details {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	color: var(--text-light);
-	background: var(--profile);
-	padding: .5rem 1rem;
-    font-size: .8rem;
-	font-weight: bold;
-}
-
-.entity-link,
-.date {
-	display: flex;
-	align-items: center;
-	color: inherit;
-	font-size: inherit;
-	text-decoration: none;
-
-	.favicon {
-		width: 1rem;
-		height: 1rem;
-		margin: 0 .5rem 0 0;
-	}
-
-	.icon {
-		fill: var(--highlight-weak);
-		margin: 0 .25rem 0 0;
-	}
-
-	&:hover .icon {
-		fill: var(--text-light);
-	}
-}
-
 .cover {
 	height: 16rem;
 	box-shadow: 0 0 3px var(--darken-weak);
@@ -242,4 +162,10 @@ export default {
 		color: var(--primary);
 	}
 }
+
+@media(max-width: $breakpoint) {
+	.cover {
+		height: 12rem;
+	}
+}
 </style>
diff --git a/assets/components/releases/movie.vue b/assets/components/releases/movie.vue
new file mode 100644
index 000000000..070d62573
--- /dev/null
+++ b/assets/components/releases/movie.vue
@@ -0,0 +1,107 @@
+<template>
+	<div
+		v-if="movie"
+		class="movie"
+	>
+		<Media
+			:release="movie"
+		/>
+
+		<Details :release="movie" />
+
+		<div class="column">
+			<h2 class="title">{{ movie.title }}</h2>
+
+			<p>{{ movie.description }}</p>
+
+			<div
+				v-lazy-container="{ selector: '.lazy' }"
+				class="actors"
+			>
+				<ActorTile
+					v-for="actor in movie.actors"
+					:key="`actor-${actor.id}`"
+					:actor="actor"
+				/>
+			</div>
+
+			<Tags
+				v-if="movie.tags && movie.tags.length > 0"
+				:tags="movie.tags"
+			/>
+
+			<Releases
+				:releases="movie.scenes"
+			/>
+		</div>
+	</div>
+</template>
+
+<script>
+import Media from './media.vue';
+import Details from './details.vue';
+import Tags from './tags.vue';
+import Releases from './releases.vue';
+import ActorTile from '../actors/tile.vue';
+
+async function mounted() {
+	this.movie = await this.$store.dispatch('fetchMovieById', this.$route.params.movieId);
+}
+
+export default {
+	components: {
+		Details,
+		Tags,
+		Media,
+		ActorTile,
+		Releases,
+	},
+	data() {
+		return {
+			movie: null,
+		};
+	},
+	mounted,
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+	padding: .5rem 0;
+	margin: 0 0 1rem 0;
+	color: var(--shadow-strong);
+}
+
+.covers {
+	display: inline-block;
+	margin: 0 0 1rem 0;
+}
+
+.cover {
+	height: 20rem;
+	margin: 0 1rem 0 0;
+	box-shadow: 0 0 3px var(--shadow-weak);
+}
+
+.trailer {
+	height: 20rem;
+}
+
+.date {
+	display: inline-block;
+	padding: 1rem;
+}
+
+.content-inner {
+	padding: 1rem;
+}
+
+.actors {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+    grid-gap: .5rem;
+    flex-grow: 1;
+    flex-wrap: wrap;
+	margin: 0 0 1rem 0;
+}
+</style>
diff --git a/assets/components/movies/movies.vue b/assets/components/releases/movies.vue
similarity index 72%
rename from assets/components/movies/movies.vue
rename to assets/components/releases/movies.vue
index f9e7b9d47..6beb611c0 100644
--- a/assets/components/movies/movies.vue
+++ b/assets/components/releases/movies.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="movies">
 		<div class="tiles">
-			<Movie
+			<MovieTile
 				v-for="movie in movies"
 				:key="`movie-${movie.id}`"
 				:movie="movie"
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import Movie from './tile.vue';
+import MovieTile from './movie-tile.vue';
 
 async function mounted() {
 	const { movies, totalCount } = await this.$store.dispatch('fetchMovies', {
@@ -24,7 +24,7 @@ async function mounted() {
 
 export default {
 	components: {
-		Movie,
+		MovieTile,
 	},
 	data() {
 		return {
@@ -36,7 +36,9 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+@import 'breakpoints';
+
 .movies {
     padding: 1rem;
 }
@@ -46,4 +48,10 @@ export default {
 	grid-template-columns: repeat(auto-fill, minmax(25rem, 1fr));
 	grid-gap: 1rem;
 }
+
+@media(max-width: $breakpoint) {
+	.tiles {
+		grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
+	}
+}
 </style>
diff --git a/assets/components/releases/releases.vue b/assets/components/releases/releases.vue
index fadc47a59..e5483493b 100644
--- a/assets/components/releases/releases.vue
+++ b/assets/components/releases/releases.vue
@@ -15,7 +15,7 @@
 				v-for="(release, index) in releases"
 				:key="`release-${release.id}`"
 			>
-				<ReleaseTile
+				<SceneTile
 					:release="release"
 					:referer="referer"
 					:index="index"
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import ReleaseTile from './tile.vue';
+import SceneTile from './scene-tile.vue';
 
 function range() {
 	return this.$route.params.range;
@@ -48,7 +48,7 @@ function sfw() {
 
 export default {
 	components: {
-		ReleaseTile,
+		SceneTile,
 	},
 	props: {
 		releases: {
diff --git a/assets/components/releases/tile.vue b/assets/components/releases/scene-tile.vue
similarity index 100%
rename from assets/components/releases/tile.vue
rename to assets/components/releases/scene-tile.vue
diff --git a/assets/components/releases/release.vue b/assets/components/releases/scene.vue
similarity index 53%
rename from assets/components/releases/release.vue
rename to assets/components/releases/scene.vue
index f3fa7db47..f76810021 100644
--- a/assets/components/releases/release.vue
+++ b/assets/components/releases/scene.vue
@@ -20,91 +20,7 @@
 			/>
 		</Scroll>
 
-		<div class="details">
-			<div class="column">
-				<div class="tidbits">
-					<a
-						v-if="release.date"
-						:title="release.url && `View scene on ${release.entity.name}`"
-						:href="release.url"
-						:class="{ link: release.url }"
-						target="_blank"
-						rel="noopener noreferrer"
-						class="tidbit date"
-					>
-						<span class="showable">{{ formatDate(release.date, 'MMM D, YYYY', release.datePrecision) }}</span>
-						<span class="hideable">{{ formatDate(release.date, 'MMMM D, YYYY', release.datePrecision) }}</span>
-
-						<Icon
-							v-if="release.url"
-							icon="share2"
-						/>
-					</a>
-				</div>
-
-				<div class="site">
-					<template v-if="release.entity.parent && !release.entity.independent">
-						<a
-							v-if="release.entity.parent.hasLogo"
-							:href="`/network/${release.entity.parent.slug}`"
-							class="logo-link"
-						>
-							<img
-								:src="`/img/logos/${release.entity.parent.slug}/thumbs/network.png`"
-								:title="release.entity.parent.name"
-								:alt="release.entity.parent.name"
-								class="logo logo-parent"
-							>
-						</a>
-
-						<a
-							v-else
-							:href="`/network/${release.entity.parent.slug}`"
-							class="logo-link logo-name"
-						>{{ release.entity.parent.name }}</a>
-
-						<span class="chain">presents</span>
-
-						<a
-							v-if="release.entity.hasLogo"
-							:href="`/${release.entity.type}/${release.entity.slug}`"
-							class="logo-link"
-						>
-							<img
-								v-if="release.entity.type === 'network'"
-								:src="`/img/logos/${release.entity.slug}/thumbs/network.png`"
-								:title="release.entity.name"
-								class="logo logo-site"
-							>
-
-							<img
-								v-else
-								:src="`/img/logos/${release.entity.parent.slug}/thumbs/${release.entity.slug}.png`"
-								:title="release.entity.name"
-								class="logo logo-site"
-							>
-						</a>
-
-						<a
-							v-else
-							:href="`/${release.entity.type}/${release.entity.slug}`"
-							class="logo-link logo-name"
-						>{{ release.entity.name }}</a>
-					</template>
-
-					<a
-						v-else
-						:href="`/${release.entity.type}/${release.entity.slug}`"
-					>
-						<img
-							:src="`/img/logos/${release.entity.slug}/thumbs/network.png`"
-							:title="release.entity.name"
-							class="logo logo-site"
-						>
-					</a>
-				</div>
-			</div>
-		</div>
+		<Details :release="release" />
 
 		<Expand
 			v-if="release.photos.length > 0"
@@ -136,18 +52,7 @@
 				v-if="release.tags.length > 0"
 				class="row"
 			>
-				<ul class="tags nolist">
-					<li
-						v-for="tag in release.tags"
-						:key="`tag-${tag.slug}`"
-						class="tag"
-					>
-						<a
-							:href="`/tag/${tag.slug}`"
-							class="link"
-						>{{ tag.name }}</a>
-					</li>
-				</ul>
+				<Tags :tags="release.tags" />
 			</div>
 
 			<div class="row associations">
@@ -162,24 +67,28 @@
 						<Actor :actor="actor" />
 					</li>
 				</ul>
-
-				<div
-					v-if="release.movies && release.movies.length > 0"
-					class="movies"
-				>
-					<Release :release="release.movies[0]" />
-				</div>
 			</div>
 
 			<div
-				v-if="release.scenes && release.scenes.length > 0"
-				class="scenes"
+				v-if="release.movies && release.movies.length > 0"
+				class="row"
 			>
-				<h3>Scenes</h3>
-				<Releases
-					:releases="release.scenes"
-					class="row"
-				/>
+				<span class="row-label">Part of</span>
+
+				<div class="movies">
+					<router-link
+						v-for="movie in release.movies"
+						:key="`movie-${movie.id}`"
+						:to="{ name: 'movie', params: { movieId: movie.id, movieSlug: movie.slug } }"
+						class="movie"
+					>
+						<span class="movie-title">{{ movie.title }}</span>
+						<img
+							:src="`/media/${movie.covers[0].thumbnail}`"
+							class="movie-cover"
+						>
+					</router-link>
+				</div>
 			</div>
 
 			<div
@@ -259,9 +168,9 @@
 
 <script>
 import Media from './media.vue';
+import Details from './details.vue';
+import Tags from './tags.vue';
 import Actor from '../actors/tile.vue';
-import Release from './tile.vue';
-import Releases from './releases.vue';
 import Scroll from '../scroll/scroll.vue';
 import Expand from '../expand/expand.vue';
 
@@ -278,11 +187,11 @@ async function mounted() {
 export default {
 	components: {
 		Actor,
+		Details,
 		Media,
-		Release,
-		Releases,
 		Scroll,
 		Expand,
+		Tags,
 	},
 	data() {
 		return {
@@ -298,112 +207,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import 'theme';
-.column {
-    width: 1200px;
-    max-width: 100%;
-    padding: 0 1rem;
-    margin: 0 auto;
-    box-sizing: border-box;
-}
-
-.details {
-    background: var(--profile);
-    color: var(--text-light);
-    box-shadow: 0 0 3px var(--shadow-weak);
-    cursor: default;
-
-    .column {
-		height: 100%;
-        display: flex;
-		justify-content: space-between;
-        align-items: center;
-        padding: 0 1rem;
-    }
-
-    .link {
-        color: var(--text-light);
-
-		.icon {
-			fill: var(--lighten);
-		}
-
-		&:hover {
-			color: var(--text-light);
-
-			.icon {
-				fill: var(--text-light);
-			}
-		}
-    }
-}
-
-.tidbits {
-	flex-shrink: 0;
-	height: 100%;
-}
-
-.tidbit {
-    display: inline-flex;
-	align-items: center;
-    height: 100%;
-
-	&.date {
-        flex-shrink: 0;
-        padding: 0 2rem 0 0;
-		font-weight: bold;
-
-		.icon {
-			fill: var(--lighten);
-			margin: -.2rem 0 0 .75rem;
-		}
-    }
-}
-
-.site {
-    display: inline-flex;
-    align-items: center;
-    padding: .25rem 0;
-    font-size: 0;
-}
-
-.logo {
-    display: inline-block;
-}
-
-.logo-link {
-	text-decoration: none;
-}
-
-.logo-site {
-    height: 2.5rem;
-    max-width: 15rem;
-	margin: .25rem 0;
-    object-fit: contain;
-    object-position: 100% 50%;
-}
-
-.logo-parent {
-    height: 1.5rem;
-    max-width: 10rem;
-    object-fit: contain;
-    object-position: 100% 50%;
-}
-
-.logo-name {
-	padding: .5rem 0;
-	color: var(--text-light);
-	font-size: 1.25rem;
-	font-weight: bold;
-}
-
-.chain {
-    color: var(--lighten);
-    padding: 0 .5rem;
-    font-weight: bold;
-    font-size: .8rem;
-}
-
+@import 'breakpoints';
 .expand-bottom {
 	border-bottom: solid 1px var(--shadow-hint);
 }
@@ -487,6 +291,39 @@ export default {
     flex-wrap: wrap;
 }
 
+.movies {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
+    grid-gap: .5rem;
+    flex-grow: 1;
+    flex-wrap: wrap;
+}
+
+.movie {
+	display: flex;
+	flex-direction: column;
+	background: var(--background);
+	box-shadow: 0 0 3px var(--shadow-weak);
+	color: var(--text);
+	text-decoration: none;
+
+	&:hover .movie-title {
+		color: var(--primary);
+	}
+}
+
+.movie-cover {
+	width: 100%;
+}
+
+.movie-title {
+	padding: .5rem;
+	font-weight: bold;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .link {
     display: inline-flex;
     color: var(--link);
@@ -501,35 +338,10 @@ export default {
     }
 }
 
-.tag .link {
-    background: var(--background);
-    display: inline-block;
-    padding: .5rem;
-    margin: 0 .25rem .25rem 0;
-    box-shadow: 0 0 2px var(--shadow-weak);
-    text-decoration: none;
-    text-transform: capitalize;
-
-    &:hover {
-        color: var(--primary);
-    }
-}
-
 .showable {
     display: none;
 }
 
-@media(max-width: $breakpoint3) {
-    .logo-parent,
-    .chain {
-        display: none;
-    }
-
-	.logo-site {
-		width: 100%;
-	}
-}
-
 @media(max-width: $breakpoint) {
     .hideable {
         display: none;
diff --git a/assets/components/releases/tags.vue b/assets/components/releases/tags.vue
new file mode 100644
index 000000000..ef99b4d40
--- /dev/null
+++ b/assets/components/releases/tags.vue
@@ -0,0 +1,42 @@
+<template>
+	<ul class="tags nolist">
+		<li
+			v-for="tag in tags"
+			:key="`tag-${tag.slug}`"
+			class="tag"
+		>
+			<a
+				:href="`/tag/${tag.slug}`"
+				class="link"
+			>{{ tag.name }}</a>
+		</li>
+	</ul>
+</template>
+
+<script>
+export default {
+	props: {
+		tags: {
+			type: Array,
+			default: () => [],
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.tag .link {
+	color: var(--link);
+    background: var(--background);
+    display: inline-block;
+    padding: .5rem;
+    margin: 0 .25rem .25rem 0;
+    box-shadow: 0 0 2px var(--shadow-weak);
+    text-decoration: none;
+    text-transform: capitalize;
+
+    &:hover {
+        color: var(--primary);
+    }
+}
+</style>
diff --git a/assets/components/releases/tile-details.vue b/assets/components/releases/tile-details.vue
index 7a2bfa2d7..d0a7bf58d 100644
--- a/assets/components/releases/tile-details.vue
+++ b/assets/components/releases/tile-details.vue
@@ -36,8 +36,8 @@
 
 		<a
 			v-if="release.date"
-			v-tooltip.bottom="release.url && `View scene on ${release.entity.name}`"
-			:title="release.url && `View scene on ${release.entity.name}`"
+			v-tooltip.bottom="release.url && `View release on ${release.entity.name}`"
+			:title="release.url && `View release on ${release.entity.name}`"
 			:href="release.url"
 			:class="{ upcoming: isAfter(release.date, new Date()) }"
 			target="_blank"
diff --git a/assets/css/_states.scss b/assets/css/_states.scss
index 2d2e35eb8..33a290fe4 100644
--- a/assets/css/_states.scss
+++ b/assets/css/_states.scss
@@ -18,6 +18,12 @@
     }
 }
 
+.nolink {
+	display: inline-block;
+	color: inherit;
+	text-decoration: none;
+}
+
 :focus {
     outline: none;
 }
diff --git a/assets/js/fragments.js b/assets/js/fragments.js
index 024d41df5..f1745723e 100644
--- a/assets/js/fragments.js
+++ b/assets/js/fragments.js
@@ -93,6 +93,7 @@ const releaseTagsFragment = `
 const releasePosterFragment = `
     poster: releasesPosterByReleaseId {
         media {
+			id
             index
             path
             thumbnail
@@ -112,6 +113,7 @@ const releasePosterFragment = `
 const releaseCoversFragment = `
     covers: releasesCovers {
         media {
+			id
             index
             path
             thumbnail
@@ -131,6 +133,7 @@ const releaseCoversFragment = `
 const releasePhotosFragment = `
     photos: releasesPhotos {
         media {
+			id
             index
             path
             thumbnail
@@ -150,6 +153,7 @@ const releasePhotosFragment = `
 const releaseTrailerFragment = `
     trailer: releasesTrailerByReleaseId {
         media {
+			id
             index
             path
             thumbnail
@@ -249,6 +253,29 @@ const releaseFragment = `
         slug
         url
     }
+	movies: moviesScenesBySceneId {
+	    movie {
+			id
+			title
+			slug
+			covers: moviesCoversByReleaseId {
+				media {
+					index
+					path
+					thumbnail
+					lazy
+					comment
+					sfw: sfwMedia {
+						id
+						thumbnail
+						lazy
+						path
+						comment
+					}
+				}
+			}
+		}
+	}
   }
 `;
 
diff --git a/assets/js/releases/actions.js b/assets/js/releases/actions.js
index a24b2a7db..59319cf30 100644
--- a/assets/js/releases/actions.js
+++ b/assets/js/releases/actions.js
@@ -1,5 +1,5 @@
 import { graphql } from '../api';
-import { releasesFragment, releaseFragment } from '../fragments';
+import { releasesFragment, releaseFragment, releaseFields } from '../fragments';
 import { curateRelease } from '../curate';
 import getDateRange from '../get-date-range';
 
@@ -56,7 +56,7 @@ function initReleasesActions(store, _router) {
 				connection: moviesConnection(
 					first: $limit
 					offset: $offset
-					orderBy: DATE_ASC
+					orderBy: DATE_DESC
 				) {
 					movies: nodes {
 						id
@@ -109,10 +109,83 @@ function initReleasesActions(store, _router) {
 		};
 	}
 
+	async function fetchMovieById({ _commit }, movieId) {
+		// const release = await get(`/releases/${releaseId}`);
+
+		const { movie } = await graphql(`
+			query Movie($movieId: Int!) {
+				movie(id: $movieId) {
+					id
+					title
+					slug
+					url
+					date
+					actors {
+						id
+						name
+						age
+						dateOfBirth
+						birthCountry: countryByBirthCountryAlpha2 {
+						  alpha2
+						  name
+						  alias
+						}
+						avatar: avatarMedia {
+							id
+							path
+							thumbnail
+							lazy
+						}
+					}
+					covers: moviesCoversByReleaseId {
+						media {
+							id
+							path
+							thumbnail
+						}
+					}
+					trailer: moviesTrailerByReleaseId {
+						media {
+							id
+							path
+						}
+					}
+					scenes: moviesScenes {
+						scene {
+							${releaseFields}
+						}
+					}
+					tags {
+						id
+						slug
+						name
+					}
+					entity {
+						id
+						name
+						slug
+						type
+						parent {
+							id
+							name
+							slug
+							type
+						}
+					}
+				}
+			}
+		`, {
+			movieId: Number(movieId),
+		});
+
+		return curateRelease(movie);
+	}
+
 	return {
 		fetchReleases,
 		fetchReleaseById,
 		fetchMovies,
+		fetchMovieById,
 	};
 }
 
diff --git a/assets/js/router.js b/assets/js/router.js
index 6303a1956..6bbbb6c0f 100644
--- a/assets/js/router.js
+++ b/assets/js/router.js
@@ -2,12 +2,13 @@ import Vue from 'vue';
 import VueRouter from 'vue-router';
 
 import Home from '../components/home/home.vue';
-import Release from '../components/releases/release.vue';
+import Scene from '../components/releases/scene.vue';
+import Movie from '../components/releases/movie.vue';
 import Entity from '../components/entities/entity.vue';
 import Networks from '../components/networks/networks.vue';
 import Actor from '../components/actors/actor.vue';
 import Actors from '../components/actors/actors.vue';
-import Movies from '../components/movies/movies.vue';
+import Movies from '../components/releases/movies.vue';
 import Tag from '../components/tags/tag.vue';
 import Tags from '../components/tags/tags.vue';
 import Search from '../components/search/search.vue';
@@ -44,12 +45,12 @@ const routes = [
 	},
 	{
 		path: '/scene/:releaseId/:releaseSlug?',
-		component: Release,
+		component: Scene,
 		name: 'scene',
 	},
 	{
 		path: '/movie/:movieId/:movieSlug?',
-		component: Release,
+		component: Movie,
 		name: 'movie',
 	},
 	{
diff --git a/public/img/logos/kink/boundgangbangs.png b/public/img/logos/kink/boundgangbangs.png
index db7ef0524..b3aea9fe0 100644
Binary files a/public/img/logos/kink/boundgangbangs.png and b/public/img/logos/kink/boundgangbangs.png differ
diff --git a/public/img/logos/kink/boundgods.png b/public/img/logos/kink/boundgods.png
index ffec458b2..90f17c97d 100644
Binary files a/public/img/logos/kink/boundgods.png and b/public/img/logos/kink/boundgods.png differ
diff --git a/public/img/logos/kink/boundinpublic.png b/public/img/logos/kink/boundinpublic.png
index 0e8d48e66..802fc2cab 100644
Binary files a/public/img/logos/kink/boundinpublic.png and b/public/img/logos/kink/boundinpublic.png differ
diff --git a/public/img/logos/kink/brutalsessions.png b/public/img/logos/kink/brutalsessions.png
index 70047088f..45de9055d 100644
Binary files a/public/img/logos/kink/brutalsessions.png and b/public/img/logos/kink/brutalsessions.png differ
diff --git a/public/img/logos/kink/buttmachineboys.png b/public/img/logos/kink/buttmachineboys.png
index ddb760980..8e1a4eca2 100644
Binary files a/public/img/logos/kink/buttmachineboys.png and b/public/img/logos/kink/buttmachineboys.png differ
diff --git a/public/img/logos/kink/devicebondage.png b/public/img/logos/kink/devicebondage.png
index b4c5f5cd5..a6768272a 100644
Binary files a/public/img/logos/kink/devicebondage.png and b/public/img/logos/kink/devicebondage.png differ
diff --git a/public/img/logos/kink/divinebitches.png b/public/img/logos/kink/divinebitches.png
index d4f86c086..daa3e51af 100644
Binary files a/public/img/logos/kink/divinebitches.png and b/public/img/logos/kink/divinebitches.png differ
diff --git a/public/img/logos/kink/electrosluts.png b/public/img/logos/kink/electrosluts.png
index 4ec701ba1..3c2e7b300 100644
Binary files a/public/img/logos/kink/electrosluts.png and b/public/img/logos/kink/electrosluts.png differ
diff --git a/public/img/logos/kink/everythingbutt.png b/public/img/logos/kink/everythingbutt.png
index b87a5b024..271eaede0 100644
Binary files a/public/img/logos/kink/everythingbutt.png and b/public/img/logos/kink/everythingbutt.png differ
diff --git a/public/img/logos/kink/familiestied.png b/public/img/logos/kink/familiestied.png
index fe7b515b2..1f6842d50 100644
Binary files a/public/img/logos/kink/familiestied.png and b/public/img/logos/kink/familiestied.png differ
diff --git a/public/img/logos/kink/favicon.png b/public/img/logos/kink/favicon.png
index 568c3e75f..2aa31f4b8 100644
Binary files a/public/img/logos/kink/favicon.png and b/public/img/logos/kink/favicon.png differ
diff --git a/public/img/logos/kink/filthyfemdom.png b/public/img/logos/kink/filthyfemdom.png
index e6e8a5f99..c78acc1ea 100644
Binary files a/public/img/logos/kink/filthyfemdom.png and b/public/img/logos/kink/filthyfemdom.png differ
diff --git a/public/img/logos/kink/footworship.png b/public/img/logos/kink/footworship.png
index 01311edad..d81d426ab 100644
Binary files a/public/img/logos/kink/footworship.png and b/public/img/logos/kink/footworship.png differ
diff --git a/public/img/logos/kink/fuckedandbound.png b/public/img/logos/kink/fuckedandbound.png
index 08f70124b..64cb333c1 100644
Binary files a/public/img/logos/kink/fuckedandbound.png and b/public/img/logos/kink/fuckedandbound.png differ
diff --git a/public/img/logos/kink/fuckingmachines.png b/public/img/logos/kink/fuckingmachines.png
index f26ac6968..56e7583f2 100644
Binary files a/public/img/logos/kink/fuckingmachines.png and b/public/img/logos/kink/fuckingmachines.png differ
diff --git a/public/img/logos/kink/hardcoregangbang.png b/public/img/logos/kink/hardcoregangbang.png
index 6df6bef25..6c569f3dc 100644
Binary files a/public/img/logos/kink/hardcoregangbang.png and b/public/img/logos/kink/hardcoregangbang.png differ
diff --git a/public/img/logos/kink/hogtied.png b/public/img/logos/kink/hogtied.png
index 0bca5064f..4bb3bed02 100644
Binary files a/public/img/logos/kink/hogtied.png and b/public/img/logos/kink/hogtied.png differ
diff --git a/public/img/logos/kink/kink-dvd.png b/public/img/logos/kink/kink-dvd.png
index 9056370f3..e628b7936 100644
Binary files a/public/img/logos/kink/kink-dvd.png and b/public/img/logos/kink/kink-dvd.png differ
diff --git a/public/img/logos/kink/kinkclassics.png b/public/img/logos/kink/kinkclassics.png
new file mode 100644
index 000000000..c56e333cd
Binary files /dev/null and b/public/img/logos/kink/kinkclassics.png differ
diff --git a/public/img/logos/kink/kinkfeatures.png b/public/img/logos/kink/kinkfeatures.png
index 56891e1ec..d2d0fe3f4 100644
Binary files a/public/img/logos/kink/kinkfeatures.png and b/public/img/logos/kink/kinkfeatures.png differ
diff --git a/public/img/logos/kink/kinkuniversity.png b/public/img/logos/kink/kinkuniversity.png
index 6bcbe8906..b08eaf30d 100644
Binary files a/public/img/logos/kink/kinkuniversity.png and b/public/img/logos/kink/kinkuniversity.png differ
diff --git a/public/img/logos/kink/kinkybites.png b/public/img/logos/kink/kinkybites.png
index da521f0dc..227c362b8 100644
Binary files a/public/img/logos/kink/kinkybites.png and b/public/img/logos/kink/kinkybites.png differ
diff --git a/public/img/logos/kink/lazy/boundgangbangs.png b/public/img/logos/kink/lazy/boundgangbangs.png
index 5ef8978f5..0b6cc0e84 100644
Binary files a/public/img/logos/kink/lazy/boundgangbangs.png and b/public/img/logos/kink/lazy/boundgangbangs.png differ
diff --git a/public/img/logos/kink/lazy/boundgods.png b/public/img/logos/kink/lazy/boundgods.png
index 8716cf561..99d8b7a9b 100644
Binary files a/public/img/logos/kink/lazy/boundgods.png and b/public/img/logos/kink/lazy/boundgods.png differ
diff --git a/public/img/logos/kink/lazy/boundinpublic.png b/public/img/logos/kink/lazy/boundinpublic.png
index 649b64ec2..6241acf9a 100644
Binary files a/public/img/logos/kink/lazy/boundinpublic.png and b/public/img/logos/kink/lazy/boundinpublic.png differ
diff --git a/public/img/logos/kink/lazy/brutalsessions.png b/public/img/logos/kink/lazy/brutalsessions.png
index 29ace602d..e37966a10 100644
Binary files a/public/img/logos/kink/lazy/brutalsessions.png and b/public/img/logos/kink/lazy/brutalsessions.png differ
diff --git a/public/img/logos/kink/lazy/buttmachineboys.png b/public/img/logos/kink/lazy/buttmachineboys.png
index c2876ae01..b4e3ee37c 100644
Binary files a/public/img/logos/kink/lazy/buttmachineboys.png and b/public/img/logos/kink/lazy/buttmachineboys.png differ
diff --git a/public/img/logos/kink/lazy/devicebondage.png b/public/img/logos/kink/lazy/devicebondage.png
index 4504fb58a..7a3eb7ef7 100644
Binary files a/public/img/logos/kink/lazy/devicebondage.png and b/public/img/logos/kink/lazy/devicebondage.png differ
diff --git a/public/img/logos/kink/lazy/divinebitches.png b/public/img/logos/kink/lazy/divinebitches.png
index e1d72d624..b06a0289f 100644
Binary files a/public/img/logos/kink/lazy/divinebitches.png and b/public/img/logos/kink/lazy/divinebitches.png differ
diff --git a/public/img/logos/kink/lazy/electrosluts.png b/public/img/logos/kink/lazy/electrosluts.png
index 6d6661b9b..aa8829f4e 100644
Binary files a/public/img/logos/kink/lazy/electrosluts.png and b/public/img/logos/kink/lazy/electrosluts.png differ
diff --git a/public/img/logos/kink/lazy/everythingbutt.png b/public/img/logos/kink/lazy/everythingbutt.png
index c10f4b67f..106c6211c 100644
Binary files a/public/img/logos/kink/lazy/everythingbutt.png and b/public/img/logos/kink/lazy/everythingbutt.png differ
diff --git a/public/img/logos/kink/lazy/familiestied.png b/public/img/logos/kink/lazy/familiestied.png
index e61af5318..6d8dcb38b 100644
Binary files a/public/img/logos/kink/lazy/familiestied.png and b/public/img/logos/kink/lazy/familiestied.png differ
diff --git a/public/img/logos/kink/lazy/favicon.png b/public/img/logos/kink/lazy/favicon.png
index ac3c717c4..7d9c4fb05 100644
Binary files a/public/img/logos/kink/lazy/favicon.png and b/public/img/logos/kink/lazy/favicon.png differ
diff --git a/public/img/logos/kink/lazy/filthyfemdom.png b/public/img/logos/kink/lazy/filthyfemdom.png
index e27c66245..175117fe0 100644
Binary files a/public/img/logos/kink/lazy/filthyfemdom.png and b/public/img/logos/kink/lazy/filthyfemdom.png differ
diff --git a/public/img/logos/kink/lazy/footworship.png b/public/img/logos/kink/lazy/footworship.png
index c57f41d5b..6fa4ebe93 100644
Binary files a/public/img/logos/kink/lazy/footworship.png and b/public/img/logos/kink/lazy/footworship.png differ
diff --git a/public/img/logos/kink/lazy/fuckedandbound.png b/public/img/logos/kink/lazy/fuckedandbound.png
index 840d0b86f..d4552db7e 100644
Binary files a/public/img/logos/kink/lazy/fuckedandbound.png and b/public/img/logos/kink/lazy/fuckedandbound.png differ
diff --git a/public/img/logos/kink/lazy/fuckingmachines.png b/public/img/logos/kink/lazy/fuckingmachines.png
index bf0e673f6..3d9fcb292 100644
Binary files a/public/img/logos/kink/lazy/fuckingmachines.png and b/public/img/logos/kink/lazy/fuckingmachines.png differ
diff --git a/public/img/logos/kink/lazy/hardcoregangbang.png b/public/img/logos/kink/lazy/hardcoregangbang.png
index 6b6de0a71..2fa9004fe 100644
Binary files a/public/img/logos/kink/lazy/hardcoregangbang.png and b/public/img/logos/kink/lazy/hardcoregangbang.png differ
diff --git a/public/img/logos/kink/lazy/hogtied.png b/public/img/logos/kink/lazy/hogtied.png
index 99b4e38de..d07908dc4 100644
Binary files a/public/img/logos/kink/lazy/hogtied.png and b/public/img/logos/kink/lazy/hogtied.png differ
diff --git a/public/img/logos/kink/lazy/kink-dvd.png b/public/img/logos/kink/lazy/kink-dvd.png
index 63f797f2a..4321fb12c 100644
Binary files a/public/img/logos/kink/lazy/kink-dvd.png and b/public/img/logos/kink/lazy/kink-dvd.png differ
diff --git a/public/img/logos/kink/lazy/kinkclassics.png b/public/img/logos/kink/lazy/kinkclassics.png
new file mode 100644
index 000000000..5464d92d6
Binary files /dev/null and b/public/img/logos/kink/lazy/kinkclassics.png differ
diff --git a/public/img/logos/kink/lazy/kinkfeatures.png b/public/img/logos/kink/lazy/kinkfeatures.png
index a53f9523a..3939f1806 100644
Binary files a/public/img/logos/kink/lazy/kinkfeatures.png and b/public/img/logos/kink/lazy/kinkfeatures.png differ
diff --git a/public/img/logos/kink/lazy/kinkuniversity.png b/public/img/logos/kink/lazy/kinkuniversity.png
index 9ab07c378..699ee2505 100644
Binary files a/public/img/logos/kink/lazy/kinkuniversity.png and b/public/img/logos/kink/lazy/kinkuniversity.png differ
diff --git a/public/img/logos/kink/lazy/kinkybites.png b/public/img/logos/kink/lazy/kinkybites.png
index bdad49fc7..45449b33f 100644
Binary files a/public/img/logos/kink/lazy/kinkybites.png and b/public/img/logos/kink/lazy/kinkybites.png differ
diff --git a/public/img/logos/kink/lazy/meninpain.png b/public/img/logos/kink/lazy/meninpain.png
index 6dc7ecbaa..680fd5402 100644
Binary files a/public/img/logos/kink/lazy/meninpain.png and b/public/img/logos/kink/lazy/meninpain.png differ
diff --git a/public/img/logos/kink/lazy/menonedge.png b/public/img/logos/kink/lazy/menonedge.png
index 287afc51e..ca328be1f 100644
Binary files a/public/img/logos/kink/lazy/menonedge.png and b/public/img/logos/kink/lazy/menonedge.png differ
diff --git a/public/img/logos/kink/lazy/nakedkombat.png b/public/img/logos/kink/lazy/nakedkombat.png
index 491125136..596c50ada 100644
Binary files a/public/img/logos/kink/lazy/nakedkombat.png and b/public/img/logos/kink/lazy/nakedkombat.png differ
diff --git a/public/img/logos/kink/lazy/network.png b/public/img/logos/kink/lazy/network.png
index b79308e6f..295e1dcd2 100644
Binary files a/public/img/logos/kink/lazy/network.png and b/public/img/logos/kink/lazy/network.png differ
diff --git a/public/img/logos/kink/lazy/publicdisgrace.png b/public/img/logos/kink/lazy/publicdisgrace.png
index 60083195f..1ea2af247 100644
Binary files a/public/img/logos/kink/lazy/publicdisgrace.png and b/public/img/logos/kink/lazy/publicdisgrace.png differ
diff --git a/public/img/logos/kink/lazy/sadisticrope.png b/public/img/logos/kink/lazy/sadisticrope.png
index a2fb3cfc6..87c4a0ddd 100644
Binary files a/public/img/logos/kink/lazy/sadisticrope.png and b/public/img/logos/kink/lazy/sadisticrope.png differ
diff --git a/public/img/logos/kink/lazy/sexandsubmission.png b/public/img/logos/kink/lazy/sexandsubmission.png
index b1de1f260..4bdc9e568 100644
Binary files a/public/img/logos/kink/lazy/sexandsubmission.png and b/public/img/logos/kink/lazy/sexandsubmission.png differ
diff --git a/public/img/logos/kink/lazy/strugglingbabes.png b/public/img/logos/kink/lazy/strugglingbabes.png
index c0ff4035c..5488ee2e9 100644
Binary files a/public/img/logos/kink/lazy/strugglingbabes.png and b/public/img/logos/kink/lazy/strugglingbabes.png differ
diff --git a/public/img/logos/kink/lazy/thetrainingofo.png b/public/img/logos/kink/lazy/thetrainingofo.png
index ac61cc759..ead030bca 100644
Binary files a/public/img/logos/kink/lazy/thetrainingofo.png and b/public/img/logos/kink/lazy/thetrainingofo.png differ
diff --git a/public/img/logos/kink/lazy/theupperfloor.png b/public/img/logos/kink/lazy/theupperfloor.png
index 24813a449..289b0a9c4 100644
Binary files a/public/img/logos/kink/lazy/theupperfloor.png and b/public/img/logos/kink/lazy/theupperfloor.png differ
diff --git a/public/img/logos/kink/lazy/thirtyminutesoftorment.png b/public/img/logos/kink/lazy/thirtyminutesoftorment.png
index 0532d6980..f785a35c6 100644
Binary files a/public/img/logos/kink/lazy/thirtyminutesoftorment.png and b/public/img/logos/kink/lazy/thirtyminutesoftorment.png differ
diff --git a/public/img/logos/kink/lazy/tspussyhunters.png b/public/img/logos/kink/lazy/tspussyhunters.png
index 0abdc7388..2c2430e0a 100644
Binary files a/public/img/logos/kink/lazy/tspussyhunters.png and b/public/img/logos/kink/lazy/tspussyhunters.png differ
diff --git a/public/img/logos/kink/lazy/tsseduction.png b/public/img/logos/kink/lazy/tsseduction.png
index 4f26a0872..ce5294749 100644
Binary files a/public/img/logos/kink/lazy/tsseduction.png and b/public/img/logos/kink/lazy/tsseduction.png differ
diff --git a/public/img/logos/kink/lazy/ultimatesurrender.png b/public/img/logos/kink/lazy/ultimatesurrender.png
index 5d4a66022..32a635bae 100644
Binary files a/public/img/logos/kink/lazy/ultimatesurrender.png and b/public/img/logos/kink/lazy/ultimatesurrender.png differ
diff --git a/public/img/logos/kink/lazy/waterbondage.png b/public/img/logos/kink/lazy/waterbondage.png
index a31423214..2dc012c0a 100644
Binary files a/public/img/logos/kink/lazy/waterbondage.png and b/public/img/logos/kink/lazy/waterbondage.png differ
diff --git a/public/img/logos/kink/lazy/whippedass.png b/public/img/logos/kink/lazy/whippedass.png
index e6c19c48e..8d557f3fc 100644
Binary files a/public/img/logos/kink/lazy/whippedass.png and b/public/img/logos/kink/lazy/whippedass.png differ
diff --git a/public/img/logos/kink/lazy/wiredpussy.png b/public/img/logos/kink/lazy/wiredpussy.png
index 07e5cca4c..5becb9917 100644
Binary files a/public/img/logos/kink/lazy/wiredpussy.png and b/public/img/logos/kink/lazy/wiredpussy.png differ
diff --git a/public/img/logos/kink/meninpain.png b/public/img/logos/kink/meninpain.png
index cb47dc3ff..40ca8c483 100644
Binary files a/public/img/logos/kink/meninpain.png and b/public/img/logos/kink/meninpain.png differ
diff --git a/public/img/logos/kink/menonedge.png b/public/img/logos/kink/menonedge.png
index df8e3b286..68f887a42 100644
Binary files a/public/img/logos/kink/menonedge.png and b/public/img/logos/kink/menonedge.png differ
diff --git a/public/img/logos/kink/nakedkombat.png b/public/img/logos/kink/nakedkombat.png
index 2ab49f7b1..58e1eeb2c 100644
Binary files a/public/img/logos/kink/nakedkombat.png and b/public/img/logos/kink/nakedkombat.png differ
diff --git a/public/img/logos/kink/network.png b/public/img/logos/kink/network.png
index f3a57d4b6..e2ac5b3aa 100644
Binary files a/public/img/logos/kink/network.png and b/public/img/logos/kink/network.png differ
diff --git a/public/img/logos/kink/publicdisgrace.png b/public/img/logos/kink/publicdisgrace.png
index 04e31e641..64308595e 100644
Binary files a/public/img/logos/kink/publicdisgrace.png and b/public/img/logos/kink/publicdisgrace.png differ
diff --git a/public/img/logos/kink/sadisticrope.png b/public/img/logos/kink/sadisticrope.png
index 7d716b326..74a63f95f 100644
Binary files a/public/img/logos/kink/sadisticrope.png and b/public/img/logos/kink/sadisticrope.png differ
diff --git a/public/img/logos/kink/sexandsubmission.png b/public/img/logos/kink/sexandsubmission.png
index d771b9f9a..0a168ad28 100644
Binary files a/public/img/logos/kink/sexandsubmission.png and b/public/img/logos/kink/sexandsubmission.png differ
diff --git a/public/img/logos/kink/strugglingbabes.png b/public/img/logos/kink/strugglingbabes.png
index 1b01d7388..2c69c65de 100644
Binary files a/public/img/logos/kink/strugglingbabes.png and b/public/img/logos/kink/strugglingbabes.png differ
diff --git a/public/img/logos/kink/thetrainingofo.png b/public/img/logos/kink/thetrainingofo.png
index 5513a21d0..eab0111b1 100644
Binary files a/public/img/logos/kink/thetrainingofo.png and b/public/img/logos/kink/thetrainingofo.png differ
diff --git a/public/img/logos/kink/theupperfloor.png b/public/img/logos/kink/theupperfloor.png
index 50a1866b5..a72946a6b 100644
Binary files a/public/img/logos/kink/theupperfloor.png and b/public/img/logos/kink/theupperfloor.png differ
diff --git a/public/img/logos/kink/thirtyminutesoftorment.png b/public/img/logos/kink/thirtyminutesoftorment.png
index fd4772a02..e5f0a541f 100644
Binary files a/public/img/logos/kink/thirtyminutesoftorment.png and b/public/img/logos/kink/thirtyminutesoftorment.png differ
diff --git a/public/img/logos/kink/thumbs/boundgangbangs.png b/public/img/logos/kink/thumbs/boundgangbangs.png
index f3f45440b..20a0480df 100644
Binary files a/public/img/logos/kink/thumbs/boundgangbangs.png and b/public/img/logos/kink/thumbs/boundgangbangs.png differ
diff --git a/public/img/logos/kink/thumbs/boundgods.png b/public/img/logos/kink/thumbs/boundgods.png
index 78eb20cad..8a024ffc4 100644
Binary files a/public/img/logos/kink/thumbs/boundgods.png and b/public/img/logos/kink/thumbs/boundgods.png differ
diff --git a/public/img/logos/kink/thumbs/boundinpublic.png b/public/img/logos/kink/thumbs/boundinpublic.png
index 54fb6a235..dc6b257a2 100644
Binary files a/public/img/logos/kink/thumbs/boundinpublic.png and b/public/img/logos/kink/thumbs/boundinpublic.png differ
diff --git a/public/img/logos/kink/thumbs/brutalsessions.png b/public/img/logos/kink/thumbs/brutalsessions.png
index 7c9f7f68c..57d3b515e 100644
Binary files a/public/img/logos/kink/thumbs/brutalsessions.png and b/public/img/logos/kink/thumbs/brutalsessions.png differ
diff --git a/public/img/logos/kink/thumbs/buttmachineboys.png b/public/img/logos/kink/thumbs/buttmachineboys.png
index 32289924c..f97d92bc5 100644
Binary files a/public/img/logos/kink/thumbs/buttmachineboys.png and b/public/img/logos/kink/thumbs/buttmachineboys.png differ
diff --git a/public/img/logos/kink/thumbs/devicebondage.png b/public/img/logos/kink/thumbs/devicebondage.png
index a4b910d08..d33b1b538 100644
Binary files a/public/img/logos/kink/thumbs/devicebondage.png and b/public/img/logos/kink/thumbs/devicebondage.png differ
diff --git a/public/img/logos/kink/thumbs/divinebitches.png b/public/img/logos/kink/thumbs/divinebitches.png
index 1f5a917f8..c03caf26f 100644
Binary files a/public/img/logos/kink/thumbs/divinebitches.png and b/public/img/logos/kink/thumbs/divinebitches.png differ
diff --git a/public/img/logos/kink/thumbs/electrosluts.png b/public/img/logos/kink/thumbs/electrosluts.png
index d27be02de..3c561d992 100644
Binary files a/public/img/logos/kink/thumbs/electrosluts.png and b/public/img/logos/kink/thumbs/electrosluts.png differ
diff --git a/public/img/logos/kink/thumbs/everythingbutt.png b/public/img/logos/kink/thumbs/everythingbutt.png
index e0369ae6a..b792c4b98 100644
Binary files a/public/img/logos/kink/thumbs/everythingbutt.png and b/public/img/logos/kink/thumbs/everythingbutt.png differ
diff --git a/public/img/logos/kink/thumbs/familiestied.png b/public/img/logos/kink/thumbs/familiestied.png
index 2ce691eb5..936375f2f 100644
Binary files a/public/img/logos/kink/thumbs/familiestied.png and b/public/img/logos/kink/thumbs/familiestied.png differ
diff --git a/public/img/logos/kink/thumbs/favicon.png b/public/img/logos/kink/thumbs/favicon.png
index ac3c717c4..195a871bc 100644
Binary files a/public/img/logos/kink/thumbs/favicon.png and b/public/img/logos/kink/thumbs/favicon.png differ
diff --git a/public/img/logos/kink/thumbs/filthyfemdom.png b/public/img/logos/kink/thumbs/filthyfemdom.png
index 47d600164..c45428f03 100644
Binary files a/public/img/logos/kink/thumbs/filthyfemdom.png and b/public/img/logos/kink/thumbs/filthyfemdom.png differ
diff --git a/public/img/logos/kink/thumbs/footworship.png b/public/img/logos/kink/thumbs/footworship.png
index c0f47de64..72abfb56c 100644
Binary files a/public/img/logos/kink/thumbs/footworship.png and b/public/img/logos/kink/thumbs/footworship.png differ
diff --git a/public/img/logos/kink/thumbs/fuckedandbound.png b/public/img/logos/kink/thumbs/fuckedandbound.png
index 2a490e911..121770afa 100644
Binary files a/public/img/logos/kink/thumbs/fuckedandbound.png and b/public/img/logos/kink/thumbs/fuckedandbound.png differ
diff --git a/public/img/logos/kink/thumbs/fuckingmachines.png b/public/img/logos/kink/thumbs/fuckingmachines.png
index 96210910a..da064499e 100644
Binary files a/public/img/logos/kink/thumbs/fuckingmachines.png and b/public/img/logos/kink/thumbs/fuckingmachines.png differ
diff --git a/public/img/logos/kink/thumbs/hardcoregangbang.png b/public/img/logos/kink/thumbs/hardcoregangbang.png
index a611b6938..06c1f477c 100644
Binary files a/public/img/logos/kink/thumbs/hardcoregangbang.png and b/public/img/logos/kink/thumbs/hardcoregangbang.png differ
diff --git a/public/img/logos/kink/thumbs/hogtied.png b/public/img/logos/kink/thumbs/hogtied.png
index e63509520..0c0fbece5 100644
Binary files a/public/img/logos/kink/thumbs/hogtied.png and b/public/img/logos/kink/thumbs/hogtied.png differ
diff --git a/public/img/logos/kink/thumbs/kink-dvd.png b/public/img/logos/kink/thumbs/kink-dvd.png
index 33c9465b1..11f0c2556 100644
Binary files a/public/img/logos/kink/thumbs/kink-dvd.png and b/public/img/logos/kink/thumbs/kink-dvd.png differ
diff --git a/public/img/logos/kink/thumbs/kinkclassics.png b/public/img/logos/kink/thumbs/kinkclassics.png
new file mode 100644
index 000000000..85a379b11
Binary files /dev/null and b/public/img/logos/kink/thumbs/kinkclassics.png differ
diff --git a/public/img/logos/kink/thumbs/kinkfeatures.png b/public/img/logos/kink/thumbs/kinkfeatures.png
index b8a174355..66995ce82 100644
Binary files a/public/img/logos/kink/thumbs/kinkfeatures.png and b/public/img/logos/kink/thumbs/kinkfeatures.png differ
diff --git a/public/img/logos/kink/thumbs/kinkuniversity.png b/public/img/logos/kink/thumbs/kinkuniversity.png
index e01f959ce..6f69984ef 100644
Binary files a/public/img/logos/kink/thumbs/kinkuniversity.png and b/public/img/logos/kink/thumbs/kinkuniversity.png differ
diff --git a/public/img/logos/kink/thumbs/kinkybites.png b/public/img/logos/kink/thumbs/kinkybites.png
index 6a1bd51a4..c77a611a1 100644
Binary files a/public/img/logos/kink/thumbs/kinkybites.png and b/public/img/logos/kink/thumbs/kinkybites.png differ
diff --git a/public/img/logos/kink/thumbs/meninpain.png b/public/img/logos/kink/thumbs/meninpain.png
index fbf119a63..199bcc0f1 100644
Binary files a/public/img/logos/kink/thumbs/meninpain.png and b/public/img/logos/kink/thumbs/meninpain.png differ
diff --git a/public/img/logos/kink/thumbs/menonedge.png b/public/img/logos/kink/thumbs/menonedge.png
index 6c09a2701..4c3f425ca 100644
Binary files a/public/img/logos/kink/thumbs/menonedge.png and b/public/img/logos/kink/thumbs/menonedge.png differ
diff --git a/public/img/logos/kink/thumbs/nakedkombat.png b/public/img/logos/kink/thumbs/nakedkombat.png
index add6150ba..e849eb890 100644
Binary files a/public/img/logos/kink/thumbs/nakedkombat.png and b/public/img/logos/kink/thumbs/nakedkombat.png differ
diff --git a/public/img/logos/kink/thumbs/network.png b/public/img/logos/kink/thumbs/network.png
index b95449f94..f0a26c144 100644
Binary files a/public/img/logos/kink/thumbs/network.png and b/public/img/logos/kink/thumbs/network.png differ
diff --git a/public/img/logos/kink/thumbs/publicdisgrace.png b/public/img/logos/kink/thumbs/publicdisgrace.png
index 7efab07b7..c10f69aaf 100644
Binary files a/public/img/logos/kink/thumbs/publicdisgrace.png and b/public/img/logos/kink/thumbs/publicdisgrace.png differ
diff --git a/public/img/logos/kink/thumbs/sadisticrope.png b/public/img/logos/kink/thumbs/sadisticrope.png
index 03e5d5df1..03f0331a8 100644
Binary files a/public/img/logos/kink/thumbs/sadisticrope.png and b/public/img/logos/kink/thumbs/sadisticrope.png differ
diff --git a/public/img/logos/kink/thumbs/sexandsubmission.png b/public/img/logos/kink/thumbs/sexandsubmission.png
index c4096aa02..f980cdf83 100644
Binary files a/public/img/logos/kink/thumbs/sexandsubmission.png and b/public/img/logos/kink/thumbs/sexandsubmission.png differ
diff --git a/public/img/logos/kink/thumbs/strugglingbabes.png b/public/img/logos/kink/thumbs/strugglingbabes.png
index 09a7ab9e8..8815c6a41 100644
Binary files a/public/img/logos/kink/thumbs/strugglingbabes.png and b/public/img/logos/kink/thumbs/strugglingbabes.png differ
diff --git a/public/img/logos/kink/thumbs/thetrainingofo.png b/public/img/logos/kink/thumbs/thetrainingofo.png
index 1aba54262..c3e3b7729 100644
Binary files a/public/img/logos/kink/thumbs/thetrainingofo.png and b/public/img/logos/kink/thumbs/thetrainingofo.png differ
diff --git a/public/img/logos/kink/thumbs/theupperfloor.png b/public/img/logos/kink/thumbs/theupperfloor.png
index 10b3f0d90..6d14442c5 100644
Binary files a/public/img/logos/kink/thumbs/theupperfloor.png and b/public/img/logos/kink/thumbs/theupperfloor.png differ
diff --git a/public/img/logos/kink/thumbs/thirtyminutesoftorment.png b/public/img/logos/kink/thumbs/thirtyminutesoftorment.png
index b59e45522..fd2678cdd 100644
Binary files a/public/img/logos/kink/thumbs/thirtyminutesoftorment.png and b/public/img/logos/kink/thumbs/thirtyminutesoftorment.png differ
diff --git a/public/img/logos/kink/thumbs/tspussyhunters.png b/public/img/logos/kink/thumbs/tspussyhunters.png
index a54bb09c2..9ddedb24c 100644
Binary files a/public/img/logos/kink/thumbs/tspussyhunters.png and b/public/img/logos/kink/thumbs/tspussyhunters.png differ
diff --git a/public/img/logos/kink/thumbs/tsseduction.png b/public/img/logos/kink/thumbs/tsseduction.png
index 17ce567cf..603239ab5 100644
Binary files a/public/img/logos/kink/thumbs/tsseduction.png and b/public/img/logos/kink/thumbs/tsseduction.png differ
diff --git a/public/img/logos/kink/thumbs/ultimatesurrender.png b/public/img/logos/kink/thumbs/ultimatesurrender.png
index cb4e9c084..b00cba955 100644
Binary files a/public/img/logos/kink/thumbs/ultimatesurrender.png and b/public/img/logos/kink/thumbs/ultimatesurrender.png differ
diff --git a/public/img/logos/kink/thumbs/waterbondage.png b/public/img/logos/kink/thumbs/waterbondage.png
index 7197b02b0..a3795b91f 100644
Binary files a/public/img/logos/kink/thumbs/waterbondage.png and b/public/img/logos/kink/thumbs/waterbondage.png differ
diff --git a/public/img/logos/kink/thumbs/whippedass.png b/public/img/logos/kink/thumbs/whippedass.png
index 0938740f8..c8e246e34 100644
Binary files a/public/img/logos/kink/thumbs/whippedass.png and b/public/img/logos/kink/thumbs/whippedass.png differ
diff --git a/public/img/logos/kink/thumbs/wiredpussy.png b/public/img/logos/kink/thumbs/wiredpussy.png
index 5875d715a..096b37ff8 100644
Binary files a/public/img/logos/kink/thumbs/wiredpussy.png and b/public/img/logos/kink/thumbs/wiredpussy.png differ
diff --git a/public/img/logos/kink/tspussyhunters.png b/public/img/logos/kink/tspussyhunters.png
index 94df021cb..ff21cb064 100644
Binary files a/public/img/logos/kink/tspussyhunters.png and b/public/img/logos/kink/tspussyhunters.png differ
diff --git a/public/img/logos/kink/tsseduction.png b/public/img/logos/kink/tsseduction.png
index 3225d485f..0c7d6f764 100644
Binary files a/public/img/logos/kink/tsseduction.png and b/public/img/logos/kink/tsseduction.png differ
diff --git a/public/img/logos/kink/ultimatesurrender.png b/public/img/logos/kink/ultimatesurrender.png
index 2a4f5a8be..180824971 100644
Binary files a/public/img/logos/kink/ultimatesurrender.png and b/public/img/logos/kink/ultimatesurrender.png differ
diff --git a/public/img/logos/kink/waterbondage.png b/public/img/logos/kink/waterbondage.png
index 73d53ab36..8ed412863 100644
Binary files a/public/img/logos/kink/waterbondage.png and b/public/img/logos/kink/waterbondage.png differ
diff --git a/public/img/logos/kink/whippedass.png b/public/img/logos/kink/whippedass.png
index 0e7415128..081c4b760 100644
Binary files a/public/img/logos/kink/whippedass.png and b/public/img/logos/kink/whippedass.png differ
diff --git a/public/img/logos/kink/wiredpussy.png b/public/img/logos/kink/wiredpussy.png
index d27fc6183..42e398b94 100644
Binary files a/public/img/logos/kink/wiredpussy.png and b/public/img/logos/kink/wiredpussy.png differ
diff --git a/seeds/00_tags.js b/seeds/00_tags.js
index 534b20a70..68a81d30b 100644
--- a/seeds/00_tags.js
+++ b/seeds/00_tags.js
@@ -1013,6 +1013,11 @@ const aliases = [
 		name: 'ass to other mouth',
 		for: 'atom',
 	},
+	{
+		name: 'atm',
+		for: 'atm',
+		secondary: true,
+	},
 	{
 		name: 'a2m',
 		for: 'atm',
@@ -1494,6 +1499,10 @@ const aliases = [
 		name: 'natural tits',
 		for: 'natural-boobs',
 	},
+	{
+		name: 'oiled',
+		for: 'oil',
+	},
 	{
 		name: 'oral',
 		for: 'blowjob',
diff --git a/seeds/02_sites.js b/seeds/02_sites.js
index deeece253..ed6dcf75d 100644
--- a/seeds/02_sites.js
+++ b/seeds/02_sites.js
@@ -3332,6 +3332,13 @@ const sites = [
 		description: 'Your favorite girls restrained with rope, punished & trained. Hogtied is the original extreme bondage porn website. Watch top pornstars and pain sluts in brutal bondage, getting tormented, and forced to orgasm!',
 		parent: 'kink',
 	},
+	{
+		slug: 'kinkclassics',
+		name: 'Kink Classics',
+		url: 'https://www.kink.com/channel/kinkclassics',
+		description: 'Featuring remastered must-see videos from our extensive archive of over 20 years.',
+		parent: 'kink',
+	},
 	{
 		slug: 'kinkfeatures',
 		name: 'Kink Features',
diff --git a/src/app.js b/src/app.js
index 3413ced6e..2d0745be8 100644
--- a/src/app.js
+++ b/src/app.js
@@ -49,15 +49,15 @@ async function init() {
 	}
 
 	if (argv.save) {
-		if (deepScenes.length > 0 || deepMovieScenes.length > 0) {
-			await storeScenes(deepScenes || []);
-		}
-
 		if (deepMovies.length > 0) {
 			const storedMovieScenes = await storeScenes(deepMovieScenes);
 
 			await storeMovies(deepMovies, storedMovieScenes);
 		}
+
+		if (deepScenes.length > 0 || deepMovieScenes.length > 0) {
+			await storeScenes(deepScenes || []);
+		}
 	}
 
 	knex.destroy();
diff --git a/src/scrapers/elegantangel.js b/src/scrapers/elegantangel.js
index bfb6eddfd..da4f3a310 100644
--- a/src/scrapers/elegantangel.js
+++ b/src/scrapers/elegantangel.js
@@ -45,7 +45,7 @@ function scrapeMovieScenes(scenes) {
 	});
 }
 
-async function scrapeRelease({ query, html }, url, channel, type = 'scene') {
+async function scrapeRelease({ query, html }, url, channel, baseRelease, type = 'scene') {
 	const release = {};
 
 	release.entryId = new URL(url).pathname.match(/\/(\d+)/)[1];
@@ -71,7 +71,7 @@ async function scrapeRelease({ query, html }, url, channel, type = 'scene') {
 	if (type === 'scene') {
 		release.director = query.text('.director');
 		release.duration = query.number('.release-date:last-child') * 60;
-		release.poster = query.url('link[rel="image_src"]') || query.meta('property="og:image"');
+		release.poster = baseRelease?.poster || query.url('link[rel="image_src"]') || query.meta('property="og:image"');
 	}
 
 	if (type === 'movie') {
@@ -138,27 +138,27 @@ async function fetchLatest(channel, page = 1) {
 	return res.status;
 }
 
-async function fetchScene(url, channel) {
+async function fetchScene(url, channel, baseRelease) {
 	const res = await qu.get(url, null, null, {
 		// invalid certificate
 		rejectUnauthorized: false,
 	});
 
 	if (res.ok) {
-		return scrapeRelease(res.item, url, channel);
+		return scrapeRelease(res.item, url, channel, baseRelease);
 	}
 
 	return res.status;
 }
 
-async function fetchMovie(url, channel) {
+async function fetchMovie(url, channel, baseRelease) {
 	const res = await qu.get(url, null, null, {
 		// invalid certificate
 		rejectUnauthorized: false,
 	});
 
 	if (res.ok) {
-		return scrapeRelease(res.item, url, channel, 'movie');
+		return scrapeRelease(res.item, url, channel, baseRelease, 'movie');
 	}
 
 	return res.status;