diff --git a/src/main/java/net/rptools/tokentool/AppSetup.java b/src/main/java/net/rptools/tokentool/AppSetup.java
index 1d94f74..3b46b56 100644
--- a/src/main/java/net/rptools/tokentool/AppSetup.java
+++ b/src/main/java/net/rptools/tokentool/AppSetup.java
@@ -103,6 +103,7 @@ private static void confirmInstallOverlays(int overlaysInstalled) {
     Platform.runLater(
         () -> {
           Alert alert = new Alert(AlertType.INFORMATION);
+          alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
           alert.setTitle(I18N.getString("AppSetup.dialog.install.overlays.confirmation.title"));
           alert.setContentText(
               overlaysInstalled
diff --git a/src/main/java/net/rptools/tokentool/client/TokenTool.java b/src/main/java/net/rptools/tokentool/client/TokenTool.java
index 9e7b159..068b0b8 100644
--- a/src/main/java/net/rptools/tokentool/client/TokenTool.java
+++ b/src/main/java/net/rptools/tokentool/client/TokenTool.java
@@ -103,7 +103,7 @@ public void init() throws Exception {
     // Log some basic info
     log.info("Environment: " + Sentry.getStoredClient().getEnvironment());
     if (!Sentry.getStoredClient().getEnvironment().toLowerCase().equals("production"))
-      log.info("Not in Produciton mode and thus will not log any events to Sentry.io");
+      log.info("Not in Production mode and thus will not log any events to Sentry.io");
 
     log.info("Release: " + Sentry.getStoredClient().getRelease());
     log.info("OS: " + ThreadContext.get("OS"));
diff --git a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java
index 5d3566a..9120760 100644
--- a/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java
+++ b/src/main/java/net/rptools/tokentool/controller/ManageOverlays_Controller.java
@@ -318,6 +318,7 @@ else if (overlayFiles.size() == 1) {
     }
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.title"));
     alert.setContentText(confirmationText);
 
@@ -347,6 +348,7 @@ private boolean confirmDelete(File dir) {
     }
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.delete.dir.title"));
     alert.setContentText(confirmationText);
 
@@ -417,6 +419,7 @@ void addOverlayButton_onAction(ActionEvent event) {
   @FXML
   void addFolderButton_onAction(ActionEvent event) {
     TextInputDialog dialog = new TextInputDialog();
+    dialog.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     dialog.setTitle(I18N.getString("ManageOverlays.filechooser.folder.title"));
     dialog.setContentText(I18N.getString("ManageOverlays.filechooser.folder.content_text"));
 
@@ -433,6 +436,7 @@ void addFolderButton_onAction(ActionEvent event) {
   @FXML
   void restoreButton_onAction(ActionEvent event) {
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("ManageOverlays.dialog.restore.overlays.title"));
     alert.setContentText(I18N.getString("ManageOverlays.dialog.restore.overlays.content_text"));
 
diff --git a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java
index a7539a2..e5356d6 100644
--- a/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java
+++ b/src/main/java/net/rptools/tokentool/controller/TokenTool_Controller.java
@@ -767,6 +767,7 @@ void helpResetMenu_OnAction(ActionEvent event) {
     String confirmationText = I18N.getString("TokenTool.dialog.reset.confirmation.text");
 
     Alert alert = new Alert(AlertType.CONFIRMATION);
+    alert.setHeaderText(I18N.getString("TokenTool.dialog.confirmation.header"));
     alert.setTitle(I18N.getString("TokenTool.dialog.reset.confirmation.title"));
     alert.setContentText(confirmationText);
 
@@ -1140,7 +1141,7 @@ void backgroundMenuItem_OnAction(ActionEvent event) {
   @FXML
   void portraitMenuItem_OnAction(ActionEvent event) {
     String menuText = ((RadioMenuItem) event.getSource()).getText();
-    layerMenuButton.setText(menuText + " Layer"); // TODO: i18n this shit
+    layerMenuButton.setText(menuText + I18N.getString("controls.layers.menu.layer.text"));
     portraitMenuItem.setSelected(true);
   }
 
diff --git a/src/main/java/net/rptools/tokentool/util/ImageUtil.java b/src/main/java/net/rptools/tokentool/util/ImageUtil.java
index 6e3f683..db309c8 100644
--- a/src/main/java/net/rptools/tokentool/util/ImageUtil.java
+++ b/src/main/java/net/rptools/tokentool/util/ImageUtil.java
@@ -394,9 +394,10 @@ private static boolean isMagenta(Color color, int fudge) {
 
   public static String getFileType(File imageFile) {
     if (FilenameUtils.getExtension(imageFile.getName()).toLowerCase().equals("psd")) {
-      return "Adobe Photoshop Image";
+      return "Adobe Photoshop " + I18N.getString("imageUtil.filetype.label.image");
     } else {
-      return FilenameUtils.getExtension(imageFile.getName()).toUpperCase() + " File";
+      return FilenameUtils.getExtension(imageFile.getName()).toUpperCase()
+          + I18N.getString("imageUtil.filetype.label.extension");
     }
   }
 
@@ -424,12 +425,24 @@ public static byte[] imageToBytes(BufferedImage image, String format) throws IOE
   public static final List<ExtensionFilter> GET_EXTENSION_FILTERS() {
     List<ExtensionFilter> extensionFilters = new ArrayList<ExtensionFilter>();
     extensionFilters.add(
-        new ExtensionFilter("All Images", "*.psd", "*.png", "*.gif", "*.jpg", "*.jpeg", "*.bmp"));
-    extensionFilters.add(new ExtensionFilter("PSD Files", "*.psd"));
-    extensionFilters.add(new ExtensionFilter("PNG Files", "*.png"));
-    extensionFilters.add(new ExtensionFilter("JPG Files", "*.jpg"));
-    extensionFilters.add(new ExtensionFilter("JPEG Files", "*.jpeg"));
-    extensionFilters.add(new ExtensionFilter("BMP Files", "*.bmp"));
+        new ExtensionFilter(
+            I18N.getString("imageUtil.filetype.label.all_images"),
+            "*.psd",
+            "*.png",
+            "*.gif",
+            "*.jpg",
+            "*.jpeg",
+            "*.bmp"));
+    extensionFilters.add(
+        new ExtensionFilter("PSD" + I18N.getString("imageUtil.filetype.label.files"), "*.psd"));
+    extensionFilters.add(
+        new ExtensionFilter("PNG" + I18N.getString("imageUtil.filetype.label.files"), "*.png"));
+    extensionFilters.add(
+        new ExtensionFilter("JPG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpg"));
+    extensionFilters.add(
+        new ExtensionFilter("JPEG" + I18N.getString("imageUtil.filetype.label.files"), "*.jpeg"));
+    extensionFilters.add(
+        new ExtensionFilter("BMP" + I18N.getString("imageUtil.filetype.label.files"), "*.bmp"));
 
     return extensionFilters;
   }
diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties
index 988e52a..bf3ef32 100644
--- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties
+++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool.properties
@@ -30,12 +30,16 @@ ManageOverlays.label.Directory                          = Directory
 ManageOverlays.label.Image_Type_Description             = Image Type Description
 ManageOverlays.label.Overlays                           = Overlays
 ManageOverlays.stage.title                              = Manage Overlays
-
+imageUtil.filetype.label.image=Image
+imageUtil.filetype.label.all_images=All Images
+imageUtil.filetype.label.extension=\ File
+imageUtil.filetype.label.files=\ Files
 PdvViewer.stage.title = Select PDF
 
 RegionSelector.button.Capture = Capture
 
 TokenTool.dialog.reset.confirmation.text        = This will reset all saved UI settings back to default, are you sure?
+TokenTool.dialog.confirmation.header=Confirmation
 TokenTool.dialog.reset.confirmation.title       = Reset Settings?
 TokenTool.openBackgroundImage.filechooser.title = Select Image
 TokenTool.openPDF.filechooser.title             = Select PDF
@@ -52,7 +56,7 @@ controls.filenameSuffixLabel.tooltip     = Append a number to the file name that
 controls.layers.menu.item.background     = Background
 controls.layers.menu.item.overlay        = Overlay
 controls.layers.menu.item.portrait       = Portrait
-controls.layers.menu.layer.text          = \ Layer
+controls.layers.menu.layer.text=\ Layer
 controls.layers.menu.text                = Portrait Layer
 controls.overlayHeightLabel.text         = Height
 controls.overlayWidthLabel.text          = Width
diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties
index 411eb98..1a1bac4 100644
--- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties
+++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_da.properties
@@ -1,10 +1,13 @@
 #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
 # http://translatr.varunmalhotra.xyz/?ref=producthunt
+AppSetup.dialog.install.overlays.confirmation=Nye overlejringer blev installeret.
+AppSetup.dialog.install.overlays.confirmation.title=Nye overlejringer tilg\u00E6ngelige!
 Credits.label.Contributors=Bidragsydere
 Credits.label.Credits=Anerkendelse
 Credits.stage.title        = Om TokenTool
+ImageGallery.stage.title=PDF billeder
 ManageOverlays.button.Restore_Default_Overlays=Gendan standard overlejringer
-ManageOverlays.dialog.delete.confirmation=Er du sikker p\u00E5 at du vil slette
+ManageOverlays.dialog.delete.confirmation=Er du sikker p\u00E5 at du vil slette 
 ManageOverlays.dialog.delete.confirmation.overlays=\ overlejringer?
 ManageOverlays.dialog.delete.confirmation.these=disse
 ManageOverlays.dialog.delete.dir.confirmation=Er du sikker p\u00E5 at du \u00F8nsker at slette 
@@ -24,7 +27,18 @@ ManageOverlays.label.Directory=Mappe
 ManageOverlays.label.Image_Type_Description=Beskrivelse af billede type
 ManageOverlays.label.Overlays=Overlejringer
 ManageOverlays.stage.title=H\u00E5ndt\u00E9r overlejringer
+imageUtil.filetype.label.image=billede
+imageUtil.filetype.label.all_images=Alle billeder
+imageUtil.filetype.label.extension=\ fil
+imageUtil.filetype.label.files=\ filer
+PdvViewer.stage.title=V\u00E6lg PDF
 RegionSelector.button.Capture=Indfang
+TokenTool.dialog.reset.confirmation.text=Dette vil gendanne alle standard UI indstillinger, er du sikker?
+TokenTool.dialog.confirmation.header=Bekr\u00E6ftelse
+TokenTool.dialog.reset.confirmation.title=Nulstil indstillinger?
+TokenTool.openBackgroundImage.filechooser.title=V\u00E6lg billede
+TokenTool.openPDF.filechooser.title=V\u00E6lg PDF
+TokenTool.openPortraitImage.filechooser.title=V\u00E6lg billede
 TokenTool.save.filechooser.title=Gem som billede
 TokenTool.stage.title            = TokenTool
 TokenTool.treeview.caching=Cacher 
@@ -34,10 +48,24 @@ controls.dragAsTokenCheckbox.tooltip=Hvis valgt, vil det at tr\u00E6kke billedet
 controls.filenameLabel.text=Filnavn
 controls.filenameSuffixLabel.text=Filnavn endelse #
 controls.filenameSuffixLabel.tooltip=F\u00F8j et fortl\u00F8bende nummer til filnavnet hver gang filen gemmes. F.eks. Ork-1, Ork-2, Ork-3.
+controls.layers.menu.item.background=Baggrund
+controls.layers.menu.item.overlay=Overlejring
+controls.layers.menu.item.portrait=Portr\u00E6t
+controls.layers.menu.layer.text=\ lag
+controls.layers.menu.text=Portr\u00E6t lag
 controls.overlayHeightLabel.text=H\u00F8jde
 controls.overlayWidthLabel.text=Bredde
+controls.portrait.filenameLabel.text=Portr\u00E6t filnavn
+controls.portraitNameSuffixLabel.text=Portr\u00E6t endelse
+controls.portraitNameSuffixLabel.tooltip=Anvend polettens filnavn med den angivne tekst som endelse, f.eks. Ork [Portr\u00E6t]
+controls.save_portrait.text=Gem portr\u00E6t ved tr\u00E6k og slip
+controls.save_portrait.tooltip=N\u00E5r en polet gemmes via tr\u00E6k og slip, vil en kopi af portr\u00E6t billedet ogs\u00E5 blive gemt. .Png formattet vil blive brugt hvis billedet har transparens, ellers vil .jpg blive anvendt.
+controls.token.filenameLabel.text=Polet filnavn
 controls.tokenResolution.text          = 256 x 256
 controls.useFileNumberingCheckbox.text=Anvend fil nummerering
+controls.useTokenNameCheckbox.text=Anvend polet navn + 
+controls.use_background.text=Anvend baggrundsindstillinger
+controls.use_background.tooltip=Gem portr\u00E6t med baggundsbillede og farve hvis disse er angivet. Dette vil tvinge portr\u00E6ttet til at blive gemt som et .jpg billede.
 menu.title.edit=R_ediger
 menu.title.edit.capture.screen=Indfang _sk\u00E6rm
 menu.title.edit.copy.image=_Kopi\u00E9r billede
@@ -45,9 +73,16 @@ menu.title.edit.paste.image=Inds\u00E6t _billede
 menu.title.file=_Filer
 menu.title.file.exit=Af_slut
 menu.title.file.manage.overlays=_H\u00E5ndt\u00E9r overlejringer
+menu.title.file.open.pdf=_\u00C5ben PDF
 menu.title.file.save.as=Gem so_m
+imageFile.adobe.photoshop.image=Adobe Photoshop billede
+imageFile.fileExtension.label=\ fil
+imageFile.fileExtension.openFileExtension=filer
+imageFile.fileExtension.openFile.allExtensions=Alle billeder
 menu.title.help=_Hj\u00E6lp
 menu.title.help.about=_Om TokenTool
+menu.title.help.reset=_Gendan indstillinger
+options.pane.background.title=Baggrundsindstillinger
 options.pane.effects=Overlejring indstillinger
 options.pane.naming=Navngivningsindstillinger
 options.pane.overlay=Overlejringsindstillinger
@@ -55,13 +90,18 @@ options.pane.overlay.checkbox.clip_portrait=Trim portr\u00E6t
 options.pane.overlay.checkbox.use_as_base=Send til baggrund
 options.pane.overlay.slider.Opacity=Gennemsigtighed
 options.pane.overlay.tooltip.aspect=Behold aspektforhold for overlejringen
-options.pane.portrait=Portr\u00E6t indstillinger
-options.pane.portrait.button.Remove_Background_Color=Fjern baggrundsfarve
+options.pane.portrait.button.add_Background_Image=Skift baggrundsbillede
+options.pane.portrait.button.add_Portrait_Image=Skift portr\u00E6t billede
+options.pane.portrait.button.remove_Background_Color=Fjern baggrundsfarve
+options.pane.portrait.button.remove_Background_Image=Fjern baggrundsbillede
+options.pane.portrait.button.remove_Portrait_Image=Fjern portr\u00E6tbillede
 options.pane.portrait.color.prompt=V\u00E6lg farve bag portr\u00E6t billede
 options.pane.portrait.label.Background_Color=Baggrundsfarve
 options.pane.portrait.label.Gaussian_Blur=Gaussisk sl\u00F8ring
 options.pane.portrait.label.Glow=Gl\u00F8d
 options.pane.portrait.label.Opacity=Gennemsigtighed
+options.pane.portrait.label.effects=Portr\u00E6t effekter
+options.pane.portrait.title=Portr\u00E6t indstillinger
 pane.left.title=Tr\u00E6k eller inds\u00E6t billede her...
 splash.cache.label=Cacher overlejringer, dette tager kun et \u00F8jeblik...
 splash.version.label = Version
diff --git a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties
index f95e6f9..1f41657 100644
--- a/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties
+++ b/src/main/resources/net/rptools/tokentool/i18n/TokenTool_en.properties
@@ -29,12 +29,16 @@ ManageOverlays.label.Directory                          = Directory
 ManageOverlays.label.Image_Type_Description             = Image Type Description
 ManageOverlays.label.Overlays                           = Overlays
 ManageOverlays.stage.title                              = Manage Overlays
-
+imageUtil.filetype.label.image=Image
+imageUtil.filetype.label.all_images=All Images
+imageUtil.filetype.label.extension=\ File
+imageUtil.filetype.label.files=\ Files
 PdvViewer.stage.title = Select PDF
 
 RegionSelector.button.Capture = Capture
 
 TokenTool.dialog.reset.confirmation.text        = This will reset all saved UI settings back to default, are you sure?
+TokenTool.dialog.confirmation.header=Confirmation
 TokenTool.dialog.reset.confirmation.title       = Reset Settings?
 TokenTool.openBackgroundImage.filechooser.title = Select Image
 TokenTool.openPDF.filechooser.title             = Select PDF