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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
-
@@ -550,14 +550,14 @@
Visible
-
+ -->
-
+
@@ -594,20 +594,15 @@
-
-
+
+
+
+
+
+