diff --git a/forms/configInfo.xaml b/forms/configInfo.xaml
index 0f8cbf7..a87ecba 100644
--- a/forms/configInfo.xaml
+++ b/forms/configInfo.xaml
@@ -6,64 +6,238 @@
         xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties"
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
-        Title="Konfiguration © Copyright" 
-        Height="295" Width="500" 
-        Icon="/Customer Panel;component/Resources/icons/logo_CustomerPanel.ico"
+        Title="Konfiguration © Copyright"
+        Height="410"
+        Width="760"
+        MinHeight="410"
+        MinWidth="760"
+        ResizeMode="NoResize"
+        Background="{DynamicResource backgroundColor}"
+        Icon="/Customer Panel;component/Resources/icons/logo_CustomerPanel.ico">
+    <Window.Resources>
+        <Style x:Key="ConfigLabelStyle"
+               TargetType="TextBlock">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource navForeground}" />
+            <Setter Property="FontSize"
+                    Value="14" />
+            <Setter Property="FontWeight"
+                    Value="SemiBold" />
+            <Setter Property="VerticalAlignment"
+                    Value="Center" />
+        </Style>
+        <Style x:Key="ConfigValueContainerStyle"
+               TargetType="Border">
+            <Setter Property="Background"
+                    Value="{DynamicResource inputBackgroundColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="CornerRadius"
+                    Value="10" />
+            <Setter Property="Padding"
+                    Value="12,8" />
+        </Style>
+        <Style x:Key="ConfigValueTextStyle"
+               TargetType="TextBlock">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource navForeground}" />
+            <Setter Property="FontSize"
+                    Value="14" />
+            <Setter Property="TextWrapping"
+                    Value="Wrap" />
+            <Setter Property="VerticalAlignment"
+                    Value="Center" />
+        </Style>
+        <Style x:Key="ConfigActionButtonStyle"
+               TargetType="Button">
+            <Setter Property="Foreground"
+                    Value="{DynamicResource buttonTextColor}" />
+            <Setter Property="Background"
+                    Value="{DynamicResource inactiveButtonColor}" />
+            <Setter Property="BorderBrush"
+                    Value="{DynamicResource panelBorderColor}" />
+            <Setter Property="BorderThickness"
+                    Value="1" />
+            <Setter Property="Padding"
+                    Value="14,6" />
+            <Setter Property="Cursor"
+                    Value="Hand" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="ButtonBorder"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="10">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center"
+                                              Margin="{TemplateBinding Padding}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver"
+                                     Value="True">
+                                <Setter TargetName="ButtonBorder"
+                                        Property="Background"
+                                        Value="{DynamicResource activeButtonColor}" />
+                                <Setter Property="Foreground"
+                                        Value="White" />
+                            </Trigger>
+                            <Trigger Property="IsPressed"
+                                     Value="True">
+                                <Setter TargetName="ButtonBorder"
+                                        Property="Opacity"
+                                        Value="0.9" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
 
-    ResizeMode="NoResize">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="110*"/>
-            <ColumnDefinition Width="375*"/>
-            <ColumnDefinition Width="9*"/>
-        </Grid.ColumnDefinitions>
-        
-        <Button Visibility="Hidden"  Content="Reset Panel Position" PreviewMouseDown="Button_PreviewMouseDown" Margin="230,10,0,215" Grid.Column="1" Grid.ColumnSpan="2"/>
-        <StackPanel Orientation="Vertical" Grid.ColumnSpan="3">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="20,20,0,0" Text="MatrixServer" TextDecorations="Underline" FontSize="14"></TextBlock>
-                <TextBlock Margin="20,20,0,0" x:Name="TxtMatrixServer"/>
-            </StackPanel>
-            <StackPanel>
-                <Separator></Separator>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="20,20,0,0" Text="Ticket Update interval" TextDecorations="Underline" FontSize="14"></TextBlock>
-                <TextBlock Margin="20,20,0,0" x:Name="TxtUpdateIntervalTickets"/>
-            </StackPanel>
-            <StackPanel>
-                <Separator></Separator>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="20,20,0,0" Text="Announcements Update Interval Regular" TextDecorations="Underline" FontSize="14"></TextBlock>
-                <TextBlock Margin="20,20,0,0" x:Name="TxtUpdateIntervalRegularAnnouncements"/>
-            </StackPanel>
-            <StackPanel>
-                <Separator></Separator>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Margin="20,20,0,0" Text="Announcements Update Interval AdHoc" TextDecorations="Underline" FontSize="14"></TextBlock>
-                <TextBlock Margin="20,20,0,0" x:Name="TxtUpdateIntervalAdHocAnnouncements"/>
-            </StackPanel>
-            <StackPanel>
-                <Separator></Separator>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Margin="0,40,0,0">
+    <Grid Margin="16">
+        <Border CornerRadius="16"
+                BorderThickness="1"
+                BorderBrush="{DynamicResource panelBorderColor}"
+                Background="{DynamicResource panelBackgroundColor}">
+            <Grid Margin="20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="16" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="16" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
 
-                <TextBlock Margin="20,0,0,0" x:Name="TxtCopyRight" >
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Vertical"
+                                VerticalAlignment="Center">
+                        <TextBlock Text="Konfiguration"
+                                   Foreground="{DynamicResource navForeground}"
+                                   FontSize="22"
+                                   FontWeight="Bold" />
+                        <TextBlock Text="Aktuelle Verbindungs- und Aktualisierungswerte"
+                                   Foreground="{DynamicResource navForeground}"
+                                   Opacity="0.75"
+                                   Margin="0,4,0,0" />
+                    </StackPanel>
+                    <Image Grid.Column="1"
+                           Width="140"
+                           Height="38"
+                           Margin="16,0,0,0"
+                           VerticalAlignment="Center"
+                           Stretch="Uniform"
+                           Source="/Customer Panel;component/Resources/consulting4it-header1.png" />
+                </Grid>
 
-                </TextBlock>
-                <TextBlock Margin="5,0,0,0">
-                    <Hyperlink NavigateUri="http://www.consulting4it.de" RequestNavigate="Hyperlink_RequestNavigate">
-                    Consulting4IT GmbH
-                    </Hyperlink>
+                <Grid Grid.Row="2">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="270" />
+                        <ColumnDefinition Width="12" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
 
-                </TextBlock>
+                    <TextBlock Grid.Row="0"
+                               Grid.Column="0"
+                               Text="MatrixServer"
+                               Style="{StaticResource ConfigLabelStyle}" />
+                    <Border Grid.Row="0"
+                            Grid.Column="2"
+                            Style="{StaticResource ConfigValueContainerStyle}">
+                        <TextBlock x:Name="TxtMatrixServer"
+                                   Style="{StaticResource ConfigValueTextStyle}" />
+                    </Border>
 
-                <Button Margin="-110,20,0,0" Content="Creative Commons" PreviewMouseDown="OnCcClicked"></Button>
-                <Image Margin="20,-25,0,0" Source="/Customer Panel;component/Resources/consulting4it-header1.png" Height="60" HorizontalAlignment="Right"  />
-            </StackPanel>
-        </StackPanel>
+                    <TextBlock Grid.Row="2"
+                               Grid.Column="0"
+                               Text="Ticket Update Interval"
+                               Style="{StaticResource ConfigLabelStyle}" />
+                    <Border Grid.Row="2"
+                            Grid.Column="2"
+                            Style="{StaticResource ConfigValueContainerStyle}">
+                        <TextBlock x:Name="TxtUpdateIntervalTickets"
+                                   Style="{StaticResource ConfigValueTextStyle}" />
+                    </Border>
 
+                    <TextBlock Grid.Row="4"
+                               Grid.Column="0"
+                               Text="Announcements Update Interval Regular"
+                               Style="{StaticResource ConfigLabelStyle}" />
+                    <Border Grid.Row="4"
+                            Grid.Column="2"
+                            Style="{StaticResource ConfigValueContainerStyle}">
+                        <TextBlock x:Name="TxtUpdateIntervalRegularAnnouncements"
+                                   Style="{StaticResource ConfigValueTextStyle}" />
+                    </Border>
+
+                    <TextBlock Grid.Row="6"
+                               Grid.Column="0"
+                               Text="Announcements Update Interval AdHoc"
+                               Style="{StaticResource ConfigLabelStyle}" />
+                    <Border Grid.Row="6"
+                            Grid.Column="2"
+                            Style="{StaticResource ConfigValueContainerStyle}">
+                        <TextBlock x:Name="TxtUpdateIntervalAdHocAnnouncements"
+                                   Style="{StaticResource ConfigValueTextStyle}" />
+                    </Border>
+                </Grid>
+
+                <Border Grid.Row="4"
+                        Background="{DynamicResource inputBackgroundColor}"
+                        BorderBrush="{DynamicResource panelBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="10"
+                        Padding="12,10">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <StackPanel Orientation="Horizontal"
+                                    VerticalAlignment="Center">
+                            <TextBlock x:Name="TxtCopyRight"
+                                       Foreground="{DynamicResource navForeground}"
+                                       VerticalAlignment="Center" />
+                            <TextBlock Margin="6,0,0,0"
+                                       VerticalAlignment="Center">
+                                <Hyperlink NavigateUri="http://www.consulting4it.de"
+                                           RequestNavigate="Hyperlink_RequestNavigate">
+                                    Consulting4IT GmbH
+                                </Hyperlink>
+                            </TextBlock>
+                        </StackPanel>
+
+                        <Button Grid.Column="1"
+                                Content="Creative Commons"
+                                Style="{StaticResource ConfigActionButtonStyle}"
+                                Click="OnCcClicked" />
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
+
+        <Button Visibility="Hidden"
+                Content="Reset Panel Position"
+                PreviewMouseDown="Button_PreviewMouseDown"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Margin="0,0,8,0" />
     </Grid>
 </Window>