diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props
index 43fef6e5cd..4b8b22fa42 100644
--- a/src/Directory.Build.Props
+++ b/src/Directory.Build.Props
@@ -15,7 +15,7 @@
-
+
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
index e08c652d0f..e76242385c 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
@@ -46,13 +46,24 @@
+ Style="{StaticResource MahApps.Styles.ListBox.Virtualized}">
+
+
+
+
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
index 4a1d7ffdbc..cab875e9ba 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
@@ -56,7 +56,9 @@
-
+
-
-
+
+
@@ -95,8 +99,9 @@
-
+
+
@@ -104,29 +109,45 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
+
+
+
diff --git a/src/MahApps.Metro/MahApps.Metro.csproj b/src/MahApps.Metro/MahApps.Metro.csproj
index 48298745ba..24d1bdba0a 100644
--- a/src/MahApps.Metro/MahApps.Metro.csproj
+++ b/src/MahApps.Metro/MahApps.Metro.csproj
@@ -15,7 +15,7 @@
-
+
all
diff --git a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
index 097cec0910..c5c8a35a10 100644
--- a/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ComboBox.xaml
@@ -620,7 +620,9 @@
-
+
+
diff --git a/src/MahApps.Metro/Styles/Controls.ListBox.xaml b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
index aed4e29409..9c45d75dac 100644
--- a/src/MahApps.Metro/Styles/Controls.ListBox.xaml
+++ b/src/MahApps.Metro/Styles/Controls.ListBox.xaml
@@ -1,6 +1,7 @@
+ xmlns:Controls="clr-namespace:MahApps.Metro.Controls"
+ xmlns:converters="clr-namespace:MahApps.Metro.Converters">