diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 98b96b9..3d79c04 100755
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -41,8 +41,8 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.2.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
diff --git a/Tests/packages.config b/Tests/packages.config
index e9b2d17..f7121cb 100755
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.2.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.3.1.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
index f69b532..e503838 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@@ -32,7 +32,7 @@
         settings:WindowState.Save="True"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
index 0f707b4..fbaecfb 100755
--- a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
@@ -25,7 +25,7 @@
         Title="Fehlerbericht versenden"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10" Orientation="Horizontal">
         <TextBlock FontSize="72" FontWeight="Bold" Foreground="Red" Margin="0,0,10,0"
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
index 41065db..13d8cc7 100755
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
@@ -29,7 +29,7 @@
         SizeToContent="WidthAndHeight"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding CompletedMessage}" EventName="Sent">
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
index 29702d6..c02b4c4 100755
--- a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
@@ -25,7 +25,7 @@
         Title="Fehlerbericht versenden"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10" Orientation="Horizontal">
         <TextBlock FontSize="48" FontWeight="Bold" Foreground="GreenYellow" Margin="0,0,10,0"
diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs
index ab47a4b..1bdbd4f 100755
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@@ -45,7 +45,7 @@ namespace zaaReloaded2
         private void ThisAddIn_Startup(object sender, System.EventArgs e)
         {
             Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
-            RegisterTextBoxSelectAll();
+            Bovender.WpfHelpers.RegisterTextBoxSelectAll();
             CheckForUpdates();
             _oldCaption = Globals.ThisAddIn.Application.Caption;
             Globals.ThisAddIn.Application.Caption = 
@@ -155,49 +155,5 @@ namespace zaaReloaded2
         }
         
         #endregion
-
-        /// <summary>
-        /// Make text boxes select all text on focus.
-        /// </summary>
-        /// <remarks>
-        /// http://stackoverflow.com/a/2553297/270712
-        /// </remarks>
-        void RegisterTextBoxSelectAll()
-        {
-            // Select the text in a TextBox when it receives focus.
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.PreviewMouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(SelectivelyIgnoreMouseButton));
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.GotKeyboardFocusEvent,
-                new RoutedEventHandler(SelectAllText));
-            EventManager.RegisterClassHandler(typeof(TextBox), TextBox.MouseDoubleClickEvent,
-                new RoutedEventHandler(SelectAllText));
-        }
-
-        void SelectivelyIgnoreMouseButton(object sender, MouseButtonEventArgs e)
-        {
-            // Find the TextBox
-            DependencyObject parent = e.OriginalSource as UIElement;
-            while (parent != null && !(parent is TextBox))
-                parent = VisualTreeHelper.GetParent(parent);
-
-            if (parent != null)
-            {
-                var textBox = (TextBox)parent;
-                if (!textBox.IsKeyboardFocusWithin)
-                {
-                    // If the text box is not yet focused, give it the focus and
-                    // stop further processing of this click event.
-                    textBox.Focus();
-                    e.Handled = true;
-                }
-            }
-        }
-
-        void SelectAllText(object sender, RoutedEventArgs e)
-        {
-            var textBox = e.OriginalSource as TextBox;
-            if (textBox != null)
-                textBox.SelectAll();
-        }
     }
 }
diff --git a/zaaReloaded2/Views/AboutView.xaml b/zaaReloaded2/Views/AboutView.xaml
index 149c863..dab444c 100755
--- a/zaaReloaded2/Views/AboutView.xaml
+++ b/zaaReloaded2/Views/AboutView.xaml
@@ -25,7 +25,7 @@
         Title="Über..."
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="20">
         <Image Source="/zaaReloaded2;component/Icons/icon.png" Width="64" VerticalAlignment="Center" Margin="0 0 0 10" />
diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml
index 3a42d03..f4670e0 100755
--- a/zaaReloaded2/Views/ElementPickerView.xaml
+++ b/zaaReloaded2/Views/ElementPickerView.xaml
@@ -28,7 +28,7 @@
         FocusManager.FocusedElement="{Binding ElementName=treeview}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
diff --git a/zaaReloaded2/Views/ElementView.xaml b/zaaReloaded2/Views/ElementView.xaml
index 71bdd5a..352e3df 100755
--- a/zaaReloaded2/Views/ElementView.xaml
+++ b/zaaReloaded2/Views/ElementView.xaml
@@ -29,7 +29,7 @@
         FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="Inhalt:" Target="{Binding ElementName=ContentTextBox}" />
diff --git a/zaaReloaded2/Views/FirstRunView.xaml b/zaaReloaded2/Views/FirstRunView.xaml
index ec6e0f2..ead7c8d 100755
--- a/zaaReloaded2/Views/FirstRunView.xaml
+++ b/zaaReloaded2/Views/FirstRunView.xaml
@@ -29,7 +29,7 @@
         Title="Willkommen bei zaaReloaded"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <StackPanel Margin="10">
         <TextBlock FontWeight="Bold" FontSize="20" Margin="0 0 0 5">
diff --git a/zaaReloaded2/Views/IoErrorView.xaml b/zaaReloaded2/Views/IoErrorView.xaml
index b5aa8bf..56b7981 100755
--- a/zaaReloaded2/Views/IoErrorView.xaml
+++ b/zaaReloaded2/Views/IoErrorView.xaml
@@ -28,7 +28,7 @@
         Title="Import/Export-Fehler"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <TextBlock DockPanel.Dock="Left" Margin="0 0 20 0" LineHeight="72" LineStackingStrategy="BlockLineHeight"
diff --git a/zaaReloaded2/Views/ItemCommentView.xaml b/zaaReloaded2/Views/ItemCommentView.xaml
index fdbe708..3ae97d6 100755
--- a/zaaReloaded2/Views/ItemCommentView.xaml
+++ b/zaaReloaded2/Views/ItemCommentView.xaml
@@ -29,7 +29,7 @@
         FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <Label DockPanel.Dock="Top" Content="{Binding Item}"
diff --git a/zaaReloaded2/Views/PreferencesView.xaml b/zaaReloaded2/Views/PreferencesView.xaml
index 4992843..47bbd86 100755
--- a/zaaReloaded2/Views/PreferencesView.xaml
+++ b/zaaReloaded2/Views/PreferencesView.xaml
@@ -28,7 +28,7 @@
         Title="Einstellungen"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <DockPanel Margin="10">
         <UniformGrid DockPanel.Dock="Bottom" Columns="2" Rows="1"
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index 25f3f05..7ca93f2 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -31,7 +31,7 @@
         FocusManager.FocusedElement="{Binding ElementName=settingsList}"
         >
     <Window.Resources>
-        <ResourceDictionary Source="/zaaReloaded2;component/style.xaml" />
+        <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding EditSettingsMessage}" EventName="Sent">
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index e62519a..7ddf011 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -31,7 +31,7 @@
         FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
         >
     <Window.Resources>
-         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
+         <ResourceDictionary Source="/Bovender;component/Style.xaml" />
     </Window.Resources>
     <i:Interaction.Triggers>
         <i:EventTrigger SourceObject="{Binding AddElementMessage}" EventName="Sent">
diff --git a/zaaReloaded2/packages.config b/zaaReloaded2/packages.config
index b4b16d9..5c131d6 100755
--- a/zaaReloaded2/packages.config
+++ b/zaaReloaded2/packages.config
@@ -19,6 +19,6 @@
 	limitations under the License.
 -->
 <packages>
-  <package id="Bovender" version="0.2.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.3.1.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 12ef7b9..1bd5d8d 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -134,8 +134,9 @@
   -->
   <ItemGroup>
     <Reference Include="Accessibility" />
-    <Reference Include="Bovender">
-      <HintPath>..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll</HintPath>
+    <Reference Include="Bovender, Version=0.3.1.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Bovender.0.3.1.0\lib\net40\Bovender.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="PresentationCore" />