diff --git a/testsite/Controls/HyperlinkButtonViewModel.ts b/testsite/Controls/HyperlinkButtonViewModel.ts
new file mode 100644
index 00000000..48ad8bc7
--- /dev/null
+++ b/testsite/Controls/HyperlinkButtonViewModel.ts
@@ -0,0 +1,10 @@
+class HyperlinkButtonViewModel extends Fayde.MVVM.ViewModelBase {
+    Item: string;
+    
+    constructor()
+    {
+        this.Item = "This is a test";
+        super();        
+    }
+}
+export = HyperlinkButtonViewModel;
\ No newline at end of file
diff --git a/testsite/Controls/hyperlinkbuttonbound.fap b/testsite/Controls/hyperlinkbuttonbound.fap
new file mode 100644
index 00000000..344a32c1
--- /dev/null
+++ b/testsite/Controls/hyperlinkbuttonbound.fap
@@ -0,0 +1,32 @@
+<Application
+    xmlns="http://schemas.wsick.com/fayde"
+    xmlns:x="http://schemas.wsick.com/fayde/x"
+        xmlns:controls="Controls"
+            ThemeName="Metro">
+
+    <Grid>
+        <Grid.DataContext>
+            <controls:HyperlinkButtonViewModel />
+        </Grid.DataContext>
+
+        <StackPanel>
+            <HyperlinkButton NavigateUri="#/Home" TargetName="ContentFrame" Content="{Binding }" 
+                            HorizontalAlignment="Left" VerticalAlignment="Top" IsEnabled="False">
+                <HyperlinkButton.ContentTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Item}" />
+                    </DataTemplate>
+                </HyperlinkButton.ContentTemplate>
+            </HyperlinkButton>
+
+            <HyperlinkButton NavigateUri="#/Home" TargetName="ContentFrame" Content="{Binding }" 
+                            HorizontalAlignment="Left" VerticalAlignment="Top" IsEnabled="True">
+                <HyperlinkButton.ContentTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Item}" />
+                    </DataTemplate>
+                </HyperlinkButton.ContentTemplate>
+            </HyperlinkButton>
+        </StackPanel>
+    </Grid>
+</Application>
\ No newline at end of file
diff --git a/testsite/index.html b/testsite/index.html
index 215a7bb5..a3521cf2 100755
--- a/testsite/index.html
+++ b/testsite/index.html
@@ -23,6 +23,7 @@
         'Controls/contentcontrol.fap',
         'Controls/grid.fap',
         'Controls/hyperlinkbutton.fap',
+        'Controls/hyperlinkbuttonbound.fap',
         'Controls/itemscontrol.fap',
         'Controls/listbox.fap',
         'Controls/passwordbox.fap',
diff --git a/themes/Metro.theme.xml b/themes/Metro.theme.xml
index 5356ce5c..8f9e6e6f 100755
--- a/themes/Metro.theme.xml
+++ b/themes/Metro.theme.xml
@@ -542,7 +542,7 @@
                                 <VisualState x:Name="Normal"/>
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Duration="0"
+                                        <!--<ObjectAnimationUsingKeyFrames Duration="0"
                                                                        Storyboard.TargetProperty="Visibility"
                                                                        Storyboard.TargetName="UnderlineTextBlock">
                                             <DiscreteObjectKeyFrame KeyTime="0">
@@ -550,14 +550,14 @@
                                                     <Visibility>Visible</Visibility>
                                                 </DiscreteObjectKeyFrame.Value>
                                             </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
+                                        </ObjectAnimationUsingKeyFrames>-->
                                         <ColorAnimation Storyboard.TargetName="ContentPresenterWrapperColor"
                                                         Storyboard.TargetProperty="Color"
                                                         To="{StaticResource HighlightLightColor}" Duration="0"/>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Pressed">
-                                    <Storyboard>
+                                    <!--<Storyboard>
                                         <ObjectAnimationUsingKeyFrames Duration="0"
                                                                        Storyboard.TargetProperty="Visibility"
                                                                        Storyboard.TargetName="UnderlineTextBlock">
@@ -567,7 +567,7 @@
                                                 </DiscreteObjectKeyFrame.Value>
                                             </DiscreteObjectKeyFrame>
                                         </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
+                                    </Storyboard>-->
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
@@ -594,20 +594,15 @@
                                 <VisualState x:Name="Unfocused"/>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <TextBlock x:Name="UnderlineTextBlock"
-                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   Margin="{TemplateBinding Padding}" Text="{TemplateBinding Content}"
-                                   TextDecorations="Underline" Visibility="Collapsed"
-                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <TextBlock.Foreground>
+                       
+                        <!--<Border x:Name="UnderlineTextBlock" Margin="2,0,2,1" BorderThickness="0,0,0,1" Visibility="Collapsed">
+                            <Border.BorderBrush>
                                 <SolidColorBrush Color="{StaticResource HighlightDarkColor}"/>
-                            </TextBlock.Foreground>
-                        </TextBlock>
-                        <TextBlock x:Name="DisabledOverlay" Foreground="{StaticResource DisabledForegroundBrush}"
-                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                   Margin="{TemplateBinding Padding}" Text="{TemplateBinding Content}"
-                                   Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   Canvas.ZIndex="1"/>
+                            </Border.BorderBrush>
+                        </Border>-->
+                        
+                        <Border x:Name="DisabledOverlay" Background="#44AAAAAA" Visibility="Collapsed" Canvas.ZIndex="1" />
+                                   
                         <ContentControl>
                             <ContentControl.Foreground>
                                 <SolidColorBrush x:Name="ContentPresenterWrapperColor"
@@ -620,6 +615,7 @@
                                               Margin="{TemplateBinding Padding}"
                                               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
                         </ContentControl>
+                        
                         <Rectangle x:Name="FocusVisualElement" IsHitTestVisible="false" Opacity="0" StrokeThickness="1">
                             <Rectangle.Stroke>
                                 <SolidColorBrush Color="{StaticResource HighlightLightColor}"/>