diff --git a/src/Greenshot.Addon.Office/Destinations/WordDestination.cs b/src/Greenshot.Addon.Office/Destinations/WordDestination.cs
index c231cbec2..c1efb31df 100644
--- a/src/Greenshot.Addon.Office/Destinations/WordDestination.cs
+++ b/src/Greenshot.Addon.Office/Destinations/WordDestination.cs
@@ -108,8 +108,8 @@ namespace Greenshot.Addon.Office.Destinations
 					{
 						Log.Error().WriteLine(ex);
 						// TODO: Change to general logic in ProcessExport
-						surface.SendMessageEvent(this, SurfaceMessageTyp.Error, Language.GetFormattedString("destination_exportfailed", Description));
-					}
+						surface.SendMessageEvent(this, SurfaceMessageTyp.Error, string.Format(GreenshotLanguage.DestinationExportFailed, Description));
+                    }
 				}
 			}
 			else
@@ -148,7 +148,7 @@ namespace Greenshot.Addon.Office.Destinations
 					{
 						Log.Error().WriteLine(ex);
 						// TODO: Change to general logic in ProcessExport
-						surface.SendMessageEvent(this, SurfaceMessageTyp.Error, Language.GetFormattedString("destination_exportfailed", Description));
+						surface.SendMessageEvent(this, SurfaceMessageTyp.Error, string.Format(GreenshotLanguage.DestinationExportFailed, Description));
 					}
 				}
 			}
diff --git a/src/Greenshot.Addons/Core/AbstractDestination.cs b/src/Greenshot.Addons/Core/AbstractDestination.cs
index db47ee4b2..a1419b18c 100644
--- a/src/Greenshot.Addons/Core/AbstractDestination.cs
+++ b/src/Greenshot.Addons/Core/AbstractDestination.cs
@@ -55,6 +55,7 @@ namespace Greenshot.Addons.Core
 
         [Import]
         protected IGreenshotLanguage GreenshotLanguage { get; set; }
+
         [Import]
         protected ICoreConfiguration CoreConfiguration { get; set; }
 
diff --git a/src/Greenshot.Addons/IGreenshotLanguage.cs b/src/Greenshot.Addons/IGreenshotLanguage.cs
index f8c73ed69..74dd0e39f 100644
--- a/src/Greenshot.Addons/IGreenshotLanguage.cs
+++ b/src/Greenshot.Addons/IGreenshotLanguage.cs
@@ -182,5 +182,8 @@ namespace Greenshot.Addons
 
         [DefaultValue("I know what I am doing! (expert mode)")]
         string Expert { get; }
+
+        [DefaultValue("Error while exporting to {0}. Please try again.")]
+        string DestinationExportFailed { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Greenshot.PerformanceTests/GfxPerformance.cs b/src/Greenshot.PerformanceTests/GfxPerformance.cs
index 32d1eeffc..3c86c0090 100644
--- a/src/Greenshot.PerformanceTests/GfxPerformance.cs
+++ b/src/Greenshot.PerformanceTests/GfxPerformance.cs
@@ -17,10 +17,13 @@ namespace Greenshot.PerformanceTests
     [OrderProvider(SummaryOrderPolicy.FastestToSlowest)]
     public class GfxPerformance
     {
-        //[Benchmark]
-        public void WuQuantizer()
+        [Benchmark]
+        [Arguments(PixelFormat.Format24bppRgb)]
+        [Arguments(PixelFormat.Format32bppRgb)]
+        [Arguments(PixelFormat.Format32bppArgb)]
+        public void WuQuantizer(PixelFormat pixelFormat)
         {
-            using (var bitmap = BitmapFactory.CreateEmpty(400, 400, PixelFormat.Format24bppRgb, Color.White))
+            using (var bitmap = BitmapFactory.CreateEmpty(400, 400, pixelFormat, Color.White))
             {
                 using (var graphics = Graphics.FromImage(bitmap))
                 using (var pen = new SolidBrush(Color.Blue))
diff --git a/src/Greenshot/Configuration/LanguageKeys.cs b/src/Greenshot/Configuration/LanguageKeys.cs
index 13ccea56f..f39f51d8e 100644
--- a/src/Greenshot/Configuration/LanguageKeys.cs
+++ b/src/Greenshot/Configuration/LanguageKeys.cs
@@ -32,220 +32,34 @@ namespace Greenshot.Configuration
 	[SuppressMessage("ReSharper", "InconsistentNaming")]
 	public enum LangKey
 	{
-		none,
-		about_bugs,
-		about_donations,
-		about_host,
-		about_icons,
-		about_license,
-		about_title,
-		about_translation,
-		application_title,
-		bugreport_cancel,
-		bugreport_info,
-		bugreport_title,
-		clipboard_error,
-		clipboard_inuse,
-		colorpicker_alpha,
-		colorpicker_apply,
-		colorpicker_blue,
-		colorpicker_green,
-		colorpicker_htmlcolor,
-		colorpicker_recentcolors,
-		colorpicker_red,
-		colorpicker_title,
-		colorpicker_transparent,
-		config_unauthorizedaccess_write,
-		contextmenu_about,
-		contextmenu_capturearea,
-		contextmenu_captureclipboard,
-		contextmenu_capturefullscreen,
 		contextmenu_capturefullscreen_all,
 		contextmenu_capturefullscreen_left,
 		contextmenu_capturefullscreen_top,
 		contextmenu_capturefullscreen_right,
 		contextmenu_capturefullscreen_bottom,
-		contextmenu_capturelastregion,
-		contextmenu_capturewindow,
-		contextmenu_donate,
-		contextmenu_exit,
-		contextmenu_help,
-		contextmenu_openfile,
-		contextmenu_quicksettings,
-		contextmenu_settings,
 		contextmenu_captureie,
-		contextmenu_openrecentcapture,
-		editor_align_bottom,
-		editor_align_center,
-		editor_align_horizontal,
-		editor_align_middle,
-		editor_align_left,
-		editor_align_right,
-		editor_align_top,
-		editor_align_vertical,
-		editor_arrange,
-		editor_arrowheads,
-		editor_arrowheads_both,
-		editor_arrowheads_end,
-		editor_arrowheads_none,
-		editor_arrowheads_start,
-		editor_backcolor,
-		editor_blur_radius,
-		editor_bold,
-		editor_brightness,
-		editor_cancel,
 		editor_clipboardfailed,
-		editor_close,
-		editor_close_on_save,
-		editor_close_on_save_title,
-		editor_confirm,
-		editor_copyimagetoclipboard,
-		editor_copypathtoclipboard,
-		editor_copytoclipboard,
-		editor_crop,
-		editor_cursortool,
-		editor_cuttoclipboard,
-		editor_deleteelement,
-		editor_downonelevel,
-		editor_downtobottom,
-		editor_drawarrow,
-		editor_drawellipse,
-		editor_drawhighlighter,
-		editor_drawline,
-		editor_drawfreehand,
-		editor_drawrectangle,
-		editor_drawtextbox,
-		editor_duplicate,
-		editor_edit,
 		editor_email,
-		editor_file,
-		editor_fontsize,
-		editor_forecolor,
-		editor_highlight_area,
-		editor_highlight_grayscale,
-		editor_highlight_mode,
-		editor_highlight_text,
-		editor_highlight_magnify,
-		editor_pixel_size,
-		editor_imagesaved,
-		editor_italic,
-		editor_load_objects,
-		editor_magnification_factor,
-		editor_match_capture_size,
-		editor_obfuscate,
-		editor_obfuscate_blur,
-		editor_obfuscate_mode,
-		editor_obfuscate_pixelize,
-		editor_object,
-		editor_opendirinexplorer,
-		editor_pastefromclipboard,
-		editor_preview_quality,
-		editor_print,
-		editor_save,
-		editor_save_objects,
-		editor_saveas,
-		editor_selectall,
-		editor_senttoprinter,
-		editor_shadow,
-		editor_torn_edge,
-		editor_border,
-		editor_grayscale,
-		editor_effects,
-		editor_storedtoclipboard,
-		editor_thickness,
-		editor_title,
-		editor_uponelevel,
-		editor_uptotop,
-		editor_autocrop,
-		editor_undo,
-		editor_redo,
-		editor_insertwindow,
-		editor_resetsize,
 		error,
-		error_multipleinstances,
-		error_nowriteaccess,
 		error_openfile,
 		error_openlink,
-		error_save,
-		error_save_invalid_chars,
-		help_title,
-		jpegqualitydialog_choosejpegquality,
-		qualitydialog_dontaskagain,
-		qualitydialog_title,
-		settings_reducecolors,
 		print_error,
-		printoptions_allowcenter,
-		printoptions_allowenlarge,
-		printoptions_allowrotate,
-		printoptions_allowshrink,
-		printoptions_colors,
-		printoptions_dontaskagain,
-		printoptions_pagelayout,
-		printoptions_printcolor,
-		printoptions_printgrayscale,
-		printoptions_printmonochrome,
-		printoptions_timestamp,
-		printoptions_inverted,
-		printoptions_title,
-		quicksettings_destination_file,
-		settings_alwaysshowqualitydialog,
-		settings_alwaysshowprintoptionsdialog,
-		settings_applicationsettings,
-		settings_autostartshortcut,
-		settings_capture,
-		settings_capture_mousepointer,
-		settings_capture_windows_interactive,
-		settings_copypathtoclipboard,
 		settings_destination,
-		settings_destination_clipboard,
-		settings_destination_editor,
-		settings_destination_email,
-		settings_destination_file,
 		settings_destination_fileas,
 		settings_destination_printer,
-		settings_destination_picker,
-		settings_editor,
 		settings_filenamepattern,
-		settings_general,
-		settings_iecapture,
-		settings_jpegquality,
-		settings_qualitysettings,
-		settings_language,
 		settings_message_filenamepattern,
-		settings_output,
-		settings_playsound,
-		settings_plugins,
-		settings_plugins_name,
-		settings_plugins_version,
-		settings_plugins_createdby,
-		settings_plugins_dllpath,
-		settings_preferredfilesettings,
-		settings_primaryimageformat,
-		settings_printer,
 		settings_printoptions,
-		settings_registerhotkeys,
-		settings_showflashlight,
-		settings_storagelocation,
-		settings_title,
 		settings_tooltip_filenamepattern,
 		settings_tooltip_language,
 		settings_tooltip_primaryimageformat,
-		settings_tooltip_registerhotkeys,
 		settings_tooltip_storagelocation,
 		settings_visualization,
-		settings_shownotify,
-		settings_waittime,
-		settings_windowscapture,
 		settings_window_capture_mode,
-		settings_network,
-		settings_checkperiod,
-		settings_usedefaultproxy,
 		tooltip_firststart,
 		warning,
 		warning_hotkeys,
-		hotkeys,
 		wait_ie_capture,
-		update_found,
-		exported_to
+		update_found
 	}
 }
\ No newline at end of file