Merge remote-tracking branch 'upstream/master'

Update from Upstream

seeds/01_networks.js

@@ -180,8 +180,21 @@ const networks = [
 		url: 'https://www.dorcel.com',
 	},
 	{
-		slug: 'fcuk',
-		name: 'Fcuk',
+		slug: 'evilangel',
+		name: 'Evil Angel',
+		url: 'https://www.evilangel.com',
+		description: 'Welcome to the award winning Evil Angel website, home to the most popular pornstars of today, yesterday and tomorrow in their most extreme and hardcore porn scenes to date. We feature almost 30 years of rough sex videos and hardcore anal porn like you\'ve never seen before, and have won countless AVN and XBiz awards including \'Best Site\' and \'Best Studio\'.',
+		parent: 'gamma',
+		parameters: {
+			layout: 'api',
+		},
+	},
+	{
+		slug: 'exploitedx',
+		name: 'ExpoitedX',
+		parameters: {
+			layout: 'tubular',
+		},
 	},
 	{
 		slug: 'freeones',
@@ -216,16 +229,6 @@ const networks = [
 		url: 'https://dogfartnetwork.com',
 		description: 'The world famous Dogfart Interracial series. Online since 1996, we have the largest collection of Interracial videos, pictures and content on the web.',
 	},
-	{
-		slug: 'evilangel',
-		name: 'Evil Angel',
-		url: 'https://www.evilangel.com',
-		description: 'Welcome to the award winning Evil Angel website, home to the most popular pornstars of today, yesterday and tomorrow in their most extreme and hardcore porn scenes to date. We feature almost 30 years of rough sex videos and hardcore anal porn like you\'ve never seen before, and have won countless AVN and XBiz awards including \'Best Site\' and \'Best Studio\'.',
-		parent: 'gamma',
-		parameters: {
-			layout: 'api',
-		},
-	},
 	{
 		slug: 'fantasymassage',
 		name: 'Fantasy Massage',
@@ -417,6 +420,14 @@ const networks = [
 		url: 'https://www.naughtyamerica.com',
 		description: 'The best porn movies daily at Naughty America! Experience the most seductive porn stars in stunning virtual reality, 4K and HD porn videos!',
 	},
+	{
+		slug: 'nebraskacoeds',
+		name: 'Nebraska Coeds',
+		url: 'https://nebraskacoeds.com',
+		parameters: {
+			layout: 'classic',
+		},
+	},
 	{
 		slug: 'newsensations',
 		name: 'New Sensations',

seeds/02_sites.js

@@ -2760,18 +2760,20 @@ const sites = [
 		slug: 'exploitedcollegegirls',
 		alias: ['excogi', 'ecg'],
 		url: 'https://exploitedcollegegirls.com',
-		parent: 'fcuk',
+		parent: 'exploitedx',
 		parameters: {
-			blog: true,
+			latest: 'https://exploitedcollegegirls.com/site/categories/movies_{page}_d.html',
+			profile: 'https://exploitedcollegegirls.com/site/models/{actorSlug}.html',
 		},
 	},
 	{
 		name: 'Backroom Casting Couch',
 		slug: 'backroomcastingcouch',
 		url: 'https://backroomcastingcouch.com',
-		parent: 'fcuk',
+		parent: 'exploitedx',
 		parameters: {
-			blog: true,
+			latest: 'https://backroomcastingcouch.com/site/categories/movies_{page}_d.html',
+			profile: 'https://backroomcastingcouch.com/site/models/{actorSlug}.html',
 		},
 	},
 	{
@@ -2779,40 +2781,7 @@ const sites = [
 		slug: 'blackambush',
 		alias: ['interracial', 'bbc'],
 		url: 'https://blackambush.com',
-		parent: 'fcuk',
-		parameters: {
-			blog: true,
-		},
-	},
-	{
-		name: 'Nebraska Coeds',
-		slug: 'nebraskacoeds',
-		url: 'https://nebraskacoeds.com',
-		parent: 'fcuk',
-	},
-	{
-		name: 'South Beach Coeds',
-		slug: 'southbeachcoeds',
-		url: 'https://southbeachcoeds.com',
-		parent: 'fcuk',
-	},
-	{
-		name: 'Spring Break Life',
-		slug: 'springbreaklife',
-		url: 'https://springbreaklife.com',
-		parent: 'fcuk',
-	},
-	{
-		name: 'Euro Coeds',
-		slug: 'eurocoeds',
-		url: 'https://eurocoeds.com',
-		parent: 'fcuk',
-	},
-	{
-		name: 'After Hours Exposed',
-		slug: 'afterhoursexposed',
-		url: 'https://afterhoursexposed.com',
-		parent: 'fcuk',
+		parent: 'exploitedx',
 	},
 	// FIRST ANAL QUEST
 	{
@@ -5476,6 +5445,37 @@ const sites = [
 		url: 'https://www.naughtyamerica.com/site/tonight-s-fuck',
 		parent: 'naughtyamerica',
 	},
+	// NEBRASKA COEDS
+	{
+		name: 'Nebraska Coeds',
+		slug: 'nebraskacoeds',
+		url: 'https://nebraskacoeds.com',
+		parent: 'nebraskacoeds',
+	},
+	{
+		name: 'South Beach Coeds',
+		slug: 'southbeachcoeds',
+		url: 'https://southbeachcoeds.com',
+		parent: 'nebraskacoeds',
+	},
+	{
+		name: 'Spring Break Life',
+		slug: 'springbreaklife',
+		url: 'https://springbreaklife.com',
+		parent: 'nebraskacoeds',
+	},
+	{
+		name: 'Euro Coeds',
+		slug: 'eurocoeds',
+		url: 'https://eurocoeds.com',
+		parent: 'nebraskacoeds',
+	},
+	{
+		name: 'After Hours Exposed',
+		slug: 'afterhoursexposed',
+		url: 'https://afterhoursexposed.com',
+		parent: 'nebraskacoeds',
+	},
 	// NEW SENSATIONS
 	{
 		slug: 'hotwifexxx',