diff --git a/data/dfhack-config/autonick.txt b/data/dfhack-config/autonick.txt
index e7de79f54..2c1120888 100644
--- a/data/dfhack-config/autonick.txt
+++ b/data/dfhack-config/autonick.txt
@@ -24,6 +24,36 @@ Jay
 Crow
 Raven
 Sparrow
+Platypus
+House Mouse
+Pangolin
+Funnel Web
+Weasel
+Meerkats
+Rat
+Ant
+Gopher
+Fennec
+Groundhog
+Aardvark
+Rabbit
+Olm
+Chipmunk
+Bilbie
+Vole
+Nile Croc
+Wombat
+Worm
+Gerbil
+Armodillo
+Thrinaxodon
+Binky
+Bandicoot
+Bettongs
+Potoroos
+Antechinus
+Jerboas
+Numbat
 
 # colours
 Flash
@@ -35,11 +65,435 @@ Indigo
 Jade
 Umber
 Silver
+Bistre
+Black	
+Black bean
+Noir
+Charcoal
+Ebony	
+Eerie
+Jet
+Licorice
+Midnight
+Night	
+Onyx	
+Space	
+Raisin 
+Rich
+Russ violet
+Smoky
+Taupe
+Aero
+Alice 
+Argent Lue	
+Azure	
+Azul	
+Baby blue	
+Berkeley 
+Bice
+Bleu 
+Bondi 
+Brandeis Byzant
+Cambridge 
+Carolina 
+Celestial 
+Celtic 
+Cerulean
+Chefchaouen 
+Chrysler 
+Cobalt 
+Columbia 
+Cornflower	
+Sky 
+Delft 
+Denim	
+Dodger 
+Duke
+Federal
+Glaucous
+Electrindigo
+Eclipse
+Ice 
+Illini 
+Klein 
+Jordy 
+Lapis Lazuli
+Majorelle
+Marian 
+Maya 
+Slate 
+Munsell
+Navy 
+Neon blue
+Oxford
+Palatinate 
+Penn 
+Periwinkle
+Phthalo 
+Picton 
+Poly
+Powder
+Prussia
+Royal 
+Ruddy	
+Sapphire
+Honolulu 
+Savoy 
+Silver Lake
+Space cadet
+Steel 
+Tang 
+Tufts 
+Ultramarine
+Uranian
+Vista 
+Yale 
+Zaffre
+Auburn
+Almond
+Beaver
+Beige
+Bole	
+Bone	
+Bronze
+Buff	
+Burgundy	
+Sienna	
+Umber	
+Camel	
+Caput mortuum	
+Caramel	
+Chamoisee
+Chestnut	
+Chocolate	
+Citron	
+Cocoa 
+Coffee	
+Copper	
+Cordovan	
+Coyote	
+Desert 
+Drab
+Dun	
+Earth	
+Ecru	
+Fallow	
+Fawn	
+Field 
+Fulvous
+Goldenrod
+Harvest
+Khaki	
+Kobicha	
+Lion	
+Liver	
+Mahogany	
+Maroon	
+Ochre	
+Redwood
+Rufous	
+Russet	
+Rust	
+Sand	
+Satin 
+Sheen 
+Seal 
+Sepia	
+Sinopia
+Tan	
+Taupe	
+Tawny	
+Titian 
+Van Dyke
+Walnut 
+Wenge	
+Wheat
+Aqua	
+Aquamarine	
+Capri	
+Caribbean
+Celeste	
+Cyprus
+Fluorescent 
+Jungle 
+Keppel
+Ice 
+Sea
+Moonstone
+Myrtle 
+Pacific
+Pine 
+Robin  
+Skobeloff
+Teal	
+Turquoise	
+Verdigris	
+Vivid 
+Zomp
+Platinum
+Timberwolf
+Ash 
+Rose quartz	
+Cinereous
+Cadet 
+Cool
+Davys
+Paynes
+Glaucous	
+Gunmetal	
+Feldgrau
+Apple 
+Asparagus	
+Avocado	
+Brunswick 
+Cal Poly 
+Castleton 
+Celadon
+Chartreuse	
+Moss 
+Pastel 
+Dartmouth 
+Emerald
+Erin 
+Fern
+Forest
+Harlequin	
+Honeydew
+Hunter
+Jade
+Kelly green	
+Lawn 
+Lime	
+Malachite
+Mantis
+Mindaro
+Neon 
+Olivine
+Paris 
+Pear
+Pigment 
+Pine 
+Pistachio
+Reseda
+Rifle 
+Sage
+Screamin'
+Shamrock
+Bud
+Amaranth
+Baker-Miller 
+Cerise
+Crimson
+Carmine
+Magenta
+Eggplant
+Fandango	
+Finn	
+Fuchsia
+Haze	
+Mulberry	
+Orchid	
+Plum	
+Pizzazz
+Quinacridone
+Raspberry
+Razzle dazzle 
+Rose
+Shocking 
+Telemagenta
+Aerospace
+Alloy 
+Amber	
+Apricot
+Atomic 
+Tangerine
+Burnt 
+Butterscotch
+Carrot 
+Champagne
+Chrome 
+Coral	
+Flame	
+Gold	
+Hunyadi 
+Melon
+Peel
+Papaya
+Peach	
+Persimmon	
+Princeton
+Pumpkin
+Rust
+Safety orange
+Saffron
+Tangelo
+Tigers Eye	
+Titian
+Xanthous
+Blush	
+Brilliant
+Brink 
+Carnation 
+Cherry 
+Cordovan
+Cyclamen
+Dogwood
+Folly	
+Heliotrope	
+Hollywood 
+Hot 
+Lavender
+Mimi
+Misty
+Mountbatten 
+Orchid 
+Phlox	
+Pompadour
+Puce	
+Raspberry
+Razzmatazz
+Bonbon
+Quartz
+Taupe	
+Vale	
+Rosewood
+Rosy
+Salmon
+Seashell
+Tea 
+Tickle
+Thulian
+Ultra
+Burgundy
+Byzantium
+Caput mortuum	
+Eminence
+Grape	
+Iris
+Mardi Gras
+Mauve	
+Mauveine	
+Mulberry	
+Murrey
+Palatinate
+Pale
+Pomp
+Power
+Purpureus
+Tekhelet
+Thistle
+Tropical
+Tyrian 
+Wisteria
+Barn
+Bittersweet	
+Shimmer
+Blood
+Candy apple 
+Cantaloupe
+Cardinal
+Carmine
+Chili
+Cosmos
+Cinnabar
+Claret
+Coquelicot
+Cordovan
+Cornell
+Crimson
+Falu
+Brick	
+Engine
+Folly	
+Garnet
+Imperial
+Jasper
+Penn
+Poppy
+Redwood
+Rojo	
+Rust
+Rusty 
+Scarlet
+Syracuse 
+Tomato
+Turkey 
+Vermilion	
+Wine
+Alabaster
+Antique 
+Cornsilk
+Latte	
+Cream
+Eggshell
+Flax	
+Floral
+Ghost
+Isabelline
+Ivory
+Lemon 
+chiffon
+Linen	
+Navajo 
+Nyanza
+Lace
+Parchment
+Pearl	
+Seasalt
+Seashell
+Vanilla
+Smoke
+Amber	
+Apricot	
+Arylide 
+Aureolin
+Buff	
+Canary
+Citron
+Ecru	
+Gamboge
+Icterine
+Jonquil
+Maize	
+Mikado 
+Mindaro	
+Mustard
+Selective
+Stil de grain 
+Straw	
+Sunglow
+Sunset
+Wheat
 
 # planets
 Mars
 Jupiter
 Saturn
+Pluto
+Neptune
+Europa
+
+# charites
+Damia
+Auxesia 
+Cleta 
+Phaenna 
+Hegemone 
+Peitho 
+Paregoros 
+Pasithea 
+Charis 
+Kale 
+Antheia 
+Eudaimonia 
+Euthymia 
+Eutychia 
+Paidia 
+Pandaisia 
+Pannychis 
+Aglaea
+Euphrosyne
+Thalia
 
 # nature
 Blaze
@@ -150,3 +604,413 @@ Wilder
 Wisdom
 Wyatt
 Zephyr
+
+# Gemstones
+Actinolite
+Nephrite
+Adamite
+Aegirine
+Afghanite
+Agrellite
+Algodonite
+Alunite
+Amblygonite
+Analcime
+Anatase
+Andalusite
+Chiastolite
+Andesine
+Anglesite
+Anhydrite
+Annabergite
+Anorthite
+Antigorite
+Bowenite
+Apatite
+Apophyllite
+Aragonite
+Asbestos
+Astrophyllite
+Augelite
+Austinite
+Ferro
+Magnes
+Mangan
+Tinzenite
+Azurmalachite
+Azurite
+Baryte
+Bast
+Bayldonite
+Benitoite
+Beryl
+Aquamarine
+Maxixe
+Emerald
+Goshenite
+Golden beryl
+Heliodor
+Morganite
+Red beryl
+Beryllonite
+Beudantite
+Bismutot
+Biotit
+Bole
+Boracite
+Bornite
+Brazilianite
+Brookite
+Brucite
+Bustam
+Bytown
+Calcite
+Caledonite
+Canasite
+Cancrin
+Vishnev
+Carleton
+Carnall
+Cassiterite
+Cataplei
+Cavans
+Celestite
+Ceruleite
+Cerussite
+Chabaz
+Chalcopyr
+Chambers
+Charlesite
+Charoite
+Childrenite
+Chiolite
+Chrysoberyl
+Alexandrite
+Cymophane
+Chromite
+Chrysocolla
+Cinnabar
+Clinochlore
+Clinohumite
+Clintonite
+Cobaltite
+Coleman
+Cordierite
+Iolite
+Cornwallite
+Corundum
+Ruby
+Sapphire
+Padparadscha
+Covell
+Creedite
+Crocite
+Cuprite
+Danburite
+Datolite
+Descloiz
+Diamond
+Bort
+Ballas
+Diaspore
+Dickinsonite
+Diopside
+Dioptase
+Dolomite
+Dumortier
+Ekanite
+Elbaite
+Emerald
+Trapiche
+Enstatite
+Bronzite
+Hypersthene
+Eosphorite
+Epidote
+Piemont
+Erythrite
+Esperite
+Ettring
+Eudialyte
+Faya
+Feldspar
+Andesine
+Albite
+Anorth
+Anorthoc
+Amazon
+Celsian
+Microcline
+Moonstone
+Adularia
+Rainbow
+Ortho
+Unakite
+Plagioclase
+Labradorite
+Oligoclase
+Sanidine
+Sunstone
+Oregon Sunstone
+Rainbow Lattice
+Fergusonite
+Ferroaxin
+Fluora
+Fluorapophyl
+Fluorite
+Forster
+Friedelite
+Gadolin
+Gahnite
+Gahnospinel
+Garnet
+Pyralspite
+Almandine
+Pyrope
+Spessartine
+Ugrand
+Demantoid
+Melanite
+Topazolita
+Grossular
+Hessonite
+Hydrogrossular
+Tsavorite
+Pyrope
+Rhodolite
+Mali garnet
+Malaia
+Spessar
+Umbal
+Gaspe
+Gayluss
+Gibbsite
+Glaucophane
+Goeth
+Goosecreek
+Grandidier
+Gypsum
+Gyro
+Halite
+Hambergite
+Hanksite
+Hardystonite
+Helenite
+Hematite
+Herder
+Hexagonite
+Hibonite
+Hidden
+Hodgkinsonite
+Holtite
+Howlite
+Huebnerite
+Humite
+Hurlbut
+Ilmenite
+Inderite
+Jade
+Jadeite
+Jasper
+Jeremejevite
+Kainite
+Kämmerer
+Kaolin
+Kornerup
+Kurnakov
+Kyanite
+Langbein
+Lawsonite
+Lazulite
+Lazurite
+Legrandite
+Lepidolite
+Leucite
+Leucophan
+Linarite
+Lizardite
+Londonite
+Ludlamite
+Ludwigite
+Malachite
+Maria-meionite
+Werner
+Marcasite
+Meliphanite
+Mellite
+Mesolite
+Milar
+Millerite
+Mime
+Monazite
+Mordenite
+Mottram
+Muscovite
+Fuchsite
+Nambul
+Natrolite
+Nepheline
+Neptunite
+Nickeline 
+Niccolite
+Nosean
+Nuumm
+Olivine
+Opal
+Fire opal
+Moss opal
+Painite
+Papagoite
+Pargas
+Parisite
+Pectol
+Larimar
+Pentland
+Peridot
+Periclase
+Perthite
+Petal 
+Castor
+Pezzottaite
+Phena
+Phosgen
+Phospho
+Piemontite
+Realgar
+Rhodizite
+Rhodochros
+Rhodon
+Richter
+Riebeck
+Crocidolite
+Rosasite
+Rutile
+Samarskite
+Sanidine
+Sapphirine
+Sarcol
+Scapol
+Marialite
+Meionite
+Scheel
+Schizol
+Scorod
+Selenite
+Sella
+Senarmon
+Sepio 
+Meerschaum
+Sérandite
+Seraph
+Serendibite
+Serpentine
+Bowen
+Stich
+Shattuck
+Shiga
+Shortite
+Shung
+Siderite
+Silliman
+Simpsonite
+Sinhal
+Smalt
+Smithsonite
+Sodalite
+Hackman
+Sogdian
+Sperry
+Spessar
+Sphaler
+Spinel
+Ceylon
+Spodumene
+Triphane
+Spurrite
+Stauro
+Strontian
+Titanate
+Sulfur
+Bustamite
+Sylvite
+Taaffeita
+Talc
+Tantalite
+Tektites
+Tephroite
+Thomsonite
+Thaumasite
+Topaz
+Tourmaline
+Achroite
+Chrome
+Dravite
+Elbaite
+Indicol
+Olenite
+Paraiba
+Rossman
+Rubellite
+Tremol
+Triphyl
+Triplite
+Tugtup
+Turquoise
+Ulex
+Ussing
+Vanadinite
+Variscite
+Vesuvianite
+Californite
+Villiaum
+Vivianite
+Vlasov
+Wardite
+Wavell
+Welogan
+Whewell
+Wilkeite
+Willemite
+Wither
+Wollastone
+Wulfenite
+Wurtzite
+Xonot
+Yugawara
+Zektzer
+Zeolites
+Analcime
+Chabaz
+Steller
+Stilbite
+Zinc
+Zinnwald
+Zircon
+Jacinth
+Zoisite
+Tanzan
+Thulite
+Zultan
+Zany
+Lapis lazuli
+Desert glass
+Llanite
+Maw sit-sit
+Obsidian
+Tears
+Pallas
+Peridot
+Soapstone
+Tact
+Unakite
+Bauxite
+Concretions
+Bloodstone
+Heliotrope
+Eilat stone
+Epidos
+Glimmer
+Goldstone
+Hawks eye
+Iddings
+Lampro