diff --git a/plugins/util/namefiles/items.nam b/plugins/util/namefiles/items.nam
index 51e466f..632e9da 100644
--- a/plugins/util/namefiles/items.nam
+++ b/plugins/util/namefiles/items.nam
@@ -2,88 +2,90 @@
 Item names
 By Kimmo "Arkhan" Kulovesi
 [first]
-Sword
-Sword
-Wand
-Cloak
-Robe
-Stick
-Staff
-Ring
-Amulet
-Axe
-Hammer
-Shield
-Halberd
-Scythe
-Scroll
-Book
-Book
-Armor
-Dagger
-Bow
-Lance
-Mace
-Flail
-Javelin
-Dart
-Scourge
-Spear
-Sling
-Rapier
-Coin
-Trident
-Whip
-Crown
-Jewel
-Ruby
-Hoopak
-Orb
-Needle
-Pin
+Sword 
+Sword 
+Wand 
+Cloak 
+Robe 
+Stick 
+Staff 
+Ring 
+Amulet 
+Axe 
+Hammer 
+Shield 
+Halberd 
+Scythe 
+Scroll 
+Book 
+Book 
+Armor 
+Dagger 
+Bow 
+Lance 
+Mace 
+Flail 
+Javelin 
+Dart 
+Scourge 
+Spear 
+Sling 
+Rapier 
+Coin 
+Trident 
+Whip 
+Crown 
+Jewel 
+Ruby 
+Hoopak 
+Orb 
+Needle 
+Pin 
+Token 
+Helm 
 [mid]
- of
+of 
 [final]
- Valor
- Magic
- Power
- Light
- Kings
- Knights
- Shadows
- Chaos
- Flame
- Faith
- Fire
- Death
- Sorcery
- Stoning
- Hope
- Healing
- Pain
- Hurting
- Belar
- Slaying
- Haste
- Avatar
- Virtue
- the Way
- Angels
- Devils
- Speed
- Flying
- Seeing
- Love
- Hatred
- Nagash
- Sauron
- Arthur
- Ending
- Torak
- Aldur
- Time
- Evil
- Morgoth
- Lucifer
- Arkhan
+Valor
+Magic
+Power
+Light
+Kings
+Knights
+Shadows
+Chaos
+Flame
+Faith
+Fire
+Death
+Sorcery
+Stoning
+Hope
+Healing
+Pain
+Hurting
+Belar
+Slaying
+Haste
+Avatar
+Virtue
+the Way
+Angels
+Devils
+Speed
+Flying
+Seeing
+Love
+Hatred
+Nagash
+Sauron
+Arthur
+Ending
+Torak
+Aldur
+Time
+Evil
+Morgoth
+Lucifer
+Arkhan
 [end]
diff --git a/plugins/util/namefiles/towns.nam b/plugins/util/namefiles/towns.nam
new file mode 100644
index 0000000..bc2cc51
--- /dev/null
+++ b/plugins/util/namefiles/towns.nam
@@ -0,0 +1,368 @@
+[inf]
+Town Names By _frozen, tweaked by Lukeroge
+[first]
+City 
+Town 
+Township 
+Hamlet 
+[mid]
+of 
+of 
+of 
+of 
+of 
+of 
+of North 
+of East 
+of Lake 
+of New 
+of West 
+of South 
+[final]
+Abington
+Acton
+Acushnet
+Adams
+Agawam
+Alford
+Amesbury
+Amherst
+Andover
+Arlington
+Ashburnham
+Ashby
+Ashfield
+Ashland
+Athol
+Attleboro
+Auburn
+Avon
+Ayer
+Barnstable
+Barre
+Becket
+Bedford
+Belchertown
+Bellingham
+Belmont
+Berkley
+Berlin
+Bernardston
+Beverly
+Billerica
+Blackstone
+Blackwood
+Blandford
+Bolton
+Boston
+Bourne
+Boxborough
+Boxford
+Boylston
+Braintree
+Brewster
+Bridgewater
+Brimfield
+Brockton
+Brookline
+Buckland
+Burlington
+Cambridge
+Canton
+Carlisle
+Carver
+Charlemont
+Charlton
+Chatham
+Chelmsford
+Chelsea
+Cheshire
+Chester
+Chesterfield
+Chicopee
+Chilmark
+Clarksburg
+Clinton
+Cohasset
+Colrain
+Concord
+Conway
+Cummington
+Dalton
+Danvers
+Dartmouth
+Dedham
+Deerfield
+Dennis
+Dighton
+Douglas
+Dover
+Dracut
+Dudley
+Dunstable
+Duxbury
+Eastham
+Easthampton
+Easton
+Edgartown
+Egremont
+Erving
+Essex
+Everett
+Fairhaven
+FallRiver
+Falmouth
+Fitchburg
+Florida
+Foxborough
+Framingham
+Franklin
+Freetown
+Gardner
+Aquinnah
+Georgetown
+Gill
+Gloucester
+Goshen
+Gosnold
+Grafton
+Granby
+Granville
+Barrington
+Greenfield
+Groton
+Groveland
+Hadley
+Halifax
+Hamilton
+Hampden
+Hancock
+Hanover
+Hanson
+Hardwick
+Harvard
+Harwich
+Hatfield
+Haverhill
+Hawley
+Heath
+Hingham
+Hinsdale
+Holbrook
+Holden
+Holland
+Holliston
+Holyoke
+Hopedale
+Hopkinton
+Hubbardston
+Hudson
+Hull
+Huntington
+Ipswich
+Kingston
+Lakeville
+Lancaster
+Lanesborough
+Lawrence
+Lee
+Leicester
+Lenox
+Leominster
+Leverett
+Lexington
+Leyden
+Lincoln
+Littleton
+Longmeadow
+Lowell
+Ludlow
+Lunenburg
+Lynn
+Lynnfield
+Malden
+Manchester
+Mansfield
+Marblehead
+Marion
+Marlborough
+Marshfield
+Mashpee
+Mattapoisett
+Maynard
+Medfield
+Medford
+Medway
+Melrose
+Mendon
+Merrimac
+Methuen
+Middleborough
+Middlefield
+Middleton
+Milford
+Millbury
+Millis
+Millville
+Milton
+Monroe
+Monson
+Montague
+Monterey
+Montgomery
+Washington
+Nahant
+Nantucket
+Natick
+Needham
+Ashford
+Bedford
+Braintree
+Marlborough
+Salem
+Newbury
+Newburyport
+Newton
+Norfolk
+Adams
+Andover
+Attleborough
+Brookfield
+Reading
+Westborough
+Eastbridge
+Norton
+Norwell
+Norwood
+OakBluffs
+Oakham
+Orange
+Orleans
+Otis
+Oxford
+Palmer
+Paxton
+Peabody
+Pelham
+Pembroke
+Pepperell
+Peru
+Petersham
+Phillipston
+Pittsfield
+Plainfield
+Plainville
+Plymouth
+Plympton
+Princeton
+Provincetown
+Quincy
+Randolph
+Raynham
+Reading
+Rehoboth
+Revere
+Richmond
+Rochester
+Rockland
+Rockport
+Rowe
+Rowley
+Royalston
+Russell
+Rutland
+Salem
+Salisbury
+Sandisfield
+Sandwich
+Saugus
+Savoy
+Scituate
+Seekonk
+Sharon
+Sheffield
+Shelburne
+Sherborn
+Shirley
+Shrewsbury
+Shutesbury
+Somerset
+Somerville
+Hadley
+Southampton
+Southborough
+Southbridge
+Southwick
+Spencer
+Springfield
+Sterling
+Stockbridge
+Stoneham
+Stoughton
+Stow
+Sturbridge
+Sudbury
+Sunderland
+Sutton
+Swampscott
+Swansea
+Taunton
+Templeton
+Tewksbury
+Tisbury
+Tolland
+Topsfield
+Townsend
+Truro
+Tyngsborough
+Tyringham
+Upton
+Uxbridge
+Wakefield
+Wales
+Walpole
+Waltham
+Ware
+Wareham
+Warren
+Warwick
+Washington
+Watertown
+Wayland
+Webster
+Wellesley
+Wellfleet
+Wendell
+Wenham
+Boylston
+Bridgewater
+Brookfield
+Newbury
+Springfield
+Stockbridge
+Tisbury
+Westborough
+Westfield
+Westford
+Westhampton
+Westminster
+Weston
+Westport
+Westwood
+Weymouth
+Whately
+Whitman
+Wilbraham
+Williamsburg
+Williamstown
+Wilmington
+Winchendon
+Winchester
+Windsor
+Winthrop
+Woburn
+Worcester
+Worthington
+Wrentham
+Yarmouth
+[end]