diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
index e0f335f57..933695d5d 100644
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@@ -1,32 +1,15 @@
-/*********************************************************************************
-* Meta Information *
-*********************************************************************************/
-//About DLL
-#1 # "English" // LANGUAGE ID
+// Meta information
+#1 # "English" // Language ID
#2 # "Zilmar" // Author
#3 # "3.0" // Version
-#4 # "November, 2020" // Date
+#4 # "May, 2021" // Date
-//About DLL Dialog
-#5 # "Current Language"
-#6 # "Author"
-#7 # "Version"
-#8 # "Date"
-#9 # "Visit Home Page"
-#10 # "ROM Database (.RDB)"
-#11 # "Cheat Code File (.CHT)"
-#12 # "Extended ROM Info (.RDX)"
+/*** Menu ***/
-//About INI title
-#20 # "About Config Files"
-
-/*********************************************************************************
-* Menu *
-*********************************************************************************/
-//File Menu
+// File menu
#100# "&File"
#101# "&Open ROM"
-#102# "ROM &Info...."
+#102# "ROM &Info..."
#103# "Start Emulation"
#104# "&End Emulation"
#105# "Choose ROM Directory..."
@@ -36,51 +19,50 @@
#109# "E&xit"
#110# "Open &Combo"
-//System Menu
+// System menu
#120# "&System"
#121# "&Reset"
#122# "&Pause"
-#123# "Generate Bitmap"
+#123# "Capture screenshot"
#124# "Limit FPS"
#125# "&Save State"
#126# "Save As..."
#127# "&Load State"
#128# "Load..."
-#129# "Current Save S&tate"
-#130# "Cheats..."
+#129# "Current Saves&tate"
+#130# "&Cheats..."
#131# "GS Button"
#132# "R&esume"
#133# "&Soft Reset"
#134# "&Hard Reset"
#135# "Swap &Disk"
-#136# "Enhancement..."
+#136# "&Enhancements..."
-//Options Menu
+// Options menu
#140# "&Options"
-#141# "&Full Screen"
-#142# "&Always on &Top"
-#143# "Configure Graphics Plugin..."
-#144# "Configure Audio Plugin..."
-#145# "Configure Controller Plugin..."
-#146# "Configure RSP Plugin..."
-#147# "Show CPU Usage"
-#148# "&Settings..."
+#141# "&Fullscreen"
+#142# "Always on &top"
+#143# "&Graphics Settings"
+#144# "&Audio Settings"
+#145# "&Input Settings"
+#146# "&RSP Settings"
+#147# "Show CPU &Stats"
+#148# "Configura&tion"
-//Debugger Menu
+// Debugger menu
#160# "&Debugger"
-//Language Menu
+// Language menu
#175# "&Language"
-//Help Menu
+// Help menu
#180# "&Help"
#182# "&About Project64"
-#183# "Support &Forum"
#184# "&Website"
#185# "&Support Project64"
#186# "&Discord"
-//Current Save Slot menu
+// Current save slot menu
#190# "Default"
#191# "Slot 1"
#192# "Slot 2"
@@ -92,17 +74,18 @@
#198# "Slot 8"
#199# "Slot 9"
#200# "Slot 10"
-#201# "Save Slot (%ws) selected"
+#201# "Save slot (%ws) selected"
-//Pop up Menu
+// Pop-up menu
#210# "Play Game"
#211# "ROM Information"
#212# "Edit Game Settings"
-#213# "Edit Cheats"
+#213# "Edit Cheats..."
#214# "Graphics Plugin"
#215# "Play Game with Disk"
+#216# "Pick Enhancements..."
-//Alternate Name to save Slot
+// Alternate name to save slot
#220# "Save Slot - Default"
#221# "Save Slot - 1"
#222# "Save Slot - 2"
@@ -115,7 +98,7 @@
#229# "Save Slot - 9"
#230# "Save Slot - 10"
-// Menu Descriptions
+// Menu descriptions
#250# "Open a N64 ROM image"
#251# "Display information about the loaded image"
#252# "Start emulation of the loaded ROM image"
@@ -154,10 +137,9 @@
#285# "Edit settings for selected game"
#286# "Edit cheats for selected game"
-/*********************************************************************************
-* ROM Browser *
-*********************************************************************************/
-//ROM Browser Fields
+/*** ROM browser ***/
+
+// ROM browser fields
#300# "File Name"
#301# "Internal Name"
#302# "Good Name"
@@ -180,34 +162,33 @@
#319# "File Format"
#321# "Name"
-//Select ROM
+// Select ROM
#320# "Select current ROM directory"
-//Messages
+// Messages
#340# "Bad ROM? Use GoodN64 & check that the RDB is up-to-date."
-/*********************************************************************************
-* Options *
-*********************************************************************************/
-//Options Title
-#400# "Settings"
+/*** Options ***/
-//Tabs
+// Options title
+#400# "Configuration"
+
+// Tabs
#401# "Plugins"
#402# "Directories"
-#403# "Options"
-#404# "ROM Selection"
+#403# "General settings"
+#404# "ROM browser"
#405# "Advanced"
-#406# "General Settings"
-#407# "Shell Integration"
+#406# "ROM settings"
#408# "Notes"
-#409# "Keyboard Shortcuts"
+#409# "Hotkeys"
#410# "Status"
#411# "Recompiler"
#412# "Defaults"
#413# "64DD"
+#414# "64DD"
-//Plugin Dialog
+// Plugin dialog
#420# "About"
#421# " RSP (Reality Signal Processor) plugin: "
#422# " Video (graphics) plugin: "
@@ -217,7 +198,7 @@
#426# "Audio HLE"
#427# "** Use System Plugin **"
-//Directory Dialog
+// Directory dialog
#440# " Plugin directory: "
#441# " ROM directory: "
#442# " N64 native saves directory: "
@@ -232,25 +213,25 @@
#451# " Texture pack directory: "
#452# "Select texture pack directory"
-//Options (general) Tab
+// Options (general) tab
#460# "Pause emulation when window is not active"
-#461# "Enter full-screen mode when loading a ROM"
+#461# "Enter fullscreen mode when loading a ROM"
#462# "Hide advanced settings"
#463# "Remember selected cheats"
-#464# "Disable screen saver when running a ROM"
+#464# "Disable screensaver when running a ROM"
#465# "Display speed"
#466# "Speed display:"
#467# "Check if Project64 is already running"
-#468# "Unique Game Save Directory"
-#469# "Japanese Retail 64DD IPL ROM Path:"
-#470# "American Retail 64DD IPL ROM Path:"
-#471# "Development 64DD IPL ROM Path:"
-#472# "Disk Save Type:"
-#473# "Enable Enhancements"
-#474# "Show Status Bar"
-#475# "Exit full screen on lose focus"
+#468# "Store game saves in separate folders"
+#469# "Japanese retail 64DD IPL ROM path:"
+#470# "American retail 64DD IPL ROM path:"
+#471# "Development 64DD IPL ROM path:"
+#472# "Disk save type:"
+#473# "Enable enhancements"
+#474# "Show status bar"
+#475# "Exit fullscreen on lose focus"
-//ROM Browser Tab
+// ROM browser tab
#480# "Max # of ROMs remembered (0-10):"
#481# "ROMs"
#482# "Max # of ROM dirs remembered (0-10):"
@@ -265,7 +246,7 @@
#491# "Down"
#492# "Automatically refresh browser"
-//Advanced Options
+// Advanced options
#500# "Most of these changes will not take effect until a new ROM is opened or current ROM is reset."
#501# "Core Defaults"
#502# "CPU core style:"
@@ -282,7 +263,7 @@
#513# "Protect memory"
#514# "TLB unmapping"
-//ROM Options
+// ROM options
#520# "CPU core style:"
#521# "VI refresh rate:"
#522# "Memory size:"
@@ -298,18 +279,18 @@
#532# "RSP audio signal"
#533# "Fixed audio timing"
#534# "Function lookup method:"
-#535# "Custom self mod method"
+#535# "Custom self-mod method"
#536# "Sync using audio"
-#537# "AI count per byte"
+#537# "AI count per byte:"
#538# "32-bit engine"
#539# "Delay DP interrupt"
-//Core Styles
+// Core styles
#540# "Interpreter"
#541# "Recompiler"
#542# "Synchronize cores"
-//Self Mod Methods
+// Self-mod methods
#560# "None"
#561# "Cache"
#562# "Protect memory"
@@ -318,35 +299,32 @@
#565# "Check memory advance"
#566# "Clear code on cache"
-//Function Lookup method
+// Function lookup method
#570# "Physical lookup table"
#571# "Virtual lookup table"
#572# "Change memory"
-//RDRAM Size
+// RDRAM size
#580# "4 MB"
#581# "8 MB"
-//Advanced Block Linking
+// Advanced block linking
#600# "On"
#601# "Off"
-//Save Type
+// Save type
#620# "Use first-used save type"
#621# "4-kbit EEPROM"
#622# "16-kbit EEPROM"
#623# "SRAM"
#624# "Flash RAM"
-//Shell Integration Tab
-#640# "File extension association:"
-
-//ROM Notes
+// ROM notes
#660# "ROM status:"
#661# "Core note:"
#662# "Plugin note:"
-// Accelerator Selector
+// Accelerator selector
#680# "CPU state:"
#681# "Menu item:"
#682# "Current keys:"
@@ -361,7 +339,7 @@
#691# "Game playing (full-screen)"
#692# "Detect Key"
-// Frame Rate Option
+// Framerate option
#700# "Vertical interrupts per second"
#701# "Display lists per second"
#702# "Percentage of full speed"
@@ -370,23 +348,22 @@
#710# "Increase Game Speed"
#711# "Decrease Game Speed"
-//Bottom page buttons
+// Bottom page buttons
#720# "Reset Page"
#721# "Reset All"
#722# "Apply"
#723# "Close"
-//Disk Save Type
+// Disk save type
#730# "Full Disk Copy"
#731# "Save Area Only"
-/*********************************************************************************
-* ROM Information *
-*********************************************************************************/
-//ROM Info Title
+/*** ROM information ***/
+
+// ROM info title
#800# "ROM Information"
-//ROM Info Text
+// ROM info text
#801# "ROM name:"
#802# "File name:"
#803# "Location:"
@@ -399,17 +376,16 @@
#810# "CIC Chip:"
#811# "MD5:"
-/*********************************************************************************
-* Cheats *
-*********************************************************************************/
-//Cheat List
+/*** Cheats ***/
+
+// Cheat list
#1000# "Cheats"
#1001# "Cheats:"
#1002# " Notes: "
#1003# "Mark All"
#1004# "Unmark All"
-//Add Cheat
+// Add cheat
#1005# "Add Cheat"
#1006# "Name:"
#1007# "Code:"
@@ -418,13 +394,13 @@
#1010# " Cheat Notes: "
#1011# "Add to DB"
-//Code extension
+// Code extension
#1012# "Code Extensions"
#1013# "Please choose a value to be used for:"
#1014# "OK"
#1015# "Cancel"
-//Digital Value
+// Digital value
#1016# "Quantity Digit"
#1017# "Please choose a value for:"
#1018# "&Value"
@@ -433,56 +409,53 @@
#1021# "&Notes:"
#1022# "Add Cheat"
#1023# "New Cheat"
-#1024# "
"
+#1024# " :"
#1025# "Options:"
#1026# "