diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 612f7e287..094967d6e 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1,7 +1,4 @@
 {
-  "BoardCard.delete": "Delete",
-  "BoardCard.duplicate": "Duplicate",
-  "BoardCard.untitled": "Untitled",
   "BoardComponent.add-a-group": "+ Add a group",
   "BoardComponent.delete": "Delete",
   "BoardComponent.hidden-columns": "Hidden columns",
@@ -23,15 +20,26 @@
   "ContentBlock.Delete": "Delete",
   "ContentBlock.DeleteAction": "delete",
   "ContentBlock.addElement": "add {type}",
+  "ContentBlock.checkbox": "checkbox",
+  "ContentBlock.divider": "divider",
+  "ContentBlock.editCardCheckbox": "toggled-checkbox",
+  "ContentBlock.editCardCheckboxText": "edit card text",
+  "ContentBlock.editCardText": "edit card text",
+  "ContentBlock.editText": "Edit text...",
+  "ContentBlock.image": "image",
   "ContentBlock.insertAbove": "Insert above",
   "ContentBlock.moveDown": "Move down",
   "ContentBlock.moveUp": "Move up",
+  "ContentBlock.text": "text",
   "Filter.includes": "includes",
   "Filter.is-empty": "is empty",
   "Filter.is-not-empty": "is not empty",
   "Filter.not-includes": "doesn't include",
   "FilterComponent.add-filter": "+ Add filter",
   "FilterComponent.delete": "Delete",
+  "KanbanCard.delete": "Delete",
+  "KanbanCard.duplicate": "Duplicate",
+  "KanbanCard.untitled": "Untitled",
   "Mutator.duplicate-board": "duplicate board",
   "Mutator.new-board-from-template": "new board from template",
   "Mutator.new-card-from-template": "new card from template",
@@ -96,6 +104,7 @@
   "Sidebar.set-theme": "Set theme",
   "Sidebar.settings": "Settings",
   "Sidebar.spanish": "Spanish",
+  "Sidebar.system-theme": "System theme",
   "Sidebar.template-from-board": "New template from board",
   "Sidebar.turkish": "Turkish",
   "Sidebar.untitled": "Untitled",
@@ -113,6 +122,7 @@
   "TableHeaderMenu.sort-descending": "Sort descending",
   "TableRow.open": "Open",
   "View.NewBoardTitle": "Board view",
+  "View.NewGalleryTitle": "Gallery view",
   "View.NewTableTitle": "Table view",
   "ViewHeader.add-template": "+ New template",
   "ViewHeader.delete-template": "Delete",
@@ -137,5 +147,5 @@
   "ViewTitle.remove-icon": "Remove icon",
   "ViewTitle.show-description": "show description",
   "ViewTitle.untitled-board": "Untitled board",
-  "WorkspaceComponent.editing-board-template": "You're editing a board template"
+  "Workspace.editing-board-template": "You're editing a board template"
 }
\ No newline at end of file
diff --git a/webapp/package.json b/webapp/package.json
index b132b287b..b05f7e9d2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -10,7 +10,7 @@
 		"test": "jest",
 		"check": "eslint --ext .tsx,.ts . --quiet --cache",
 		"fix": "eslint --ext .tsx,.ts . --quiet --fix --cache",
-		"i18n-extract": "formatjs extract src/**/*.tsx src/**/*.ts --out-file i18n/tmp.json; formatjs compile i18n/tmp.json --out-file i18n/en.json; rm i18n/tmp.json",
+		"i18n-extract": "formatjs extract src/*/*/*.ts? src/*/*.ts? src/*.ts? --out-file i18n/tmp.json; formatjs compile i18n/tmp.json --out-file i18n/en.json; rm i18n/tmp.json",
 		"runserver-test": "cd cypress && FOCALBOARD_SINGLE_USER_TOKEN=TESTTOKEN ../../bin/focalboard-server -single-user",
 		"cypress:ci": "start-server-and-test runserver-test http://localhost:8088 cypress:run",
 		"cypress:run": "cypress run",