diff --git a/crawl-ref/source/dat/database/shopname.txt b/crawl-ref/source/dat/database/shopname.txt
index 5f1f70a2d73..0000dca1f62 100644
--- a/crawl-ref/source/dat/database/shopname.txt
+++ b/crawl-ref/source/dat/database/shopname.txt
@@ -22,6 +22,8 @@ fancy shopkeeper prefix
 
 Beastly
 
+Brilliant
+
 Dangerous
 
 Diabolical
@@ -30,37 +32,63 @@ Dreamy
 
 Fabulous
 
+Fanc[y|iful]
+
 [Forg|Regr]et[table|ful]
 
 Learned
 
+Lumin[ous|ary]
+
+Max[i|ed|imum]
+
 [M|Unm]emorable
 
 [M|F|Fl|Bl]ighty
 
+Min[i|ute|imum]
+
+Mischievous
+
 [Mono|Multi]syllabic
 
 Monobrowed
 
-Mischievous
+Mystic
 
 Nefarious
 
 [No|One|Two|Three|Four|Many|Slack]-[Eyed|Faced|Fingered|Handed|Toed]
 
+Overqualified
+
 # Could be for potions/books/weapons/armour in that order?
 [Pint|Bite|Over|Under]-Sized
 
 Powerful
 
-Fanc[y|iful]
+Streetwise
 
-Lumin[ous|ary]
+Upmarket
 
-Streetwise
+Upper Class
+
+Quali[fied|ty]
+
+Quizzical
+
+Voluminous
+
+Weighty
+
+Yammering
+
+Zoological
 %%%%
 plain shopkeeper prefix
 
+Aged
+
 Big
 
 Boring
@@ -75,24 +103,54 @@ Doodle
 
 Easygoing
 
+Fluffy
+
+Good[|e]
+
 Groovy
 
+Hearty
+
 Honest
 
-Lousy
+Ickle
 
-Max[ed|imum]
+Ic[|k]y
+
+Jokey
+
+Jovial
+
+Keen
+
+Killer
+
+Knee High
+
+Lousy
 
 Mean
 
 Meek
 
-Min[i|ute|imum]
+Neat
+
+Necessary
 
 Nice
 
+Old[|e]
+
+[O|Uno]riginal
+
+Pleasing
+
 Pukka
 
+Quoted
+
+Real
+
 Sketchy
 
 Sleepy
@@ -110,6 +168,28 @@ Squishy
 Stingy
 
 Tight
+
+Underqualified
+
+Unkind
+
+Uppity
+
+Verbal
+
+Vile
+
+Whole
+
+Xenophobic
+
+Yappy
+
+Yawning
+
+Zippy
+
+Zoomy
 %%%%
 common english name
 
@@ -226,20 +306,58 @@ W[y|i]nnie
 %%%%
 faerie name begin
 
+All
+
+Apple
+
 Beetle
 
 Biscuit
 
 Bright
 
+Butter
+
 Candy
 
+Cotton
+
 Day
 
 Dusk
 
+Elder
+
+Egg
+
 Fair[y|ie|]
 
+Fool
+
+Full
+
+Garden
+
+Glitter
+
+Harvest
+
+Heart[|h]
+
+Ice
+
+Inch
+
+Jazz
+
+Joke
+
+Kind
+
+Kite
+
+Luna
+
 Moon
 
 Morning
@@ -248,6 +366,14 @@ Moss
 
 Night
 
+Old
+
+Pebble
+
+Plop
+
+Quick
+
 Rainbow
 
 Sparkle
@@ -258,9 +384,21 @@ Sun
 
 Twinkl[e|y]
 
+Umber
+
+Vole
+
 Well
 
 Worm
+
+Yam
+
+Young
+
+Zip
+
+Zoom
 %%%%
 faerie name end
 
@@ -286,6 +424,8 @@ floss
 
 flower
 
+fluff
+
 [foot|feet]
 
 juice
@@ -399,16 +539,15 @@ w:1
 ###############################################################################
 other intro singular
 
-The
-
-[Ye|YE|The|THE][ Last| LAST| Only| ONLY| Real| One True| One & Only|]
+[Ye|The][ Last| Only| Real| One True| One & Only|]
 
+w:20
 [Ye|The] Old[e|est|]
 
 [|Only |Just |Yet ]Another
 
 # TODO: These are sort of like general shop prefixes as well, should somehow conflate?
-[Ye|The|Your] [Handy|Local|Neighbourhood]
+[Ye|The|Your] [Handy|Local|Neighbourhood|Regular|Original]
 %%%%
 simply only
 
@@ -430,7 +569,14 @@ w:5
 
 w:5
 @simply only@
+%%%%
+of connector
+
+For
+
+O'
 
+Of
 %%%%
 # Bob's Thing Shop or Ye Olde Thing Shop
 intro singular
@@ -475,6 +621,13 @@ w:2
 # Instead the total length of shop name is limited in shopping.cc increasing
 # with general fancyness, meaning we are *likely* to generate more elaborate
 # names and words with fancier shops.
+# Each shop type has some unique synonyms for shop (e.g. "Workshop" for
+# gadgets, "Armoury" for weapons, "Tavern" for potions). Potions have a further
+# sub-generator taking the tavern theme further by utilising some traditional
+# "pub name" structures so we get things like "The King's Head", "The Dog And
+# Partridge" and so forth. Jewellery stores, lacking a suitable number of
+# unique synonyms for "shop", get their own structure so we can use synonyms
+# for the vocation of "jeweller" instead.
 ###############################################################################
 %%%%
 ###############################################################################
@@ -524,13 +677,10 @@ Assorted
 
 Boutique
 
-# Maybe just for armour store?
-Bouchy
-
-Craft
-
 Classy
 
+Crafty
+
 Fancy
 
 Firsthand
@@ -568,6 +718,10 @@ Discount
 
 [|Double-]Blind
 
+Fixed[|-Up]
+
+Footnoted
+
 Historical
 
 Knockoff
@@ -596,6 +750,8 @@ Tried & [True|Tested]
 
 Vintage
 
+Waivered
+
 Weathered
 
 [Up|Re][furbished|conditioned|cycled|hashed]
@@ -641,6 +797,8 @@ Magic[al|]
 
 Mystic[al|]
 
+Radiant
+
 Radioactive
 
 Reactive
@@ -667,6 +825,10 @@ Elaborate
 %%%%
 random adverb
 
+Brilliantly
+
+Deliberately
+
 Elaborately
 
 Faintly
@@ -684,37 +846,45 @@ Very
 # Combat-related prefixes for either weapons or armour
 combat adjective
 
+Aggressive
+
 [Battle|Combat|War]-[Hardened|Tested|Weathered|Worn]
 
 Blood[y|stained|soaked]
 
 Combative
 
-[Crimson|Reddish|Ruddy]
+[Crimson|Ruddy]
 
 Sanguin[ary|eous|e]
 
-Scarred
+Scarr[ed|ing]
 
 Incarnadine
 
+Intimidating
+
 Military
 
 Rust[y|ed]
 %%%%
 damage synonym
 
-[Damage|Harm|Hurt|Pain|Death]
+[Damage|Harm|Hurt|Pain|Death|Trouble]
 ###############################################################################
 # General suffixes work for any shoptype, either after an singular noun or on
 # their own (but should only be used on their own for general shops)
 %%%%
 plain shop suffix
 
+Franchise
+
 House
 
 Kiosk
 
+Land
+
 Market[|place]
 
 [Mini-|]Mart
@@ -752,6 +922,10 @@ Den
 w:20
 Emporium
 
+Fa[ir|yre]
+
+Festival
+
 Gallery
 
 Palace
@@ -765,6 +939,8 @@ Super[market|mart|store]
 
 Warehouse
 
+World
+
 Zoo
 ###############################################################################
 # Vague suffixes only work after a plural: "Weapons & Things"
@@ -781,20 +957,12 @@ Et [Al|Cetera]
 
 Etc[etera|]
 
-For [Hire|Purchase|Rent|Sale|Trade|Trial]
+For [Hire|Perusal|Purchase|Rent|Sale|Trade]
 
-To [Browse|Buy|Cherish|Hire|Keep|Love|Own|Try]
+To [Browse|Buy|Cherish|Hire|Keep|Love|Own|Peruse|Trial|Try]
 
 [Inc|LTD|PLC|GmbH|LLC|Unlimited|Incorporated]
 %%%%
-of connector
-
-For
-
-O'
-
-Of
-%%%%
 shop suffix singular
 
 @plain shop suffix@
@@ -949,9 +1117,15 @@ antique noun
 
 Antique
 
+Artifact
+
 Artware
 
 Collectable
+
+Furnishing
+
+Vase
 %%%%
 antique noun singular
 
@@ -963,6 +1137,8 @@ Antiquity
 Curiosity
 
 Furniture
+
+Pottery
 %%%%
 antique noun plural
 
@@ -976,19 +1152,27 @@ Classics
 Curiosities
 
 Furniture
+
+Potteries
 %%%%
 antique shop suffix
 
 Auction[|eer|eers| House]
 
-Bargain Basement
+Bargain [Basement|Bin]
 
-[Coin|Dime|Dollar|Ingot|Penny|Pound] [Shop|Shoppe|Store]
+Collectors
+
+[Coin|Dime|Dollar|Ingot|Penny|Pound] [Land|Shop|Shoppe|Store]
 
 Exchange
 
 Museum
 
+Pawn @shop suffix singular@
+
+Potters
+
 Roadshow
 
 Trad[e|ers|ing]
@@ -1225,6 +1409,8 @@ Pit
 Rack
 
 Range
+
+Smiths
 %%%%
 any weapon prefix
 
@@ -1315,14 +1501,20 @@ w:2
 ###############################################################################
 armour subtype
 
+Body[suit|wear]
+
 Boot
 
+[Foot|Hand|Head][gear|wear]
+
 Gauntlet
 
 Glove
 
 Hat
 
+Head
+
 Helm[et|]
 
 Hide
@@ -1350,6 +1542,10 @@ Armour
 
 Costume
 
+Couture
+
+Fashion
+
 Suit
 
 Thread
@@ -1369,6 +1565,8 @@ Finery
 
 Gear
 
+Streetwear
+
 @damage synonym@ [Reducer|Avoider|Preventer]
 %%%%
 armour noun plural
@@ -1386,14 +1584,14 @@ Fineries
 
 Gear
 
-Wear
-
 @damage synonym@ [Reduction|Avoidance|Prevention]
 %%%%
 armour adjective
 
 Comfortable
 
+Designer
+
 Eyecatching
 
 Fashionable
@@ -1418,17 +1616,23 @@ armour shop suffix
 
 Catwalk
 
-Rack
+Costumery
 
-Show
+Couturier
 
-Stand
+Mannequins
+
+Pageant
+
+Parade
+
+Rack
+
+[|Fashion ]Show
 
 Tannery
 
 Tailor[s|]
-
-Workshop
 %%%%
 any plain armour prefix
 
@@ -1521,6 +1725,8 @@ w:2
 ###############################################################################
 jewellery noun
 
+Amulet
+
 [B|Sp]angle
 
 Bauble
@@ -1529,6 +1735,24 @@ Bracelet
 
 Chain
 
+Charm
+
+Choker
+
+Crystal
+
+Facet
+
+Fibula
+
+Filigree
+
+Garnet
+
+Gem[|stone]
+
+Heirloom
+
 Jewel
 
 Keepsake
@@ -1541,7 +1765,7 @@ Memento
 
 Pendant
 
-[Engagement |Diamond |][Ring|Band|Circlet]
+[Engagement |Diamond |Fashion ][Ring|Band|Circlet]
 
 Tiara
 
@@ -1558,6 +1782,8 @@ Accessory
 
 Bling
 
+Brooch
+
 Jewellery
 
 Silverware
@@ -1571,6 +1797,8 @@ Accessories
 
 Bling
 
+Brooches
+
 Jeweller[s|ies]
 
 Silverware
@@ -1579,12 +1807,31 @@ jewellery shop suffix
 
 Box[| Of Delights]
 
+[Display|Presentation] Case
+
+Dealer
+
 Engraver
 
+Gemmologist
+
+Gilders
+
+[Gold|Silver]smith
+
+Horologist
+
+Jeweller
+
+Lapidary
+
+[Gold|Silver|Diamond] Mine
+
 Salon
 
 Vault
 
+Watchmaker
 # TODO: Good suffixes are very thin on the ground here. They all seem to overlap with general/fancy shops or sound awkward.
 # Some overlap with armour/clothing as well.
 # What we need to do is drop the usual noun/suffix structure (at least, make it less commmon, and use the standard
@@ -1794,6 +2041,8 @@ Bar
 
 Brewery
 
+Distillery
+
 Inn[|e]
 
 Hotel
@@ -1817,8 +2066,6 @@ Cafe
 
 Dispensary
 
-Distillery
-
 Hostel[|ry]
 
 Lab[oratory|]
@@ -1884,6 +2131,28 @@ potion shop plural
 w:5
 @potion synonym plural@ @vague shop suffix@
 %%%%
+person noun
+
+Angel
+
+Emperor
+
+Judge
+
+King
+
+Lord
+
+Monarch
+
+Prince[|ss]
+
+Queen
+
+Ratcatcher
+
+Sailor
+%%%%
 animal noun
 
 Bee
@@ -1976,28 +2245,6 @@ Onion
 
 Tree
 %%%%
-person noun
-
-Angel
-
-Emperor
-
-Judge
-
-King
-
-Lord
-
-Monarch
-
-Prince[|ss]
-
-Queen
-
-Ratcatcher
-
-Sailor
-%%%%
 misc adjective
 
 Broken
@@ -2042,6 +2289,9 @@ traditional bar name
 @ye olde@ @person or animal@'s @body part noun@
 
 @ye olde@ @random noun@ [&|And] @random noun@
+
+[Ye|The] @plain shopkeeper prefix@ @person or animal@
+
 %%%%
 ###############################################################################
 # Entrypoint: Potion Shop
@@ -2069,7 +2319,7 @@ Bill
 
 Bulletin
 
-Scroll
+Leaflet
 
 Note
 
@@ -2087,6 +2337,8 @@ Print
 
 Roll
 
+Scroll
+
 Ticket
 %%%%
 scroll noun singular
@@ -2118,6 +2370,8 @@ Writers
 [Printing |Inking |]Press
 
 News[|agent|tand]
+
+Stationers
 # TODO: It's hard to avoid crossover with books for scroll adjectives. Maybe
 # We need to separate the list for ones that can apply to either and ones
 # that are best suited to a specific one.
@@ -2406,6 +2660,8 @@ Evokable
 
 Invention
 
+[|Spare ]Part
+
 Tool
 
 Toy
@@ -2446,6 +2702,8 @@ Nest
 
 Lab[oratory]
 
+Repairs
+
 Shed
 
 Work[bench|shop]
@@ -2464,10 +2722,13 @@ Incomprehensible
 
 Practical
 
+Recharged
+
 Useful
 %%%%
 any gadget adjective
 
+w:15
 @gadget adjective@
 
 w:5