--- a/share/hedgewars/Data/Names/types.ini	Sat Sep 23 03:36:30 2017 +0200
+++ b/share/hedgewars/Data/Names/types.ini	Sat Sep 23 04:59:16 2017 +0200
@@ -1,4 +1,55 @@
 Clowns
+Humour
+Humor
+Funny Team
+Why So Serious?
+Flying Circus
+Hoggy’s Circus
+Funface
+Ponty Mython
+Circus Hog
+Circus Frog
+Circus Hedge
+Circus Boom
+Hedgehog Circus
+Clown Brigade
+Fun
+Just For Fun
+Kill For Fun
+The Final Joke
+Nothing To Laugh
+Fun Over
+Clowns of Doom
+Clowns of Death
+Danger Clowns
+Jokers
+Mad Hedgehogs
+Woogliedumps
+Hoogiehogs
+Pootiewoopsies
+Moogleswoshes
+Woopsiedoops
+Dimper Drainers
+Finker Framers
+Clickers
+Circus
+Comedy
+Explosive Laughter
+Laughingstock
+Amusement
+Applause Lamp
+Funny
+Ha-ha!
+Laugh or Die
+Forced Smile
+Smiley Faces
+Outlaughed
+Boing
+Boom
+Sproing
+Zoink
+Pling
+Whoosh
 #####
 clown
 clown-copper
@@ -11,47 +62,513 @@
 WhySoSerious
 #####
 Fruit
+Juiceland
+Juice
+Fruitland
+True Fruit
+We Shoot Back
+Hogera Juice Factory
+Fruit Planet
+Sentient Fruit
+Angry Fruit
+Mad Fruit
+Toxic Fruit
+Tutti Frutti
+Hogs with Hats
+Not Veggies
+Nanaland
+Orange Apples
+Lime Lemons
+Green Bananas
+Red Apples
+Greenhorns
+Gone Bad
+Foul Fruit
+Danger Fruit
+Fruity
+Fruitheads
+Fruit Alliance
+Apple-Banana Alliance
+Lemon-Orange Group
+Apple Alliance
+Banana Bandits
+Lemonheads
+Apples and Oranges
+Lemons and Bananas
+Red Yellow Orange
+Fruity Hogs
+Fruity Fruit
+Killer Fruit
 #####
 fr_apple
 fr_banana
 fr_lemon
 fr_orange
 #####
-Indians
+Amerindians
+Howlers
+Feather Tribe
+Feather Fever
 Apache
+Natives
+Indus
+America
+Hawks
+Birdy Tribe
+Bird’s Call
+Desert Eagles
+Team Tipi
+Hunter Tribe
+Chief Council
+Feathered Hats
+Eagle Tribe
+Team Hide
+Hunt and Trap
+Bear Clan
+Eastern Alliance
+Savannah Keepers
+Desert Tribe
+Tribehogs
+Tribe
+Eagle Eyes
+White Eagles
+Red Bears
+Cactus Point
+Bear Bearers
+Black Eagles
+Desertlanders
+Soutern Tribe
+Northlanders
+Westbears
+The Porcupines
+Feather Clan
+Funnyval
+Middleland
+Andes Tribus
+Ash Warriors
+Pure Bear Caste
+Small Hunt Kin
+Boulder Horde
+Stalker Tribe
+Oracle Tribe
+Rage Tribe
+Blind Bizon Clan
+Ancestor Children
+Hidden Warriors
+Hidden Children
+White Horde
+Bright Heaven
+Angry Hand Tribe
+Phoenix
+Raven Tribe
+Dark Demon Tribe
+Owl Tribe
+Wolf Clan
+Dragon Warriors
+Ember Clan
+Hell’s Fury
+Ancestor Kin
+Clan of Elders
+Scorpion Children
+Quiet Lion Tribe
+Broken Scars
+Cold Moon
+Lightning Children
+Blood Brothers
+Paw Horde
+Thunder Claps
+Small Lion Clan
+The Loyals
+Loyality
+Locals
+Dark Ghosts
 #####
 IndianChief
 #####
 Pirates
+Black Sea
+Black Pearl
+Skull of Death
+Searobbers
+Hedgehogs of the Sea
+Hoggebean
+Plankers
+Old St. Mary
+Doom Pirates
+Water Curse
+Jack’s Pirates
+Rough Sea
+Sword and Saber
+Treasure Takers
+Shipwreckers
+Money Blenders
+Gold Hunters
+Take and Run
+Chasers
+Navy’s Doom
+Seven Seas
+Jolly Roger
+Arr!
+Scurvy Dogs
+Curvy Hogs
+Ocean Danger
+Ship Raiders
+Ocean Raiders
+Black Spot
+Black Curse
+Skulls and Bone
+Hoggy Joller
+Crimson Pirates
+Black Pirates
+Cursed Pirates
+Sabertooth
+Anger of the Shark
+Angry Murderers
+Angry Raiders
+Awful Corsair
+Awful Manta
+Bloody Death
+Bloody Fall
+Buccaneer’s Death
+Buccaneer’s Plague
+Calypso
+Broken Compass
+Coral Fear
+Creepy Coral
+Cruel Barnacle
+Cruel Kill
+Cruel Raiders
+Cruelty of the Eel
+Cruel Hedgehogs
+Cruelty
+Cry of the Ocean
+Cry of Cthulhu
+Cursed Death
+The Damned
+Dark Treasure
+Davy Jones’ Locker
+Death of the Eel
+Decietful Strumpet
+Cutlass
+Horror
+Damnation
+Dirty Killers
+Dirty Pirates
+Disgraceful
+Dishonorable
+Doom of Tortuga
+Dragon’s Skull
+Evil Eel
+Evil Fall
+Evil Hate
+Evil Sword
+Foul Anger
+Foul Gold
+Foul Secret
+Golden Deciet
+Golden Treasure
+Greed of the Sea
+Hades’ Death
+Hades’ Doom
+Hades’ Greed
+Hades’ Raider
+Hades’ Servant
+Hateful
+Hate of the Knave
+Hell-born
+Hellish Pirates
+Horrible Anger
+Horrible Death
+Horrible Killers
+Plunderers
+Horrible Poison
+Horrible Rage
+Horrible Shark
+Horrid Barnacle
+Horrid Corsair
+Horrid Whore
+Howling Strumpet
+Howling Pirates
+Killer’s Cry
+Weird Wolf
+Madness of Hell
+Morbid Dream
+Morbid Greed
+Morbid Mermaid
+Morbid Pearl
+Morbid Plague
+Morbid Scream
+Death
+Doom
+Howl
+Knave
+Murder Mystery
+Murderer’s Scream
+Neptune’s Grail
+Neptune’s Slaves
+Night Blades
+Night’s Horror
+Ocean’s Fear
+Ocean’s Madness
+Ocean’s Murderer
+Ocean’s Serpent
+Poison Death
+Poison Pearl
+Posideon’s Anger
+Posideon’s Gold
+Posideon’s Raiders
+Pride of Atlantis
+Pride of Hades
+Pride of the Shark
+Privateer’s Serpent
+Privateer’s Slave
+Rage of the East
+Rage of the Knave
+Rage of the North
+Red Gold
+Red Grail
+Satan’s Barnacle
+Satan’s Gold
+Satan’s Horror
+Satan’s Nightmare
+Satan’s Poison
+Satan’s Sadness
+Satan’s Storm
+Scream of Tortuga
+Scurvy Murder
+Sea’s Disgrace
+Sea’s Hoard
+Sea’s Mermaid
+Sea’s Plague
+Eerie Eels
+Shameful Wolves
+Vicious Murderers
+Wandering Curse
+Wandering Disgrace
+Wandering Raiders
+Barnicles
+Buccaneers
+Black Bandanas
+Black Sails
+Black Skulls
+Black Tooth Grins
+Blackbeards
+Bloody Bandits
+Broken Bandits
+Broken Bones
+Cannon Balls
+Cannonball Bandits
+Crazy Eyes
+Cutlasses
+Dividers
+Drifters
+Driftwood Divers
+Eternal Smiles
+Filibusters
+Fishguts
+Flintlocks
+Floaters
+Golden Guns
+Grand Cannoneers
+High ’n’ Dry
+Hired Guns
+Hired Swords
+Hydras
+Keel Haulers
+Landlocked
+Lost Souls
+Mad Marauders
+Nautical Navigators
+Ocean Shadows
+Ocean Wanderers
+Odd Jobs
+Peg Legs
+Peglegs
+Pelicans
+Pieces of Eight
+Plagued Pillagers
+Plank Walkers
+Plunderers
+Pillagers
+Rattails
+Red Raiders
+Red Sails
+Red Scarfs
+Rustlers
+Salty Dogs
+Swabbers
+Sea Angels
+Sea Devils
+Sea Dogs
+Sea Foxes
+Sea Monsters
+Sea Sharks
+Sea Terrors
+Sea Wolves
+Sea Hogs
+Seagulls
+Shellbacks
+Silver Eyes
+Silver Sailors
+Silver Swords
+Siren’s Song
+Sirens
+Skull & Crossbones
+Hogs of the Sea
+South Sea Sailors
+Squids
+Stray Dogs
+Talking Parrots
+Thirsty Thieves
+Thunder Waves
+Water Walkers
+Wild Windjammers
 #####
 pirate_jack
 pirate_jack_bandana
 #####
 Bandits
 Gangsters
+Gangstas
+Gangsta Life
+Robbers
+Hell’s Hogs
+Thug Life
+Ocean’s Eight
 Thieves
+Burglars
+Criminals
+Crime Squad
+Squatters
+Outlaws
+Master Thieves
+Guild of Thieves
+Takers
+Snatchers
+Thugs
+Crime
+Little Mafia
+Mafiosi
+Crime Gang
+Hedgehog Gang
+Gang of Eight
+Gang
+Yellow Fang
+Ravenclaw Band
+Raven Riders
+Flame Pistols
+Seals
+Azure Skulls
+Copper Skeletons
+The Abandoned
+United Front
+The Invisibles
+The Nameless
+Lawless
+Chaotic Evil
+Chaos
+Destruction
 #####
 Bandit
 #####
 Futuristic
 Possessed
 Parasites
+Ouchies
+Victims
+Accidents
+Labhogs
+Suckers
+Controlled
+Mindless
+Brainiacs
+Monsterhead
+Brainslugged
+Slugs and Shotguns
+Nohead
+Brainers
+Symbiosis
+Third Eye
+Little Monsters
+Over your Head
+Slugs of Death
 #####
 scif_BrainSlug
 scif_BrainSlug2
 scif_BrainSlug2
 #####
 Bunnies
+Rabbits
+Easterhogs
+Bad Disguise
+My Little Zoo
+Happy Easter
+Bunnyhogs
+Hedgebunnies
+Team Carrot
+Team Bunny
+Bunny Around
+Bunny Jumpers
+Bunny Hoppers
+Hoppers
+Bunny Hill
+Funny Bunnies
+Fun Bun
+Imitators
+Cute and Deadly
+Bunhogs
+Grassy Fields
+Fresh Grass
+Fake Ears
 #####
 zoo_Bunny
 #####
+Investigators
 Detectives
+Cowboys
+Western
+Go West
+Wild West
+Wildest West
+Hogtown
+Gunslingers
+Revolver Heroes
+Western Heroes
+Goodguys
+Goodhogs
+Cowboy Party
+Yee-Haw!
+Team West
+Crime Hunters
+Magnifier
+Look-Look
+Cowboy Hats
+Lucky Eight
 #####
 Cowboy
 #####
 Monarchy
 Kingdom
+Dynasty
+Empire
 Royal
+Royale
+Royalty
+High House
+Hedgehog Kingdom
+Majesty Team
+The Crown
+Holy Empire
+Hedgehog Empire
+The Quest
+Royal Guard
+Kingly Guard
+Crown Team
+Crowners
+Tories
+Loyality
+Club of Kings
+Before the King
 #####
 crown
 royalguard
@@ -61,12 +578,61 @@
 #####
 Ninja
 The Ninja
+The Way of H
+Shaolin
+Hedgehog Clan
+Spikes of Honor
+Honor
+Silent Death
+Red Spider Clan
+White Bird
+Assasins
+Team Black
+Team Ninja
+Rope Masters
+Ninja Ropers
+Pro-Ropers
+Proper Ropers
+Propers
+Rope Masters
+Rope Swingers
+Rope Swinger Club
+Rope-Knockers
+Rope Paper Scissors
+Sneaky
+Blacksuits
 #####
 NinjaFull
 NinjaStraight
 NinjaTriangle
 #####
 Metal
+Heavy
+Heavy Metal
+Black Metal Hedgehogs
+Hog Metal
+Rock’n’Roll’n’Die
+Rock’n’Roll
+Roll
+Kiss Me!
+Rock Hard
+Death Metal
+Death Rock
+Deadly Music
+Dark Faces
+Dark Doom
+Fists of Destiny
+Hardcore
+Danger Zone
+Loudness
+Dark
+Dark Dark Dark
+The Darkest
+Dark Hogs
+Dark Metal
+Black Metal
+Maniacs
+Black Lords
 #####
 kiss_criss
 kiss_frehley
@@ -74,20 +640,160 @@
 kiss_stanley
 #####
 Wizzards
+Wizards
+Wizard School
+Magicians
+Magic School
+Hedgehogwarts
+Enchanters
+Magic
+Apprentices
+Master School
+School of Fire
+School of Ice
+School of Earth
+School of Air
+Airplane Summoners
+Magic Melons
+Enchanted Hogs
+Tricksters
+Magic Bullet Team
+Blue Star
+Sorcerers
+Keepers of Magic
+Magic Flow
 #####
 WizardHat
 #####
 StarHogs
+Starhogs
+Imperial Army
+Darth Invaders
+Invaders
+Empire
+Space Empire
+Hogerian Empire
+Space Army
+Black and White
+Space Guardians
+Dark Forces
+The Force
+Darth’s Infantry
+Space Infantry
+Infantry X-54
+Imperialists
+Star Gazers
+Planet Exploders
+Star Rushers
+Space Invaders
+Assault Troop
+Darth’s Troop
+Combat Units
+Death Star
+Galaxy
+Galactic Empire
+Frontier
+Inferno Military
+Ebon Force
+Plague Squadron
+Colonial Space Force
+Thunder Flotilla
+Neo Squadron
+Space Corps
+Overlord Navy
+Space Navy
+Fury Space Force
+Zion Division
+Star Forces
+Fusillade Flotilla
+Primal Fleet
+Scourge Flotilla
+Star Division
+Judgment Corps
+Supernova Service
+Champion Navy
+Pinnacle Space Navy
+Abyss Force
+Federation Armada
+Immolation Armada
+Attack Force
+Daemon Defense
+Prime Force
+Dread Division
+Defense Force
+Assassination Corps
+Guerrilla Force
+Neo Armada
+Raven Corps
+Horde Space Force
+Mayhem Navy
+August Armada
+Dread Space Force
+Prophecy Flotilla
+Attack Force
+Martyr Space Corps
+Federation Squadron
+Immortal Corps
+Rogue Space Corps
+Ethereal Navy
+Star League
+Grand Navy
+Sinner Armada
+Prime Corps
+Wreckage Forces
+Demon Service
+Astral Space Corps
+Execution Force
+Eos Defense Force
+Royal Squadron
+Bane Division
 #####
 scif_swDarthvader
 scif_swStormtrooper
 scif_swStormtrooper
 #####
 Hogtrix
+Digital
+The Coolest
+Coolest Hogs
+Megacool
+Coolio
+Cool
+Awesome
+The Bestest
+Ego Boosters
+Black Glasses
+Uber
+Great
+Splendid
+Ego-Trip
+Inside
+Club Cool
+Hip
 #####
 Sunglasses
 #####
 Hog Fighters
+Hedge Fighters
+Fighter Clan
+Combat Team
+Melee Attack
+Attackers
+Combateers
+Fistpunchers
+Shoryuken!
+Fists of Fire
+Whippers
+Team Fist
+Team Melee
+Team Ouch
+Oucherers
+Punchers
+Punchline
+Your Doom
+The Clan
+Take This
+Revenge
 #####
 sf_balrog
 sf_blanka
@@ -100,6 +806,26 @@
 sf_vega
 #####
 Mushroom Kingdom
+Sarasaland
+Birabuto Kingdom
+Muda Kingdom
+Easton Kingdom
+Chai Kingdom
+Golden Coins
+Coingrabbers
+Goombastompers
+Stompers
+Jumpers
+Runners
+Jump and Run
+Hit, jump and run
+Hit’n’Run
+Hedgehogland
+Mushroom Clan
+Kingdom’s Army
+Malupe
+Daisy and Friends
+Turtle Tramplers
 #####
 sm_mario
 sm_luigi
@@ -109,16 +835,87 @@
 sm_wario
 #####
 Honor
+Sunrise
+Red Sun Clan
+Better than Ninjas
+Samurai
+The First Samurai
+Samurai Army
+Samurai Alliance
+Team Honor
+Sunset
+Rising Sun
+Setting Sun
+Team Sun
+Red Sun
+Yellow Sun
+White Sun
+Fight with Honor
+Honorfighters
+Final Samurai
+Orient Defense
+Expedition Corps
+Emperor’s Finest
+Emperor’s Chosen
+The Chosen
+Risers
+Swordfighters
 #####
 Samurai
 #####
 Straw
+Last Straw Brigade
+Last Straw
+Peasants
+Nice Rice
+Poor’s Peasants
+Peanuts
+Collectors
+Workers
+Outnumberers
+Cool Hats
+Worker Group 1
+Worker Group 2
+Worker Group 3
+Worker Group 4
+Mad Hats
+Strawgunners
+Burning Grass
+Hot Wheat
+Mad as Fire
+Pitchfork
+Farmers
 #####
 StrawHat
 StrawHatEyes
 StrawHatFacial
 #####
 Rainbow
+Hairy
+Hairy Hedgehogs
+Hair Heirs
+Hairhogs
+8 Colors
+Colors of Doom
+Colorful
+Crazy Colored Hogs
+Rainbow
+Danger Colors
+Red Green Blue
+All Colors
+Color World
+Hairy Situation
+Hairspray
+Sprayers
+Hairbombers
+Ballers
+Hairers
+Haired Anrgy
+Hair Group
+Color Group
+Danger Group
+Colors of Victory
+United Colors
 #####
 hair_green
 hair_blue
@@ -129,10 +926,74 @@
 hair_grey
 #####
 Pride
+The Best
+The Best of the Best
+The Bestest
+Better than You
+Proudness
+We Own All
+Ownage
+Team Boss
+Ancient Rome
+Caesar’s Pets
+Rich and Dangerous
+Everwinners
+Awesome
+Magnificent
+Most Magnificent
+Superlative
+Splendid
+Gorgeous
+Rich
+Classic
+Bay Leaf
+Laurel
+Glorious
+Brilliant
+Great
+Tremendous
+Ultra
+Hyper
+Superb
+Hundred Percent
+Wholesome
+Balance
+Always Win
+Zerofail
+Perfect
+Pros
+Infinity
+Don’t Lose
+Neverfail
+Pro Team
+The Great
+Greatness
+Team Great
 #####
 laurel
 #####
 Green Hill
+Hedgehog Hill
+Hogera Group
+Green Group
+The Green Ones
+Fast
+Lightspeed
+Faster than Light
+Supersonic
+Speed
+Ultraspeed
+Hyperspeed
+Superspeed
+Fast and Angry
+Runners
+Shoot and Run
+Quickers
+Fasteners
+Speeders
+Deathrunners
+Speedrun
+Sonic Speed
 #####
 sth_Amy
 sth_AmyClassic
@@ -145,6 +1006,37 @@
 sth_Tails
 #####
 Pocket Pros
+Hogimon
+Hedgemon
+Minimon
+Battlemon
+Mutation
+Hogmonsters
+Weird Mutants
+Lab Accidents
+Catchies
+Pokehogs
+Gottacatch
+Collectees
+Pocket Zoo
+Battle Pros
+Hanto
+Little Monsters
+Minimon
+Cuties
+Team Spaceship
+Team Pocket
+Together
+Monsters United
+Small Danger
+Pocket Hedgehogs
+Hogballs
+Hog Center
+Hanto
+Lavender Village
+Pallet City
+Victory Street
+Gang of Eight
 #####
 poke_ash
 poke_charmander
@@ -159,17 +1051,88 @@
 poke_voltorb
 #####
 Vikings
+Thor’s Team
+Thor’s Selected
+Centurio
+Valhalla
+Norsehogs
+Seafearers
+Red Rune
+Skal
+Viking
+Strobo
+Hun
+Nordic Lights
+Sword and Shield
+Round Shield
+Galley
+Blue Bottle
+Love of Sea
+Water Clan
+Hogs of War
+Proud Warriors
+Helmet Pride
 #####
 Viking
 #####
 Guardian Angels
+Angels
+Heaven Guards
+Heaven
+Holy Spirits
+Holy Nation
+Godsent
+Blessed
+Holier Than Thou
+The Holiest
+Hogs From Heaven
+Holy Hedgehogs
+Saints
+Divine Grace
+Sacrament
+Canon
+Holy Spirit
+Heavenly Justice
+Righteous Wrath
+Upright
+Holy
+Blessed Souls
+Pure Souls
 #####
 angel
 #####
 Snipers
 Sniper Team
+Headhunters.
+Hedgehunters
+Hithogs
+One Shot One Kill
+Silent Killers
+Murderers
+Sniper Clan
+Pro Snipers
+0 Misses
+Perfect Accuracy
+Bull’s Eye Snipers
+Nice to Hit You
+Hitters
+Nerves
+Aim
+Perfect Aim
+Heads-on
+Ranger Danger
+Rifle Slingers
+Gun Nuts
+Ammo Alliance
+Quiet War
+Headshot
+Critical Hit
+Always Hit
+Perfection
+Silent Death
+Sneaky Snipers
+Raging Rangers
 #####
 Sniper
 anzac
-*END*
-
+*END*
\ No newline at end of file