diff --git a/lang/en-us.yml b/lang/en-us.yml
index 1473816..59cc3f4 100644
--- a/lang/en-us.yml
+++ b/lang/en-us.yml
@@ -3,61 +3,57 @@ color:
   p: '9'
   s: 'f'
   t: '7'
-update: '&tThere is a new update of &pAuxProtect&t available!\n&tCurrent Version: &p%s &tNew Version: &p%s\n&thttps://www.spigotmc.org/resources/auxprotect.99147/'
+update: '&tThere is a new update of &pAuxProtect&t available!\n&tCurrent Version: &p<current_version> &tNew Version: &p<new_version>\n&thttps://www.spigotmc.org/resources/auxprotect.99147/'
 no-permission: '&cYou don''t have permission for that.'
-no-permission-node: '&cYou don''t have permission for that: &t%s'
+no-permission-node: '&cYou don''t have permission for that: &t<node>'
 no-permission-flag: '&cYou don''t have permission for that flag.'
-invalid-parameter: '&cInvalid parameter: %s'
+invalid-parameter: '&cInvalid parameter: <invalid_parameter>'
 invalid-syntax: '&cInvalid syntax.'
 invalid-notenough: '&cNot enough arguments.'
 error: '&cAn error occurred'
 action-disabled: '&cThat action is disabled.'
 notplayererror: 'That command can only be used ingame'
-watch-none: '&cYou aren''t watching anything.'
-watch-ing: '&pWatching:'
-watch-removed: '&sRemoved &p%d&s watch records.'
-watch-now: '&sYou are now watching: &p%s'
 backup-sqliteonly: 'Backups only work on SQLite'
 unknown-subcommand: 'Unknown subcommand. Do ''/ap help'' for more info.'
 command:
   claiminv:
-    cancelled-other: '&aYou cancelled %s claimable inventory.'
+    cancelled-other: '&aYou cancelled <target> claimable inventory.'
     cancelled: '&cYour claimable inventory was cancelled.'
     youhavenone: '&cYou have no inventory to claim.'
     otherhasnone: '&cThat player has no claimable inventory to cancel.'
     header: 'Inventory Claim'
-    recovered: '&p%s &srecovered &p%s &sinventory from &p%s &sago.'
-    force-recovered: '&p%s &sforce recovered &p%s &sinventory from &p%s &sago.'
+    recovered: '&p<admin> &srecovered &p<target> &sinventory from &p<time> &sago.'
+    force-recovered: '&p<admin> &sforce recovered &p<target> &sinventory from &p<time> &sago.'
   purge:
-    purging: '&pPurging ''%s''...'
+    purging: '&pPurging ''<table>''...'
     uids: '&pPurging unused UIDs...'
-    notvacuum: '&cSkipping condensing SQLite file. Last performed %s ago. To force this, run ''ap sqli vacuum'' from the console.'
+    notvacuum: '&cSkipping condensing SQLite file. Last performed <time> ago. To force this, run ''ap sqli vacuum'' from the console.'
     vacuum: '&pCondensing SQLite file...'
-    complete-count: '&pPurge complete. Purged %d rows.'
+    complete-count: '&pPurge complete. Purged <rows> rows.'
     error: '&cAn error occurred while purging.'
     time: '&cThat purge is too short. Try a longer amount of time.'
     table: '&cThat table is invalid or does not exist.'
     nopurge: '&cThat table cannot be purged directly.'
-    skipauto: '&pSkipping auto-purge as it has only been %s since last.'
+    skipauto: '&pSkipping auto-purge as it has only been <time> since last.'
   lookup:
-    unknown-world: '&cUnknown world: %s'
+    unknown-world: '&cUnknown world: <world>'
     looking: '&pSearching database...'
     noresults: '&cNo results found.'
-    count: '&p%d &sresults found.'
-    page-footer: '&tPage (&p%d/%d&t) &p%d &ttotal entries.'
+    count: '&p<results> &sresults found.'
+    page-footer: '&tPage (&p<page_number>/<page_count>&t) &p<entry_count> &ttotal entries.'
     no-results-selected: '&cYou don''t have a lookup to page through.'
     nopage: '&cThat page does not exist.'
-    toomany: '&cToo many entries. Try narrowing your search. (%d entries, over %d)'
+    toomany: '&cToo many entries. Try narrowing your search. (<count> entries, over <max>)'
     incompatible-tables: '&cThose actions are incompatible.'
     action-negate: '&cYou cannot negate actions.'
-    action-perm: '&cYou do not have permission to lookup that action. &t''%s'''
+    action-perm: '&cYou do not have permission to lookup that action. &t''<node>'''
     action-none: '&cYou must specify an action.'
     rating-wrong: '&cYou can only specify ''rating'' for a:vein.'
     nodata: '&cThat table does not have data logs.'
     playback:
       starting: '&pPlayback starting...'
       stopped: '&pPlayback stopped.'
-      toolong: '&cCan not playback a range greater than %s.'
+      toolong: '&cCan not playback a range greater than <limit>.'
   help:
     nohelp: '&cThis command does not have a help page.'
     header: '&s----- &pAuxProtect Help &s-----'
@@ -71,7 +67,7 @@ command:
     lookup:
       - '&s/$prefix &plookup &s<params>'
       - '&pParams:'
-      - '&pTime: &sIn seconds, minutes, hours, days, or months, represented by the first letter (i.e ''s'' for seconds).'
+      - '&pTime: &sIn seconds, minutes, hours, days, or weeks, represented by the first letter (i.e ''s'' for seconds).'
       - '&pBefore/After: &sUsed to set a range for time lookup.'
       - '&pAction: &sType of world interaction log, see tab completion for options.'
       - '&pTarget: &sSpecify the parameter an action was performed to. You can use an asterisk as a wildcard and a dash as a space in this parameter.'
@@ -84,8 +80,8 @@ command:
 lookup-playtime-nouser: '&cNo user specified'
 lookup-playtime-toomanyusers: '&cToo many users specified'
 playernotfound: '&cPlayer not found.'
-lookup-playernotfound: '&cPlayer %s not found.'
-lookup-unknownaction: '&cUnknown action: %s.'
+lookup-playernotfound: '&cPlayer <target> not found.'
+lookup-unknownaction: '&cUnknown action: <action>.'
 playtime-toomanyusers: '&cYou can''t specify more than one user for a playtime lookup.'
 playtime-nouser: '&cYou must specify a user for a playtime lookup.'
 xray-rate-nochange: '&cThat is already the rating for that entry.'
@@ -95,10 +91,10 @@ xray-notfound: '&cNo results found at that time'
 xray-toomany: '&cToo many results found'
 xray-already-rated: '&cThis entry has already been rated. Would you like to rate anyway?'
 xray-click-to-change: '&aClick to rate'
-inactive-alert: '&8[&4Server&8] &e%s &tmay be inactive. &e%d &tout of &e%d &tminutes inactive.'
+inactive-alert: '&8[&4Server&8] &e<user> &tmay be inactive. &e<inactive_minutes> &tout of &e<total_minutes> &tminutes inactive.'
 yes: 'Yes'
 no: 'No'
-inv-manual-success: '&p%s''%s &tinventory has been manually saved. &otime:%s'
+inv-manual-success: '&p<target> &tinventory has been manually saved. &otime:<time>'
 inv-toosoon: '&cThat user''s inventory has been saved too recently.'
 database-busy: '&cThe database is currently busy. Try again later or check the console for more information.'
 protocollib-not-loaded: "&cProtocolLib is required for this action and it is not installed."