--- a/QTfrontend/util/namegen.cpp	Sun Oct 01 09:42:17 2017 +0200
+++ b/QTfrontend/util/namegen.cpp	Mon Oct 02 15:43:45 2017 +0200
@@ -75,8 +75,6 @@
     // the hat will influence which names the hogs get
     int kind = (rand()%(TypesHatnames.size()));
 
-    // pick team name based on hat
-    team.setName(getRandomTeamName(kind));
     team.setGrave(getRandomGrave());
     team.setFort(getRandomFort());
     team.setFlag(getRandomFlag());
@@ -137,6 +135,14 @@
         HWNamegen::teamRandomHogName(team,i,dict);
     }
 
+    // If using themed hats, use themed team name.
+    // Otherwise, only use “generic” team names from the first team
+    // in types.txt.
+    if (randomMode == 0)
+        team.setName(getRandomTeamName(kind));
+    else
+        team.setName(getRandomTeamName(0));
+
 }
 
 // Set random hats for entire team

--- a/share/hedgewars/Data/Names/README.md	Sun Oct 01 09:42:17 2017 +0200
+++ b/share/hedgewars/Data/Names/README.md	Mon Oct 02 15:43:45 2017 +0200
@@ -50,4 +50,7 @@
 
 Everything after that will be ignored.
 
+The first team entry is special: The team names of this entry are considered
+to be generic and fit (more or less) and don't have any particular theme.
+
 This file must be present at all costs!

--- a/share/hedgewars/Data/Names/types.ini	Sun Oct 01 09:42:17 2017 +0200
+++ b/share/hedgewars/Data/Names/types.ini	Mon Oct 02 15:43:45 2017 +0200
@@ -1,11 +1,7 @@
 Hedgehogs of Death
-Start
-Advance
-Initiate
 Beginners
 Rookies
 Young Ones
-Normal
 Hog Army
 Doom Brigade
 Death Brigade
@@ -44,6 +40,7 @@
 Team Snow
 Team Underwater
 Banana Phone
+Melon Sheep
 Bedbugs
 Sleepers
 Hurt You Plenty
@@ -53,7 +50,7 @@
 Rollers
 Rolling Spikes
 No Cowards
-Owners
+Ownage Group
 Pro Army
 Army of Eight
 8-Ball
@@ -68,11 +65,215 @@
 Superstrong
 Megafast
 Hypersmart
-Super
-Ultra
+Superteam
+Ultrateam
 Terror Team
 Mega
 Gigantic
+Fun Time
+Nothing to Laugh
+Ironic Iron Fists
+Agency of Pain
+Hunterkillers
+Brigade
+Soldiers
+Spiked Doom
+Number One
+The Best
+The Test
+Skill
+Little Nation
+Hedgehogland
+Hedgewarriors
+Behind the Hedge
+Hibernation
+Winter
+Nature's Eight
+Four Plus Four
+100 Points
+Sniperkillers
+Sweet Revenge
+Nasty Team
+Final Frontier
+First Frontier
+1st Infantery
+Battalion X
+Loonatics
+Eight Hedgehog Army
+Army
+Hedges and Hogs
+Funtime is Over
+No More Mr Nice Hog
+Double Trouble
+Iconic Shopping Mall
+Railroad to Hell
+Elevator to Heaven
+Challengers
+Champs
+Chumps
+Friends
+Sorrow Team
+Victory
+Victors
+Rulers of Hogera
+Planet Hedgehog
+Grassy Grass Group
+Crazy Grass
+Naughty Hunters
+Mighty Fighers
+Fighters
+The Hogs
+Evil Overlords
+Delayed Empire
+No Time
+One Shot Kill
+Plop
+Not Sorry
+Ironic Hogs
+Mammals of Terror
+Hedgehogs, Inc.
+Nasty Terrorists
+Lawful Evil
+True Neutral
+Evil Good
+Good Evil
+Evil 8
+Good 8
+Overlords
+Underlings
+Endurance
+Hogera
+Goldshine
+Sunshine
+Nightmare
+Sunset
+Dawnhunters
+Twilight Zone
+Self-Defense
+Egoists
+Horror
+Absurd
+Jelly Beans
+Mountain Rangers
+Nature's Gift
+Nature's Revenge
+Pain or Pleasure
+The Second Attempt
+Seduction
+Red Arrow
+Yellow Spikes
+Blue Sea
+Silver Feet
+Bronze Nose
+Copper Ears
+Tree
+Nest
+Bush
+Shrub
+Poor Fellows
+Unlucky Sorrow
+Lucky
+Masters of Technology
+Perfect Accuracy
+H.O.G.
+Gears of Hedge
+Sheep Lovers
+Melon Munchers
+Melons of Doom
+Hellgrenadiers
+Grenadiers
+Bazooka Skill
+Explosion
+Kaboom
+Sproing
+Bounce Around
+Steel Rubber
+Rubber Spikes
+Hurt
+Ouchies
+Final Try
+Angry Rage
+Evil Horde
+Locust Horde
+Minions
+Council
+Hog Nation
+Hog Republic
+Dark Side
+Bright Side
+Side B
+Rewind
+Underbush
+Perfect Podzol
+Dirty Dirt
+Grassy Grass
+Grassmunchers
+Munchers
+Eternal Victory
+Frontier
+Seventh Frontier
+Rubber Duck Force
+The Pink Horde
+Pink Brains
+Rollup
+Lots of Lemonade
+United Guard
+Alliance
+Unity
+Glorious
+Fabulous
+Impressive
+Awesome
+Great
+Unbelievable
+The Unbelievables
+The Astounding
+Trajectory
+Fatal Water Push
+Mudballs
+Mudballs of Doom
+Final Shot
+Gun and Rifle
+Watermelons
+Fools
+The Absolute
+Silence
+Flatline
+Sneak
+Alliance of Good
+Good Hunters
+Lawless Chaos
+Total Annihilation
+Complete Destruction
+Crazy Cannon
+Silver Lining
+Golden Team
+Black Sleep
+Sentient Beings
+Existance
+High Horse
+Elite
+Avantgarde
+Guard of Hope
+Guards
+Pink Poison
+Health Loss
+Part-Time Soldiers
+Goldsilver
+Drill Strike
+Pianists
+Dominant Strategy
+Dominators
+Poisonous Team
+Poison Killers
+Blowtorch
+Blown Up
+Shotgun!
+Butter Spread
+Brakefast
+Blast
+Neutralizers
+Killing You Softly
 #####
 NoHat
 #####
@@ -128,6 +329,11 @@
 Zoink
 Pling
 Whoosh
+Ironic Irony
+Sarcasm
+Sad Clowns
+Balloons
+Smiley
 #####
 clown
 clown-copper
@@ -1177,12 +1383,87 @@
 Holy
 Blessed Souls
 Pure Souls
+Church of Grass
+Church of Hoglogy
+Scientific Dogma
+Church Bell
+Cult
+Cult of X
+Inner Circle
+Greater Circle
+True Cult
+True Dogma
+True Spitiy
+Holy Hogs
+Council of Holy
+Our Holyness
+Our Mother of Life
+Mother Nature
+Belief
+The Selected
+Chosen Ones
+Eternal
+Infinity
+Great White Hedgehog
+Rebirth
+Holy Shine
+Halo
+Nimbus
+Gloriole
+Glory
+Spiritual
+Dogma
+Seen the Light
+Immortal Cult
+The Idea
+Church of Bazooka
+Cult of the Bomb
+Holy Scripture
+True Religion
+Prophets
+Our dear Mother
+Our dear Father
+Scripture Squadron
+Goldshine
+Good
+Paragons
+Heroes
+Shining
+Shiny
+Protected
+Elite
+Prophecy
+Angels of Evil
+Wicked Angels
+Good Angels
+Angels of the North
+Angels of the Sky
+Angels of Might
+Angels of Power
+Angels of Guns
+Holy Watermelons
+Holy Dynamite
+Holy Bazookas
+Holy Grenades
+Holy Hunters
+Holy Warriors
+Warrior Angels
+Angel Army
+Angel Troop
+Angel Team
+Holy Wrath
+Heavenly Defense
+Heavenly
+Heaven
+Afterlife
+Revival
+Resurrection
 #####
 angel
 #####
 Snipers
 Sniper Team
-Headhunters.
+Headhunters
 Hedgehunters
 Hithogs
 One Shot One Kill