Updates for english and w.i.p. dutch jsons + fixes

Option menu tokens fixed
Typo in "HasControllerInput" function

P3D/Content/Localization/Tokens_nl.dat

@@ -168,29 +168,29 @@ option_screen_graphics_renderdistance_description,The render distance determines
 option_screen_graphics_renderdistance_tiny,Heel dichtbij
 option_screen_graphics_renderdistance short,Dichtbij
 option_screen_graphics_renderdistance_normal,Normaal
-option_screen_graphics_renderdistance_far, Ver
+option_screen_graphics_renderdistance_far,Ver
 option_screen_graphics_renderdistance_extreme,Extreem ver
-option_screen_graphics_offset_mapquality,Offset-kaart kwaliteit
+option_screen_graphics_offset_mapquality,Offset-level kwaliteit
 option_screen_graphics_offset_mapquality_description,Sets the quality of the offset maps.~The details and update frequency of offset maps increase with this value.~Set this value to 0 to prevent the game from loading offset maps.
 option_screen_graphics_offset_mapquality_off,Uit
 option_screen_graphics_graphics,Beeldkwaliteit
 option_screen_graphics_graphics_description,Affects if some objects are rendered~or not. By turning this down, you can improve your FPS.~This settings is for all save states.
 option_screen_graphics_graphics_fancy,Hoog
 option_screen_graphics_graphics_fast,Laag
-option_screen_graphics_multisampling,Multi Sampling
+option_screen_graphics_multisampling,Multi-sampling
 
-option_screen_battle,Gevecht
+option_screen_battle,Gevechten
 option_screen_battle_3dmodels,3D Modellen
 option_screen_battle_animations,Animaties
 option_screen_battle_animations_description,Determines if the game shows battle animations.
-option_screen_battle_battlestyle,Gevechtstijl
+option_screen_battle_battlestyle,Vechtstijl
 option_screen_battle_battlestyle_shift,Wisselen
 option_screen_battle_battlestyle_set,Doorgaan
 option_screen_battle_style_description,Battle Style~Set: You are not asked to switch out your Pokémon~Shift: You can switch out your Pokémon after defeating an opponent.
 
 option_screen_controls,Besturing
 option_screen_controls_xboxgamepad,Xbox Gamepad
-option_screen_controls_resetkeybindings,Toetsen Herstellen
+option_screen_controls_resetkeybindings,Toetskoppelingen herstellen
 option_screen_controls_cameraspeed,Camerasnelheid
 option_screen_controls_cameraspeed_description,The camera speed sets the speed on which the~mouse can rotate the view.
 option_screen_controls_cameraspeed_slow,...Traag...
@@ -510,8 +510,8 @@ Places_Cianwood City Gym,Gym van Cyaanhout-stad
 Places_Olivine City Gym,Gym van Olijvenrank-stad
 Places_Mahogany City Gym,Gym van Mahonie-dorp
 Places_Blackthorn City Gym,Gym van Sleedoorn-stad
-Places_Your House,Jouw Huis
+Places_Your House,Jouw huis
-Places_Your Room,Jouw Kamer
+Places_Your Room,Jouw kamer
 Places_Daycare,Dagopvang
 Places_Pewter City Gym,Gym van Pewter-stad
 Places_Cerulean City Gym,Gym van Hemelsblauw-stad
@@ -546,13 +546,13 @@ Places_Whirl Islands,Draaikolkeilanden
 Places_Lake of Rage,Woedemeer
 Places_Underground,Ondergronds
 Places_Dragon's Den,Drakennest
-Places_Tohjo Falls, Watervallen van Tohjo
+Places_Tohjo Falls,Watervallen van Tohjo
-Places_Victory Road,Victoriepad
+Places_Victory Road,Overwinningsweg
 Places_Mt. Silver,Zilverberg
 Places_Diamond Dive,Diamantduik
 Places_Safari Zone,Safarigebied
-Places_Viridian Forest,Bos van Viridian
+Places_Viridian Forest,Viridiaan-bos
-Places_Cerulean Cave,Grot van Cerulean
+Places_Cerulean Cave,Hemelsblauw-grot
 Places_Power Plant,Energiecentrale
 Places_Rock Tunnel,Rotstunnel
 Places_Seafoam Islands,Zeeschuimeilanden
@@ -570,13 +570,13 @@ Places_Pattern Bush,Patroonstruik
 Places_Dotted Hole,Stippelgat
 Places_Tanoby Chambers,Tanoby-kamers
 Places_Tanoby Key,Tanoby-sleutel
-Places_Monean Chamber,Monean-Kamer
+Places_Monean Chamber,Monean-kamer
-Places_Liptoo Chamber,Liptoo-Kamer
+Places_Liptoo Chamber,Liptoo-kamer
-Places_Weepth Chamber,Weepth-Kamer
+Places_Weepth Chamber,Weepth-kamer
-Places_Dilford Chamber,Dilford-Kamer
+Places_Dilford Chamber,Dilford-kamer
-Places_Scrufib Chamber,Scrufib-Kamer
+Places_Scrufib Chamber,Scrufib-kamer
-Places_Rixy Chamber,Rixy-Kamer
+Places_Rixy Chamber,Rixy-kamer
-Places_Viapois Chamber,Viapois-Kamer
+Places_Viapois Chamber,Viapois-kamer
 Places_Ancient Ruins,Oude Ruïnes
 Places_Millenial Star Tower,Duizendjarige Sterrentoren
 Places_Kolben Tower,Kolbentoren

P3D/Content/Localization/en.json

@@ -25,6 +25,7 @@
 			"gamemode": "GameMode",
 			"clear": "Clear",
 			"save": "Save",
+			"apply": "Apply",
 			"close": "Close",
 			"on": "On",
 			"off": "Off",
@@ -584,44 +585,81 @@
 		},
 		"option": {
 			"title": "Options",
-			"game": "Game",
+			"game": {
-			"graphics": "Graphics",
+				"title": "Game",
-			"battle": "Battle",
+				"textspeed": "Text Speed",
-			"controls": "Controls",
+				"view_bobbing": "View Bobbing",
-			"audio": "Audio",
+				"difficulty": {
-			"advanced": "Advanced",
+					"title": "Difficulty",
-			"game_text_speed": "Text Speed",
+					"easy": "Easy",
-			"game_difficulty": "Difficulty",
+					"hard": "Hard",
-			"game_difficulty_easy": "Easy",
+					"superhard": "Super Hard"
-			"game_difficulty_hard": "Hard",
+				}				
-			"game_difficulty_super_hard": "Super Hard",
+			},
-			"game_bobbing": "View bobbing",
+			"graphics": {
-			"graphics_fov": "Field of View",
+				"title": "Graphics",
-			"graphics_render_distance": "Render Distance",
+				"fov": "Field of View",
-			"graphics_render_distance_tiny": "Tiny",
+				"offset_map_quality": "Offset Map Quality",
-			"graphics_render_distance_small": "Small",
+				"multisampling": "Multi-sampling",
-			"graphics_render_distance_normal": "Normal",
+				"render_distance": {
-			"graphics_render_distance_far": "Far",
+					"title": "Render Distance",
-			"graphics_render_distance_extreme": "Extreme",
+					"tiny": "Tiny",
-			"graphics_offset_map_quality": "Offset Map quality",
+					"small": "Small",
-			"graphics_fast": "Fast",
+					"normal": "Normal",
-			"graphics_fancy": "Fancy",
+					"far": "Far",
-			"graphics_multisampling": "Multisampling",
+					"extreme": "Extreme"
-			"battle_3d_models": "3D Models",
+				},
-			"battle_animations": "Animations",
+				"graphics": {
-			"battle_style": "Battle Style",
+					"title": "Graphics",
-			"battle_style_shift": "Shift",
+					"fast": "Fast",
-			"battle_style_set": "Set",
+					"fancy": "Fancy"
-			"controls_mouse_speed": "Mouse Speed",
+				}
-			"controls_mouse_speed_slow": "Slowpoke",
+			},
-			"controls_mouse_speed_standard": "Standard",
+			"battle": {
-			"controls_mouse_speed_fast": "Fast",
+				"title": "Battle",
-			"controls_mouse_speed_super_fast": "Super Fast",
+				"3d_models": "3D Models",
-			"controls_reset_key_bindings": "Reset Key Bindings",
+				"animations": "Animations",
-			"controls_xbox_controler": "Xbox Controller",
+				"battle_style": {
-			"audio_music_volume": "Music Volume",
+					"title": "Battle Style",
-			"audio_sound_volume": "Sound Volume",
+					"shift": "Shift",
-			"audio_muted": "Muted",
+					"set": "Set"
+				}
+			},
+			"controls": {
+				"title": "Controls",
+				"reset_key_bindings": "Reset Key Bindings",
+				"xbox_controller": "Xbox Controller",
+				"running": {
+					"title": "Running",
+					"hold": "Hold",
+					"toggle": "Toggle"
+				},
+				"camera_speed": {
+					"title":"Camera Speed",
+					"slow": "...Slow...",
+					"medium": "Medium",
+					"fast": "Fast!",
+					"fastest": "SPEED OF LIGHT!"
+				}
+			},
+			"audio": {
+				"title": "Audio",
+				"music_volume": "Music Volume",
+				"sound_volume": "Sound Volume",
+				"muted": "Muted"
+			},
+			"contentpacks": {
+				"title1": "Content",
+				"title2": "Packs",
+				"up": "Up",
+				"down": "Down",
+				"information": {
+					"name": "Name",
+					"description": "Description",
+					"title": "Information",
+					"version": "Version",
+					"by": "By"
+			},
 			"reset": "Reset Options",
 			"language": "Language"
 		},

P3D/Content/Localization/nl.json

@@ -0,0 +1,777 @@
+{
+	"author": "JappaWakka",
+	"language_name": "Nederlands",
+	"version": "0.59",
+	"p3d": {
+		"global": {
+		  "login": "Log in"
+			"join": "Verbind",
+			"play": "Speel",
+			"refresh": "Ververs",
+			"new": "Nieuw",
+			"add": "Voeg toe",
+			"edit": "Pas aan",
+			"remove": "Verwijder",
+			"back": "Terug",
+			"please_wait": "Even geduld",
+			"loading": "Laden",
+			"game": "Spel",
+			"login": "Log in",
+			"male": "Man",
+			"female": "Vrouw",
+			"genderless": "Overig",
+			"yes": "Ja",
+			"no": "Nee",
+			"accept": "Bevestig",
+			"cancel": "Annuleer",
+			"gamemode": "Spelmodus",
+			"clear": "Wis",
+			"save": "Sla op",
+			"apply": "Pas toe",
+			"close": "Sluit",
+			"on": "Aan",
+			"off": "Uit",
+			"enabled": "Actief",
+			"disabled": "Niet actief",
+      "enable": "Activeer",
+      "disable": "Deactiveer",
+			"player_name": "Spelernaam",
+			"badges": "Badges",
+			"play_time": "Speeltijd",
+			"location": "Locatie",
+			"money": "Geld",
+			"points": "Punten",
+			"name": "Naam",
+			"order": "Volgorde",
+			"filter": "Filter",
+			"reset": "Herstel",
+			"true": "Goed",
+			"false": "Fout",
+			"select": "Selecteer",
+			"summary": "Overzicht",
+			"item": "Voorwerp",
+			"use": "Gebruik",
+			"give": "Geef",
+			"take": "Neem",
+			"toss": "Gooi weg",
+			"switch": "Verwissel",
+			"used": "Gebruikt"
+		},
+		"regions": {
+			"johto": "Johto",
+			"kanto": "Kanto",
+			"sevii_islands": "Sevii Eilanden"
+		},
+		"places": {
+			"???": "???",
+			"new_bark_town": "Plantenstek-dorp",
+			"cherrygrove_city": "Kersentuin-stad",
+			"violet_city": "Viooltjes-stad",
+			"azalea_town": "Azalea-dorp",
+			"goldenrod_city": "Guldenroede-stad",
+			"ecruteak_city": "Teakboom-stad",
+			"olivine_city": "Olijvenrank-stad",
+			"cianwood_city": "Cyaanhout-stad",
+			"mahogany_town": "Mahonie-dorp",
+			"blackthorn_city": "Sleedoorn-stad",
+			"pallet_town": "Palet-dorp",
+			"viridian_city": "Viridiaan-stad",
+			"saffron_city": "Saffraangeel-stad",
+			"pewter_city": "Pewter-stad",
+			"cerulean_city": "Hemelsblauw-stad",
+			"celadon_city": "Zeegroen-stad",
+			"vermilion_city": "Vermiljoen-stad",
+			"fuchsia_city": "Fuchsia-stad",
+			"cinnabar_island": "Cinnaber-eiland",
+			"lavender_town": "Lavendel-dorp",
+			"one_island": "Een-eiland",
+			"two_island": "Twee-eiland",
+			"three_island": "Drie-eiland",
+			"four_island": "Vier-eiland",
+			"five_island": "Vijf-eiland",
+			"six_island": "Zes-eiland",
+			"seven_island": "Zeven-eiland",
+			"gate": "Poort",
+			"pokemon_center": "Pokémon-Centrum",
+			"pokemon_mart": "Pokémon-Winkel",
+			"elms_lab": "Elm's Lab",
+			"oaks_lab": "Oak's Lab",
+			"azalea_town_gym": "Azalea-dorp Gym",
+			"violet_city_gym": "Viooltjes-stad Gym",
+			"goldenrod_city_gym": "Guldenroede-stad Gym",
+			"ecruteak_city_gym": "Teakboom-stad Gym",
+			"cianwood_city_gym": "Cyaanhout-stad Gym",
+			"olivine_city_gym": "Olijvenrank-stad Gym",
+			"mahogany_city_gym": "Mahonie-dorp Gym",
+			"blackthorn_city_gym": "Sleedoorn-stad Gym",
+			"your_house": "Jouw Huis",
+			"your_room": "Jouw Kamer",
+			"daycare": "Dagopvang",
+			"pewter_city_gym": "Pewter-stad Gym",
+			"cerulean_city_gym": "Hemelsblauw-stad Gym",
+			"vermilion_city_gym": "Vermiljoen-stad Gym",
+			"celadon_city_gym": "Zeegroen-stad Gym",
+			"fuchsia_city_gym": "Fuchsia-stad Gym",
+			"saffron_city_gym": "Saffraangeel-stad Gym",
+			"cinnabar_gym": "Cinnaber Gym",
+			"viridian_city_gym": "Viridiaan-stad Gym",
+			"dance_theater": "Danstheater",
+			"lighthouse": "Vuurtoren",
+			"team_rocket_hq": "Team Rocket's Basis",
+			"radio_tower": "Radiotoren",
+			"seaplane_port": "Watervliegtuighaven"
+			"ilex_forest": "Ilexbos",
+			"dark_cave": "Donkere Grot",
+			"ruins_of_alph": "Alf-ruïnes",
+			"slowpoke_well": "Slowpoke Waterput",
+			"sprout_tower": "Kiemtoren",
+			"union_cave": "Uniegrot",
+			"mt_mortar": "Mortierberg",
+			"bell_tower": "Tinnen Toren",
+			"tin_tower": "Tinnen Toren",
+			"tin_tower_peak": "Tinnen Torenpiek",
+			"burned_tower": "Verbrande Toren",
+			"glitter_lighthouse": "Glitter-vuurtoren",
+			"ice_path": "IJspad",
+			"national_park": "Nationaal Park",
+			"whirl_islands": "Draaikolkeilanden",
+			"lake_of_rage": "Woedemeer",
+			"underground": "Ondergronds",
+			"dragons_den": "Drakennest",
+			"tohjo_falls": "Watervallen van Tohjo",
+			"victory_road": "Overwinningsweg",
+			"mt_silver": "Zilverberg",
+			"indigo_plateau": "Indigo-toernooi",
+			"diamond_dive": "Diamantduik"
+			"safari_zone": "Safarigebied",
+			"viridian_forest": "Viridiaan-bos",
+			"cerulean_cave": "Hemelsblauw-grot",
+			"power_plant": "Energiecentrale",
+			"rock_tunnel": "Rotstunnel",
+			"seafoam_islands": "Zeeschuimeilanden",
+			"pal_park": "Maatjespark",
+			"digletts_cave": "Diglett's Grot",
+			"mt_moon": "Maanberg",
+			"mt_ember": "Sintelberg",
+			"three_isle_path": "Pad van Drie-eiland",
+			"berry_forest": "Bessenbos",
+			"icefall_cave": "IJsvalgrot",
+			"lost_cave": "Verloren Grot",
+			"trainer_tower": "Trainertoren",
+			"altering_cave": "Verandergrot",
+			"pattern_bush": "Patroonstruik",
+			"dotted_hole": "Stippelgat",
+			"tanoby_chambers": "Tanoby-kamers",
+			"tanoby_key": "Tanoby-sleutel",
+			"monean_chamber": "Monean-kamer",
+			"liptoo_chamber": "Liptoo-kamer",
+			"weepth_chamber": "Weepth-kamer",
+			"dilford_chamber": "Dilford-kamer",
+			"scrufib_chamber": "Scrufib-kamer",
+			"rixy_chamber": "Rixy-kamer",
+			"viapois_chamber": "Viapois-kamer",
+			"ancient_ruins": "Oude Ruïnes",
+			"millenial_star_tower": "Duizendjarige Sterrentoren",
+			"kolben_tower": "Kolbentoren",
+			"faraway_island": "Ver-weg-eiland",
+			"underwater_cave": "Onderwatergrot",
+			"embedded_tower": "Ingebouwde Toren",
+			"route_1": "Route 1",
+			"route_2": "Route 2",
+			"route_3": "Route 3",
+			"route_4": "Route 4",
+			"route_5": "Route 5",
+			"route_6": "Route 6",
+			"route_7": "Route 7",
+			"route_8": "Route 8",
+			"route_9": "Route 9",
+			"route_10": "Route 10",
+			"route_11": "Route 11",
+			"route_12": "Route 12",
+			"route_13": "Route 13",
+			"route_14": "Route 14",
+			"route_15": "Route 15",
+			"route_16": "Route 16",
+			"route_17": "Route 17",
+			"route_18": "Route 18",
+			"route_19": "Route 19",
+			"route_20": "Route 20",
+			"route_21": "Route 21",
+			"route_22": "Route 22",
+			"route_23": "Route 23",
+			"route_24": "Route 24",
+			"route_25": "Route 25",
+			"route_26": "Route 26",
+			"route_27": "Route 27",
+			"route_28": "Route 28",
+			"route_29": "Route 29",
+			"route_30": "Route 30",
+			"route_31": "Route 31",
+			"route_32": "Route 32",
+			"route_33": "Route 33",
+			"route_34": "Route 34",
+			"route_35": "Route 35",
+			"route_36": "Route 36",
+			"route_37": "Route 37",
+			"route_38": "Route 38",
+			"route_39": "Route 39",
+			"route_40": "Route 40",
+			"route_41": "Route 41",
+			"route_42": "Route 42",
+			"route_43": "Route 43",
+			"route_44": "Route 44",
+			"route_45": "Route 45",
+			"route_46": "Route 46",
+			"route_47": "Route 47",
+			"route_48": "Route 48",
+			"treasure_beach": "Schatkiststrand",
+			"kindle_road": "Ontstekingsweg",
+			"cape_brink": "Kaapse Brink",
+			"three_isle_port": "Haven van Drie-eiland",
+			"bond_bridge": "Verbondbrug",
+			"five_isle_meadow": "Weiland van Vijf-eiland",
+			"memorial_pillar": "Gedenkzuil",
+			"water_labyrinth": "Waterdoolhof",
+			"resort_gorgeous": "Schoonheidsparadijs",
+			"water_path": "Waterpad",
+			"green_path": "Groen Pad",
+			"outcast_island": "Verstotelingeneiland",
+			"ruin_valley": "Ruïnevallei",
+			"canyon_entrance": "Ravijningang",
+			"sevault_canyon": "Sevault-ravijn",
+			"tanoby_ruins": "Tanoby-ruïnes",
+			"safari_zone_gate": "Hek van de Safari-zone",
+			"ss_aqua": "S.S. Aqua",
+			"elite_4": "Elite 4",
+			"twirl_forest": "Ronddraaibos",
+			"berry_vista": "Bessenuitzicht",
+			"battle_frontier": "Vechtfrontier",
+			"battle_tower": "Vechttoren",
+			"battle_factory": "Vechtfabriek",
+			"rocket_warehouse": "Team Rocket Warenhuis",
+			"secret_laboratory": "Geheim Laboratorium"
+		},
+		"pokemon": {
+			"name": {
+				"bulbasaur": "Bulbasaur",
+				"ivysaur": "Ivysaur",
+				"venusaur": "Venusaur",
+				"charmander": "Charmander",
+				"charmeleon": "Charmeleon",
+				"charizard": "Charizard",
+				"squirtle": "Squirtle",
+				"wartortle": "Wartortle",
+				"blastoise": "Blastoise",
+				"caterpie": "Caterpie",
+				"metapod": "Metapod",
+				"butterfree": "Butterfree",
+				"weedle": "Weedle",
+				"kakuna": "Kakuna",
+				"beedrill": "Beedrill",
+				"pidgey": "Pidgey",
+				"pidgeotto": "Pidgeotto",
+				"pidgeot": "Pidgeot",
+				"rattata": "Rattata",
+				"raticate": "Raticate",
+				"spearow": "Spearow",
+				"fearow": "Fearow",
+				"ekans": "Ekans",
+				"arbok": "Arbok",
+				"pikachu": "Pikachu",
+				"raichu": "Raichu",
+				"sandshrew": "Sandshrew",
+				"sandshlash": "Sandslash",
+				"nidoran": "Nidoran",
+				"nidorina": "Nidorina",
+				"nidoqueen": "Nidoqueen",
+				"nidorino": "Nidorino",
+				"nidoking": "Nidoking",
+				"clefairy": "Clefairy",
+				"clefable": "Clefable",
+				"vulpix": "Vulpix",
+				"ninetails": "Ninetails",
+				"jigglypuff": "Jigglypuff",
+				"wigglytuff": "Wigglytuff",
+				"zubat": "Zubat",
+				"golbat": "Golbat",
+				"oddish": "Oddish",
+				"gloom": "Gloom",
+				"vileplume": "Vileplume",
+				"paras": "Paras",
+				"parasect": "Parasect",
+				"venonat": "Venonat",
+				"venomoth": "Venomoth",
+				"diglett": "Diglett",
+				"dugtrio": "Dugtrio",
+				"meowth": "Meowth",
+				"persian": "Persian",
+				"psyduck": "Psyduck",
+				"golduck": "Golduck",
+				"mankey": "Mankey",
+				"primeape": "Primeape",
+				"growlithe": "Growlithe",
+				"arcanine": "Arcanine",
+				"poliwag": "Poliwag",
+				"poliwhirl": "Poliwhirl",
+				"poliwrath": "Poliwrath",
+				"abra": "Abra",
+				"kadabra": "Kadabra",
+				"alakazam": "Alakazam",
+				"machop": "Machop",
+				"machoke": "Machoke",
+				"machamp": "Machamp",
+				"bellsprout": "Bellsprout",
+				"weepinbell": "Weepinbell",
+				"victreebel": "Victreebel",
+				"tentacool": "Tentacool",
+				"tentacruel": "Tentacruel",
+				"geodude": "Geodude",
+				"graveler": "Graveler",
+				"golem": "Golem",
+				"ponyta": "Ponyta",
+				"rapidash": "Rapidash",
+				"slowpoke": "Slowpoke",
+				"slowbro": "Slowbro",
+				"magnemite": "Magnemite",
+				"magneton": "Magneton",
+				"farfetchd": "Farfetch'd",
+				"doduo": "Doduo",
+				"dodrio": "Dodrio",
+				"seel": "Seel",
+				"dewgong": "Dewgong",
+				"grimer": "Grimer",
+				"muk": "Muk",
+				"shellder": "Shellder",
+				"cloyster": "Cloyster",
+				"gastly": "Gastly",
+				"haunter": "Haunter",
+				"gengar": "Gengar",
+				"onix": "Onix",
+				"drowzee": "Drowzee",
+				"hypno": "Hypno",
+				"krabby": "Krabby",
+				"kingler": "Kingler",
+				"voltorb": "Voltorb",
+				"electrode": "Electrode",
+				"exeggcute": "Exeggcute",
+				"exeggutor": "Exeggutor",
+				"cubone": "Cubone",
+				"marowak": "Marowak",
+				"hitmonlee": "Hitmonlee",
+				"hitmonchan": "Hitmonchan",
+				"lickitung": "Lickitung",
+				"koffing": "Koffing",
+				"weezing": "Weezing",
+				"rhyhorn": "Rhyhorn",
+				"rhydon": "Rhydon",
+				"chansey": "Chansey",
+				"tangela": "Tangela",
+				"kangaskhan": "Kangaskhan",
+				"horsea": "Horsea",
+				"seedra": "Seedra",
+				"goldeen": "Goldeen",
+				"seaking": "Seaking",
+				"staryu": "Staryu",
+				"starmie": "Starmie",
+				"mr_mime": "Mr. Mime",
+				"scyther": "Scyther",
+				"jynx": "Jynx",
+				"electabuzz": "Electabuzz",
+				"magmar": "Magmar",
+				"pinsir": "Pinsir",
+				"tauros": "Tauros",
+				"magikarp": "Magikarp",
+				"gyarados": "Gyarados",
+				"lapras": "Lapras",
+				"ditto": "Ditto",
+				"eevee": "Eevee",
+				"vaporeon": "Vaporeon",
+				"jolteon": "Jolteon",
+				"flareon": "Flareon",
+				"porygon": "Porygon",
+				"omanyte": "Omanyte",
+				"omastar": "Omastar",
+				"kabuto": "Kabuto",
+				"kabutops": "Kabutops",
+				"aerodactyl": "Aerodactyl",
+				"snorlax": "Snorlax",
+				"articuno": "Articuno",
+				"zapdos": "Zapdos",
+				"moltres": "Moltres",
+				"dratini": "Dratini",
+				"dragonair": "Dragonair",
+				"dragonite": "Dragonite",
+				"mewtwo": "Mewtwo",
+				"mew": "Mew",
+				"chikorita": "Chikorita",
+				"bayleef": "Bayleef",
+				"meganium": "Meganium",
+				"cyndaquil": "Cyndaquil",
+				"quilava": "Quilava",
+				"typhlosion": "Typhlosion",
+				"totodile": "Totodile",
+				"croconaw": "Croconaw",
+				"feraligatr": "Feraligatr",
+				"sentret": "Sentret",
+				"furret": "Furret",
+				"hoothoot": "Hoothoot",
+				"noctowl": "Noctowl",
+				"ledyba": "Ledyba",
+				"ledian": "Ledian",
+				"spinarak": "Spinarak",
+				"ariados": "Ariados",
+				"crobat": "Crobat",
+				"chinchou": "Chinchou",
+				"lanturn": "Lanturn",
+				"pichu": "Pichu",
+				"cleffa": "Cleffa",
+				"igglybuff": "Igglybuff",
+				"togepi": "Togepi",
+				"togetic": "Togetic",
+				"natu": "Natu",
+				"xatu": "Xatu",
+				"mareep": "Mareep",
+				"flaaffy": "Flaaffy",
+				"ampharos": "Ampharos",
+				"bellossom": "Bellossom",
+				"marill": "Marill",
+				"azumarill": "Azumarill",
+				"sudowoodo": "Sudowoodo",
+				"politoed": "Politoed",
+				"hoppip": "Hoppip",
+				"skiploom": "Skiploom",
+				"jumpluff": "Jumpluff",
+				"aipom": "Aipom",
+				"sunkern": "Sunkern",
+				"sunflora": "Sunflora",
+				"yanma": "Yanma",
+				"wooper": "Wooper",
+				"quagsire": "Quagsire",
+				"espeon": "Espeon",
+				"umbreon": "Umbreon",
+				"murkrow": "Murkrow",
+				"slowking": "Slowking",
+				"misdreavus": "Misdreavus",
+				"unown": "Unown",
+				"wobbuffet": "Wobbuffet",
+				"girafarig": "Girafarig",
+				"pineco": "Pineco",
+				"forretress": "Forretress",
+				"dunsparce": "Dunsparce",
+				"gligar": "Gligar",
+				"steelix": "Steelix",
+				"snubbull": "Snubbull",
+				"granbull": "Granbull",
+				"qwilfish": "Qwilfish",
+				"scizor": "Scizor",
+				"shuckle": "Shuckle",
+				"heracross": "Heracross",
+				"sneasel": "Sneasel",
+				"teddiursa": "Teddiursa",
+				"ursaring": "Ursaring",
+				"slugma": "Slugma",
+				"magcargo": "Magcargo",
+				"swinub": "Swinub",
+				"piloswine": "Piloswine",
+				"corsola": "Corsola",
+				"remoraid": "Remoraid",
+				"octillery": "Octillery",
+				"delibird": "Delibird",
+				"mantine": "Mantine",
+				"skarmory": "Skarmory",
+				"houndour": "Houndour",
+				"houndoom": "Houndoom",
+				"kingdra": "Kingdra",
+				"phanpy": "Phanpy",
+				"donphan": "Donphan",
+				"porygon2": "Porygon2",
+				"stantler": "Stantler",
+				"smeargle": "Smeargle",
+				"tyrogue": "Tyrogue",
+				"hitmontop": "Hitmontop",
+				"smoochum": "Smoochum",
+				"elekid": "Elekid",
+				"magby": "Magby",
+				"miltank": "Miltank",
+				"blissey": "Blissey",
+				"raikou": "Raikou",
+				"entei": "Entei",
+				"suicune": "Suicune",
+				"larvitar": "Larvitar",
+				"pupitar": "Pupitar",
+				"tyranitar": "Tyranitar",
+				"lugia": "Lugia",
+				"ho-oh": "Ho-Oh",
+				"celebi": "Celebi"
+			},
+			"type": {
+				"normal": "Normaal",
+				"fire": "Vuur",
+				"flying": "Vlieg",
+				"fighting": "Vecht",
+				"water": "Water",
+				"grass": "Gras",
+				"poison": "Gif",
+				"ground": "Grond",
+				"electric": "Electrisch",
+				"psychic": "Psychisch",
+				"rock": "Rots",
+				"ice": "IJs",
+				"bug": "Insect",
+				"dragon": "Draak",
+				"ghost": "Geest",
+				"dark": "Duister",
+				"steel": "Staal",
+				"fairy": "Fee",
+				"blank": "Blanco"
+			},
+			"move": {
+				"fly": "Vlieg",
+				"ride": "Rijd",
+				"rocksmash" : "Steenknal"
+				"flash": "Flits",
+				"cut": "Snijd",
+				"teleport": "Teleporteer",
+				"dig": "Graaf"
+			}
+		},
+		"pressstartscreen": {
+			"press_first": "Druk op",
+			"press_last": "om te beginnen.",
+			"change_to": "Verander naar",
+			"reset_save": "Herstart opslagspel",
+			"select_gamemode_1": "Selecteer een Spelmodus",
+			"select_gamemode_2": "om een nieuw spel mee te beginnen."
+		},
+		"joinserverscreen": {
+			"title": "Kies waar je wil spelen",
+			"protocol_version": "Protocolversie",
+			"single_player_name": "Lokaal",
+			"single_player_message": "Één-spelerspel: Speel op je lokale computer.",
+			"received_error": "Kan de server niet bereiken.",
+			"pinged": "Server online",
+			"polling": "Aan het peilen",
+			"no_connection": "Geen verbinding",
+			"full": "De server is vol.",
+			"version_mismatch": "Spelversie match niet met de serverversie.",
+			"ping": "Ping",
+			"no_players": "Geen spelers op de server.",
+			"player_list": "Spelerlijst"
+		},
+		"overworldscreen": {
+			"connecting_to_server": "Aan het verbinden met de server."
+		},
+		"addserverscreen": {
+			"title": "Voeg server toe",
+			"name": "Server-naam",
+			"address": "Server-adres"
+		},
+		"pausescreen": {
+			"title": "Spelmenu",
+			"back_to_game": "Terug naar spel",
+			"quit_to_menu": "Naar het hoofdmenu",
+			"autosave_fail": "Kan niet automatisch opslaan.",
+			"confirmation": "Wil je het spel echt verlaten? Niet-opgeslagen gegevens zullen verloren gaan."
+		},
+		"characterselectionscreen": {
+			"select_appearance": "Selecteer je uiterlijk."
+		},
+		"menu_bag": {
+			"title": "Tas"
+		},
+		"offline_game": {
+			"title": "Begin een nieuw offline spel",
+			"description": "Als je een spel begint in \"\"Offline-modus\"\" door op de \"\"Nieuw Spel\"\" knop te drukken, kun je niet gebruik maken van de online-functionaliteit van Pokémon 3D zoals ruilen en het aanpassen van je trainer's uiterlijk. Druk op de GameJolt-knop in het hoofdmenu om een spel te beginnen in \"\"Online-modus\"\"."
+		},
+		"mapscreen": {
+			"cities": "Steden",
+			"routes": "Routes",
+			"places": "Plekken",
+			"roaming": "Dwalende Pokémon"
+		},
+		"option": {
+			"title": "Opties",
+			"game": "Spel",
+			"graphics": "Beeld",
+			"battle": "Gevechten",
+			"controls": "Besturing",
+			"audio": "Geluid",
+			"advanced": "Geavanceerd",
+			"game_text_speed": "Tekstsnelheid",
+			"game_difficulty": "Moeilijkheidsgraad",
+			"game_difficulty_easy": "Makkelijk",
+			"game_difficulty_hard": "Moeilijk",
+			"game_difficulty_super_hard": "Supermoeilijk",
+			"game_bobbing": "Loopbeweging",
+			"graphics_fov": "Gezichtsveld",
+			"graphics_render_distance": "Renderafstand",
+			"graphics_render_distance_tiny": "Heel dichtbij",
+			"graphics_render_distance_small": "Dichtbij",
+			"graphics_render_distance_normal": "Normaal",
+			"graphics_render_distance_far": "Ver",
+			"graphics_render_distance_extreme": "Extreem ver",
+			"graphics_offset_map_quality": "Offset-level kwaliteit",
+			"graphics_fast": "Laag",
+			"graphics_fancy": "Hoog",
+			"graphics_multisampling": "Multi-sampling",
+			"battle_3d_models": "3D Modellen",
+			"battle_animations": "Animaties",
+			"battle_style": "Vechtstijl",
+			"battle_style_shift": "Wisselen",
+			"battle_style_set": "Doorgaan",
+			"controls_mouse_speed": "Camerasnelheid",
+			"controls_mouse_speed_slow": "..Traag...",
+			"controls_mouse_speed_standard": "Standaard",
+			"controls_mouse_speed_fast": "Snel!",
+			"controls_mouse_speed_super_fast": "LICHTSNELHEID!",
+			"controls_reset_key_bindings": "Toetskoppelingen herstellen",
+			"controls_xbox_controller": "Xbox Controller",
+			"audio_music_volume": "Music Volume",
+			"audio_sound_volume": "Sound Volume",
+			"audio_muted": "Muted",
+			"reset": "Reset Options",
+			"language": "Language"
+		},
+		"save": {
+			"title_1": "Would you like to",
+			"title_2": "save the game?",
+			"saving_failed": "Saving failed!",
+			"saved_game": "Saved the game",
+			"press_continue_1": "Press",
+			"press_continue_2": "to continue",
+			"saving": "Saving, please wait",
+			"validating": "Validating data"
+		},
+		"trainer_card": {
+			"title": "Trainer Card",
+			"collected_badges": "Collected Badges",
+			"badge": "Badge"
+		},
+		"pokedex": {
+			"select": "Select a Pokédex",
+			"habitat": "Habitat-Dex",
+			"habitat_select": "Select a Habitat",
+			"seen": "Seen",
+			"obtained": "Obtained",
+			"available": "Available",
+			"search_description": "Press Q on the keyboard to search",
+			"search_no_result": "No search results",
+			"order_numeric": "Numeric",
+			"order_a_z": "A-Z",
+			"filter_none": "None",
+			"filter_name": "Name",
+			"filter_type_1": "Type 1",
+			"filter_type_2": "Type 2",
+			"number_short": "No.",
+			"species": "Species",
+			"type": "Type",
+			"reverse": "Reverse",
+			"height": "Height",
+			"weight": "Weight"
+		},
+		"inventory": {
+			"title": "Inventory",
+			"tab_standard": "Standard",
+			"tab_medicine": "Medicine",
+			"tab_plants": "Plants",
+			"tab_pokeball": "Pokéball",
+			"tab_tm_hm": "TM/HM",
+			"tab_mail": "Mail",
+			"tab_battle_items": "Battle Items",
+			"tab_key_items": "Key Items",
+			"eggs_cannot_hold": "Eggs cannot hold items",
+			"item_type_tm": "Technical Machine",
+			"item_type_hm": "Hidden Machine",
+			"item_type_standard": "Item",
+			"item_type_key_item": "Key Item",
+			"item_type_pokeball": "Pokéball",
+			"item_type_plant": "Plant",
+			"item_type_battle_item": "Battle Item",
+			"toss_item_question": "Are you sure you want to toss~this item?%Yes|No%",
+			"toss_item_question_amount": "Select the amount to toss",
+			"give_item_gave": "Gave",
+			"give_item_a": "a",
+			"switched_item_switched": "Switched",
+			"switched_item_with_a": "with a"
+		},
+		"donation": {
+			"donators": "Donators",
+			"close": "Press E to close"
+		},
+		"game_message": {
+			"lighting": "Lighting",
+			"xbox_controller": "Xbox Controller support",
+			"screenshot": "Screenshot saved as",
+			"fullscreen": "Fullscreen",
+			"third_person": "Third person mode",
+			"free_camera": "Free camera mode",
+			"audio": "Audio"
+		},
+		"party_screen": {
+			"title": "Pokémon",
+			"choose_a_pokemon": "Choose a Pokémon",
+			"field_move": "Field Move",
+			"able": "Able",
+			"unable": "Unable",
+			"cannot_choose": "You cannot choose~this Pokémon.",
+			"mail_taken": "The Mail was taken to your inbox on your PC.",
+			"take_item_1": "Taken",
+			"take_item_2": "from",
+			"give_item_mail_1": "Gave",
+			"give_item_mail_2": "to",
+			"give_item_mail_3": "and took the Mail to the PC",
+			"switched_item_1": "Switched",
+			"switched_item_2": "with a",
+			"give_item_1": "Gave",
+			"give_item_2": "a",
+			"cannot_give": "cannot be given to a Pokémon",
+			"cannot_fly": "You cannot Fly~from here",
+			"cannot_cut": "There is nothing~to be Cut",
+			"cannot_ride": "You cannot Ride here",
+			"cannot_dig": "You cannot use Dig here",
+			"cannot_teleport": "You cannot use Teleport here",
+			"flash_lit": "The area got lit up",
+			"flash_already_lit": "The area is already~lit up"
+		},
+		"weather": {
+			"sunny": "Sunny",
+			"rain": "Rain",
+			"sandstorm": "Sandstorm",
+			"hailstorm": "Hailstorm",
+			"foggy": "Foggy",
+			"snow": "Snow"
+		},
+		"terrain": {
+			"electric": "Electric Terrain",
+			"grassy": "Grassy Terrain",
+			"misty": "Misty Terrain",
+			"psychic": "Psychic Terrain"
+		},
+		"battlesystem": {
+			"battlescreen": {
+				"menu_battle": "Battle",
+				"menu_pokemon": "Pokémon",
+				"menu_bag": "Bag",
+				"menu_run": "Run",
+				"menu_surrender": "Surrender",
+				"got_away_safely": "Got away safely!",
+				"run_away_failed": "Failed to run away."
+			}
+		},
+		"summaryscreen": {
+			"type": "Type",
+			"item": "Item",
+			"nature": "Nature",
+			"dexno": "Dex No.",
+			"idno": "ID No.",
+			"ability": "Ability",
+			"catch_method": "Catch Method",
+			"exp_points": "Exp. Points",
+			"to_next_lv": "To next Lv.",
+			"egg_low": "It looks like this Egg will~take a long time to hatch.",
+			"egg_medium": "It's getting warmer and moves~a little. It will hatch soon.",
+			"egg_high": "There is strong movement~noticeable. It will hatch soon!",
+			"egg_watch": "The Egg Watch"
+		}
+	}
+}

P3D/Input/ControllerHandler.vb

@@ -53,7 +53,7 @@
         Return (GamePad.GetState(CType(index, PlayerIndex)).IsConnected = True And Core.GameOptions.GamePadEnabled = True)
     End Function
 
-    Public Shared Function HasControlerInput(Optional ByVal index As Integer = 0) As Boolean
+    Public Shared Function HasControllerInput(Optional ByVal index As Integer = 0) As Boolean
         If IsConnected() = False Then
             Return False
         End If

P3D/Input/Controls.vb

@@ -350,7 +350,7 @@
                 Core.GameInstance.IsMouseVisible = True
             End If
         ElseIf Core.GameInstance.IsMouseVisible = True Then
-            If ControllerHandler.HasControlerInput() = True Or Controls.HasKeyboardInput() = True Then
+            If ControllerHandler.HasControllerInput() = True Or Controls.HasKeyboardInput() = True Then
                 Core.GameInstance.IsMouseVisible = False
             End If
         End If

P3D/Network/GameJolt/GTS/WonderTradeScreen.vb

@@ -222,7 +222,7 @@
                         End If
                     End If
                 Case ScreenStates.Stopped
-                    If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
+                    If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControllerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
                         SoundManager.PlaySound("select")
                         CloseScreen()
                     End If

P3D/Network/Servers/DirectTradeScreen.vb

@@ -229,7 +229,7 @@
             Case ScreenStates.Idle
                 Me.UpdateIdle()
             Case ScreenStates.Stopped
-                If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
+                If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControllerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
                     SoundManager.PlaySound("select")
                     Core.SetScreen(Me.PreScreen)
                 End If

P3D/Network/Servers/PVPLobbyScreen.vb

@@ -133,7 +133,7 @@
             Case ScreenStates.Idle
                 Me.UpdateIdle()
             Case ScreenStates.Stopped
-                If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControlerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
+                If KeyBoardHandler.GetPressedKeys().Count > 0 Or ControllerHandler.HasControllerInput() = True Or Controls.Accept() = True Or Controls.Dismiss() = True Then
                     SoundManager.PlaySound("select")
                     Core.SetScreen(Me.PreScreen)
                 End If

P3D/Screens/MainMenu/PressStartScreen.vb

@@ -1282,14 +1282,14 @@ Public Class NewMainMenuScreen
                 Dim textB As String = ""
                 Select Case _OptionsMenuIndex
                     Case 0
-                        textA = Localization.Translate("main_menu_options_language", "Language")
+                        textA = Localization.Translate("option.language", "Language")
                     Case 1
-                        textA = Localization.Translate("main_menu_options_audio", "Audio")
+                        textA = Localization.Translate("option.audio.title", "Audio")
                     Case 2
-                        textA = Localization.Translate("main_menu_options_controls", "Controls")
+                        textA = Localization.Translate("option.controls.title", "Controls")
                     Case 3
-                        textA = Localization.Translate("main_menu_options_contentpacks_line1", "Content")
+                        textA = Localization.Translate("option.contentpacks.title1", "Content")
-                        textB = Localization.Translate("main_menu_options_contentpacks_line2", "Packs")
+                        textB = Localization.Translate("option.contentpacks.title2", "Packs")
                 End Select
 
                 If _OptionsMenuIndex <> 3 Then

P3D/Screens/NewOptionScreen.vb

@@ -63,6 +63,7 @@
     Private _pageFade As Single = 1.0F
     Private _pageOpening As Boolean = False
     Private _pageClosing As Boolean = False
+    Private Language As Integer
 
     'cursor animation:
     Private _cursorPosition As Vector2 = New Vector2(CInt(Core.windowSize.Width / 2) - 400 + 90, CInt(Core.windowSize.Height / 2) - 200 + 80)
@@ -403,10 +404,10 @@
         Dim s() As String = ContentPackManager.GetContentPackInfo(packName)
 
         If s.Length > 0 Then
-            PInfoVersion = s(0).CropStringToWidth(FontManager.InGameFont, 540 - 16 - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_version")).X))
+            PInfoVersion = s(0).CropStringToWidth(FontManager.InGameFont, 540 - 16 - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.version")).X))
         End If
         If s.Length > 1 Then
-            PInfoAuthor = s(1).CropStringToWidth(FontManager.InGameFont, 540 - 16 - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_by")).X))
+            PInfoAuthor = s(1).CropStringToWidth(FontManager.InGameFont, 540 - 16 - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.by")).X))
         End If
         If s.Length > 2 Then
             PInfoDescription = s(2).CropStringToWidth(FontManager.InGameFont, 540)
@@ -427,12 +428,12 @@
 
         Dim CanvasTexture As Texture2D = TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), "")
 
-        Canvas.DrawRectangle(New Rectangle(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName).X / 2) - 32, CInt(Core.windowSize.Height / 2 - 144), CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName).X) + 64, 64), New Color(77, 147, 198, CInt(255 * _interfaceFade * _pageFade)))
+        Canvas.DrawRectangle(New Rectangle(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName).X / 2) - 32, CInt(Core.windowSize.Height / 2 - 144), CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName).X) + 64, 64), New Color(77, 147, 198, CInt(255 * _interfaceFade * _pageFade)))
-        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName, New Vector2(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName).X / 2) + 2, CInt(Core.windowSize.Height / 2 - 128 + 2)), New Color(0, 0, 0, CInt(255 * _interfaceFade * _pageFade)))
+        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName, New Vector2(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName).X / 2) + 2, CInt(Core.windowSize.Height / 2 - 128 + 2)), New Color(0, 0, 0, CInt(255 * _interfaceFade * _pageFade)))
-        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName, New Vector2(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option_screen_contentpacks_name") & ": " & PInfoName).X / 2), CInt(Core.windowSize.Height / 2 - 128)), New Color(255, 255, 255, CInt(255 * _interfaceFade * _pageFade)))
+        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName, New Vector2(CInt(windowSize.Width / 2) - CInt(FontManager.InGameFont.MeasureString(Localization.Translate("option.contentpacks.information.name", "Name") & ": " & PInfoName).X / 2), CInt(Core.windowSize.Height / 2 - 128)), New Color(255, 255, 255, CInt(255 * _interfaceFade * _pageFade)))
 
         Canvas.DrawRectangle(New Rectangle(CInt(windowSize.Width / 2) - 278, CInt(Core.windowSize.Height / 2 - 72), 556, 196), New Color(255, 255, 255, CInt(255 * _interfaceFade * _pageFade)))
-        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option_screen_contentpacks_version") & ": " & PInfoVersion & Environment.NewLine & Localization.Translate("option_screen_contentpacks_by") & ": " & PInfoAuthor & Environment.NewLine & Localization.Translate("option_screen_contentpacks_description") & ": " & Environment.NewLine & PInfoDescription.Replace("<br>", Environment.NewLine).Replace("~", Environment.NewLine), New Vector2(CInt(windowSize.Width / 2) - 278 + 16, CInt(Core.windowSize.Height / 2 - 64)), New Color(0, 0, 0, CInt(255 * _interfaceFade * _pageFade)))
+        SpriteBatch.DrawString(FontManager.InGameFont, Localization.Translate("option.contentpacks_version") & ": " & PInfoVersion & Environment.NewLine & Localization.Translate("option.contentpacks.information.by", "By") & ": " & PInfoAuthor & Environment.NewLine & Localization.Translate("option.contentpacks.information.description", "Description") & ": " & Environment.NewLine & PInfoDescription.Replace("<br>", Environment.NewLine).Replace("~", Environment.NewLine), New Vector2(CInt(windowSize.Width / 2) - 278 + 16, CInt(Core.windowSize.Height / 2 - 64)), New Color(0, 0, 0, CInt(255 * _interfaceFade * _pageFade)))
     End Sub
 
     Private Sub UpdatePackInformationMenu()
@@ -897,102 +898,102 @@
 
         Select Case ScreenIndex
             Case 0 ' Main Options menu.
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 80), 1, 64, Localization.Translate("option_screen_game", "Game"), AddressOf SwitchToGame, 1))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90, Delta_Y + 80), 1, 64, Localization.Translate("option.game.title", "Game"), AddressOf SwitchToGame, 1))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 80), 1, 64, Localization.Translate("option_screen_graphics", "Graphics"), AddressOf SwitchToGraphics, 2))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310, Delta_Y + 80), 1, 64, Localization.Translate("option.graphics.title", "Graphics"), AddressOf SwitchToGraphics, 2))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 80), 1, 64, Localization.Translate("option_screen_battle", "Battle"), AddressOf SwitchToBattle, 3))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530, Delta_Y + 80), 1, 64, Localization.Translate("option.battle.title", "Battle"), AddressOf SwitchToBattle, 3))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 200, Delta_Y + 168), 1, 64, Localization.Translate("option_screen_controls", "Controls"), AddressOf SwitchToControls, 4))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 200, Delta_Y + 168), 1, 64, Localization.Translate("option.controls.title", "Controls"), AddressOf SwitchToControls, 4))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 420, Delta_Y + 168), 1, 64, Localization.Translate("option_screen_audio", "Audio"), AddressOf SwitchToAudio, 5))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 420, Delta_Y + 168), 1, 64, Localization.Translate("option.audio.title", "Audio"), AddressOf SwitchToAudio, 5))
 
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global_apply", "Apply"), AddressOf Apply, 6))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global.apply", "Apply"), AddressOf Apply, 6))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 286 + 24, Delta_Y + 336), 2, 48, Localization.Translate("option_screen_resetoptions", "Reset Options"), AddressOf Reset, 7))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 286 + 24, Delta_Y + 336), 2, 48, Localization.Translate("option.reset", "Reset Options"), AddressOf Reset, 7))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global_close", "Close"), AddressOf Close, 8))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global.close", "Close"), AddressOf Close, 8))
 
             Case 1 ' "Game" from the Options menu.
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_screen_game_textspeed", "Text Speed"), Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed, 1))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option.game.textspeed", "Text Speed"), Me.TextSpeed, 1, 3, AddressOf ChangeTextspeed, 1))
                 If CBool(GameModeManager.GetGameRuleValue("LockDifficulty", "0")) = False Then
                     Dim d As New Dictionary(Of Integer, String)
-                    d.Add(0, Localization.Translate("option_screen_game_difficulty_easy", "Easy"))
+                    d.Add(0, Localization.Translate("option.game.difficulty.easy", "Easy"))
-                    d.Add(1, Localization.Translate("option_screen_game_difficulty_hard", "Hard"))
+                    d.Add(1, Localization.Translate("option.game.difficulty.hard", "Hard"))
-                    d.Add(2, Localization.Translate("option_screen_game_difficulty_superhard", "Super Hard"))
+                    d.Add(2, Localization.Translate("option.game.difficulty.superhard", "Super Hard"))
 
-                    Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option_screen_game_difficulty", "Difficulty"), Me.Difficulty, 0, 2, AddressOf ChangeDifficulty, d, 2))
+                    Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option.game.difficulty", "Difficulty"), Me.Difficulty, 0, 2, AddressOf ChangeDifficulty, d, 2))
                 End If
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 180), 3, 64, Localization.Translate("option_screen_game_viewbobbing", "View Bobbing"), Me.ViewBobbing, AddressOf ToggleBobbing, {Localization.Translate("global_off", "Off"), Localization.Translate("global_on", "On")}.ToList(), 3))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 180), 3, 64, Localization.Translate("option.game.view_bobbing", "View Bobbing"), Me.ViewBobbing, AddressOf ToggleBobbing, {Localization.Translate("global.off", "Off"), Localization.Translate("global.on", "On")}.ToList(), 3))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToMain, 4))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToMain, 4))
 
             Case 2 ' "Graphics" from the Options menu.
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 40), 400, Localization.Translate("option_screen_graphics_fov", "Field of View"), CInt(Me.FOV), 45, 120, AddressOf ChangeFOV, 1))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 40), 400, Localization.Translate("option.graphics.fov", "Field of View"), CInt(Me.FOV), 45, 120, AddressOf ChangeFOV, 1))
 
                 Dim d As New Dictionary(Of Integer, String)
-                d.Add(0, Localization.Translate("option_screen_graphics_renderdistance_tiny", "Tiny"))
+                d.Add(0, Localization.Translate("option.graphics.render_distance.tiny", "Tiny"))
-                d.Add(1, Localization.Translate("option_screen_graphics_renderdistance_small", "Small"))
+                d.Add(1, Localization.Translate("option.graphics.render_distance.small", "Small"))
-                d.Add(2, Localization.Translate("option_screen_graphics_renderdistance_normal", "Normal"))
+                d.Add(2, Localization.Translate("option.graphics.render_distance.normal", "Normal"))
-                d.Add(3, Localization.Translate("option_screen_graphics_renderdistance_far","Far"))
+                d.Add(3, Localization.Translate("option.graphics.render_distance.far", "Far"))
-                d.Add(4, Localization.Translate("option_screen_graphics_renderdistance_extreme", "Extreme"))
+                d.Add(4, Localization.Translate("option.graphics.render_distance.extreme", "Extreme"))
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 100), 400, Localization.Translate("option_screen_graphics_renderdistance", "Render Distance"), Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d, 2))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 100), 400, Localization.Translate("option.graphics.render_distance.title", "Render Distance"), Me.RenderDistance, 0, 4, AddressOf ChangeRenderDistance, d, 2))
 
                 Dim d1 As New Dictionary(Of Integer, String)
-                d1.Add(0, "Off")
+                d1.Add(0, Localization.Translate("global.off", "Off"))
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 160), 400, Localization.Translate("option_screen_graphics_offset_mapquality", "Offset Map Quality"), Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1, 3))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 160), 400, Localization.Translate("option.graphics.offset_map_quality", "Offset Map Quality"), Me.LoadOffsetMaps, 0, 100, AddressOf ChangeOffsetMaps, d1, 3))
 
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 220), 3, 64, Localization.Translate("option_screen_graphics_graphics", "Graphics"), CBool(Me.GraphicStyle), AddressOf ToggleGraphicsStyle, {Localization.Translate("option_screen_graphics_graphics_fast", "Fast"), Localization.Translate("option_screen_graphics_graphics_fancy", "Fancy")}.ToList(), 4))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 220), 3, 64, Localization.Translate("option.graphics.graphics.title", "Graphics"), CBool(Me.GraphicStyle), AddressOf ToggleGraphicsStyle, {Localization.Translate("option.graphics.graphics.fast", "Fast"), Localization.Translate("option.graphics.graphics.fancy", "Fancy")}.ToList(), 4))
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 300), 3, 64, Localization.Translate("option_screen_graphics_multisampling", "Multi Sampling"), Me.PreferMultiSampling, AddressOf ToggleMultiSampling, {"Off", "On"}.ToList(), 5))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 300), 3, 64, Localization.Translate("option.graphics.multisampling", "Multi-sampling"), Me.PreferMultiSampling, AddressOf ToggleMultiSampling, {Localization.Translate("global.off", "Off"), Localization.Translate("global.on", "On")}.ToList(), 5))
 
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToMain, 6))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToMain, 6))
 
             Case 3 ' "Battle" from the Options menu.
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option_screen_battle_3dmodels", "3D Models"), CBool(ShowModels), AddressOf ToggleShowModels, {Localization.Translate("global_off", "Off"), Localization.Translate("global_on", "On")}.ToList(), 1))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option.battle.3dmodels", "3D Models"), CBool(ShowModels), AddressOf ToggleShowModels, {Localization.Translate("global.off", "Off"), Localization.Translate("global.on", "On")}.ToList(), 1))
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 400 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option_screen_battle_animations", "Animations"), CBool(Me.ShowBattleAnimations), AddressOf ToggleAnimations, {Localization.Translate("global_off", "Off"), Localization.Translate("global_on", "On")}.ToList(), 2))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 400 + 20, Delta_Y + 100), 2, 64, Localization.Translate("option.battle.animations", "Animations"), CBool(Me.ShowBattleAnimations), AddressOf ToggleAnimations, {Localization.Translate("global.off", "Off"), Localization.Translate("global.on", "On")}.ToList(), 2))
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 200), 2, 64, Localization.Translate("option_screen_battle_battlestyle", "Battle Style"), CBool(Me.BattleStyle), AddressOf ToggleBattleStyle, {Localization.Translate("option_screen_battle_battlestyle_shift", "Shift"), Localization.Translate("option_screen_battle_battlestyle_set", "Set")}.ToList(), 3))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100 + 20, Delta_Y + 200), 2, 64, Localization.Translate("option.battle.battle_style.title", "Battle Style"), CBool(Me.BattleStyle), AddressOf ToggleBattleStyle, {Localization.Translate("option.battle.battle_style.shift", "Shift"), Localization.Translate("option.battle_battlestyle_set", "Set")}.ToList(), 3))
 
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToMain, 4))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToMain, 4))
 
             Case 4 ' "Controls" from the Options menu.
                 If PreScreen.Identification = Identifications.MainMenuScreen Then
-                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 100), 5, 64, Localization.Translate("option_screen_controls_xboxgamepad", "Xbox Gamepad"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {"Disabled", "Enabled"}.ToList(), 1))
+                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 100), 5, 64, Localization.Translate("option.controls.xbox_controller", "Xbox Gamepad"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {Localization.Translate("global.disabled", "Disabled"), Localization.Translate("global.enabled", "Enabled")}.ToList(), 1))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 200), 3, 64, Localization.Translate("option_screen_controls_resetkeybindings", "Reset Key Bindings"), AddressOf ResetKeyBindings, 2))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 200), 3, 64, Localization.Translate("option.controls.reset_key_bindings", "Reset Key Bindings"), AddressOf ResetKeyBindings, 2))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global_apply", "Apply"), AddressOf ControlsApply, 3))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global.apply", "Apply"), AddressOf ControlsApply, 3))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf Close, 4))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf Close, 4))
                 Else
                     Dim d As New Dictionary(Of Integer, String)
-                    d.Add(1, Localization.Translate("option_screen_controls_cameraspeed_slow", "...Slow..."))
+                    d.Add(1, Localization.Translate("option.controls.camera_speed.slow", "...Slow..."))
-                    d.Add(12, Localization.Translate("option_screen_controls_cameraspeed_medium", "Standard"))
+                    d.Add(12, Localization.Translate("option.controls.camera_speed.medium", "Medium"))
-                    d.Add(38, Localization.Translate("option_screen_controls_cameraspeed_fast", "Super fast!"))
+                    d.Add(38, Localization.Translate("option.controls.camera_speed.fast", "Fast!"))
-                    d.Add(50, Localization.Translate("option_screen_controls_cameraspeed_fastest", "SPEED OF LIGHT!"))
+                    d.Add(50, Localization.Translate("option.controls.camera_speed.fastest", "SPEED OF LIGHT!"))
-                    Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_screen_controls_cameraspeed", "Camera Speed"), Me.CameraSpeed, 1, 50, AddressOf ChangeCameraSpeed, d, 1))
+                    Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option.controls.camera_speed.title", "Camera Speed"), Me.CameraSpeed, 1, 50, AddressOf ChangeCameraSpeed, d, 1))
-                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 120), 5, 64, Localization.Translate("option_screen_controls_xboxgamepad", "Xbox Gamepad"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {"Disabled", "Enabled"}.ToList(), 2))
+                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 120), 5, 64, Localization.Translate("option.controls.xbox_controller", "Xbox Controller"), Me.GamePadEnabled, AddressOf ToggleXBOX360Controller, {Localization.Translate("global.disabled", "Disabled"), Localization.Translate("global.enabled", "Enabled")}.ToList(), 2))
-                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 5, 64, Localization.Translate("option_screen_controls_running", "Running"), Me.RunMode, AddressOf ToggleRunningToggle, {"Hold", "Toggle"}.ToList(), 3))
+                    Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 5, 64, Localization.Translate("option.controls.running.title", "Running"), Me.RunMode, AddressOf ToggleRunningToggle, {Localization.Translate("option.controls.running.hold", "Hold"), Localization.Translate("option.controls.running.toggle", "Toggle")}.ToList(), 3))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 280), 3, 64, Localization.Translate("option_screen_controls_resetkeybindings", "Reset Key Bindings"), AddressOf ResetKeyBindings, 4))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 100, Delta_Y + 280), 3, 64, Localization.Translate("option.controls.reset_key_bindings", "Reset Key Bindings"), AddressOf ResetKeyBindings, 4))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToMain, 5))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToMain, 5))
                 End If
 
             Case 5 ' "Audio" from the Options menu.
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option_screen_audio_volume_music", "Music Volume"), Me.Music, 0, 100, AddressOf ChangeMusicVolume, 1))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 60), 400, Localization.Translate("option.audio.music_volume", "Music Volume"), Me.Music, 0, 100, AddressOf ChangeMusicVolume, 1))
-                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option_screen_audio_volume_sfx", "SoundFX Volume"), Me.Sound, 0, 100, AddressOf ChangeSoundVolume, 2))
+                Me.ControlList.Add(New ScrollBar(New Vector2(Delta_X + 100, Delta_Y + 120), 400, Localization.Translate("option.audio.sound_volume", "SoundFX Volume"), Me.Sound, 0, 100, AddressOf ChangeSoundVolume, 2))
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 1, 64, Localization.Translate("option_screen_audio_muted", "Muted"), CBool(Me.Muted), AddressOf ToggleMute, {"No", "Yes"}.ToList(), 3))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 100, Delta_Y + 200), 1, 64, Localization.Translate("option.audio.muted", "Muted"), CBool(Me.Muted), AddressOf ToggleMute, {Localization.Translate("global.no", "No"), Localization.Translate("global.yes", "Yes")}.ToList(), 3))
                 If PreScreen.Identification = Identifications.MainMenuScreen Then
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_apply", "Apply"), AddressOf AudioApply, 4))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.apply", "Apply"), AddressOf AudioApply, 4))
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf Close, 5))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf Close, 5))
                 Else
-                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToMain, 4))
+                    Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToMain, 4))
                 End If
 
             Case 6 ' "Language" from the Options menu.
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global_apply", "Apply"), AddressOf LanguageApply, 1))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global.apply", "Apply"), AddressOf LanguageApply, 1))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf Close, 2))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf Close, 2))
 
             Case 7 ' "ContentPacks" from the Options menu.
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 64), 2, 48, Localization.Translate("option_screen_contentpacks_up"), AddressOf ButtonUp, 1))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 64), 2, 48, Localization.Translate("option.contentpacks.up", "Up"), AddressOf ButtonUp, 1))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 120), 2, 48, Localization.Translate("option_screen_contentpacks_down"), AddressOf ButtonDown, 2))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 120), 2, 48, Localization.Translate("option.contentpacks.down", "Down"), AddressOf ButtonDown, 2))
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 604, Delta_Y + 176), 2, 48, "", isSelectedEnabled, AddressOf PackEnabledToggle, {Localization.Translate("global_enable"), Localization.Translate("global_disable")}.ToList(), 3))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 604, Delta_Y + 176), 2, 48, "", isSelectedEnabled, AddressOf PackEnabledToggle, {Localization.Translate("global.enable", "Enable"), Localization.Translate("global.disable", "Disable")}.ToList(), 3))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 232), 2, 48, Localization.Translate("option_screen_contentpacks_information"), AddressOf SwitchToPackInformation, 4))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 604, Delta_Y + 232), 2, 48, Localization.Translate("option.contentpacks.information", "Information"), AddressOf SwitchToPackInformation, 4))
 
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_apply", "Apply"), AddressOf PacksApply, 5))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.apply", "Apply"), AddressOf PacksApply, 5))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global_back", "Back"), AddressOf Close, 6))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 310 + 24, Delta_Y + 327), 1, 48, Localization.Translate("global.back", "Back"), AddressOf Close, 6))
 
             Case 8 ' "Information" from the ContentPacks menu.
-                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 2, 48, Localization.Translate("global_enabled"), isSelectedEnabled, AddressOf PackEnabledToggle, {Localization.Translate("global_no"), Localization.Translate("global_yes")}.ToList(), 1))
+                Me.ControlList.Add(New ToggleButton(New Vector2(Delta_X + 90 + 24, Delta_Y + 336), 2, 48, Localization.Translate("global.enabled", "Enabled"), isSelectedEnabled, AddressOf PackEnabledToggle, {Localization.Translate("global.no", "No"), Localization.Translate("global.yes", "Yes")}.ToList(), 1))
-                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global_back", "Back"), AddressOf SwitchToContentPacks, 2))
+                Me.ControlList.Add(New CommandButton(New Vector2(Delta_X + 530 + 24, Delta_Y + 336), 1, 48, Localization.Translate("global.back", "Back"), AddressOf SwitchToContentPacks, 2))
         End Select
 
         If ScreenIndex <> 7 Then