diff --git a/Common/PixelLab.Common.csproj b/Common/PixelLab.Common.csproj
index bc0bb21..47c7601 100644
--- a/Common/PixelLab.Common.csproj
+++ b/Common/PixelLab.Common.csproj
@@ -33,6 +33,9 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\XamlAssemblyInfo.cs">
+      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="BrushHelper.cs" />
     <Compile Include="ColorHelper.cs" />
     <Compile Include="CommandHelpers.cs" />
diff --git a/Common/PixelLab.Common_SL4.csproj b/Common/PixelLab.Common_SL4.csproj
index 1f15e33..557a1d0 100644
--- a/Common/PixelLab.Common_SL4.csproj
+++ b/Common/PixelLab.Common_SL4.csproj
@@ -36,6 +36,9 @@
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\XamlAssemblyInfo.cs">
+      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="..\Core\ActionOnDispose.cs">
       <Link>ActionOnDispose.cs</Link>
     </Compile>
diff --git a/Demo/Silverlight/EditableTextBlockPage.xaml b/Demo/Silverlight/EditableTextBlockPage.xaml
index df2f00f..db0400a 100644
--- a/Demo/Silverlight/EditableTextBlockPage.xaml
+++ b/Demo/Silverlight/EditableTextBlockPage.xaml
@@ -2,8 +2,7 @@
     x:Class="PixelLab.SL.Demo.EditableTextBlockPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:bot="clr-namespace:PixelLab.Common;assembly=PixelLab.Common_SL4"
-    xmlns:sl="clr-namespace:PixelLab.SL;assembly=PixelLab.SL"
+    xmlns:bot="http://schemas.thinkpixellab.com/2011/xaml/presentation"
 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -15,7 +14,7 @@
     </UserControl.Resources>
 
     <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-        <sl:EditableTextBlock
+        <bot:EditableTextBlock
         Width="200" Margin="10"
         IsReadOnly="{Binding Path=IsChecked, ElementName=_readOnlyCheckBox, Mode=TwoWay}"
         IsTabStop="{Binding Path=IsChecked, ElementName=_readOnlyCheckBox, Mode=TwoWay, Converter={StaticResource enumConverter}, ConverterParameter='true->false,true'}"
diff --git a/Demo/Silverlight/FlipControlPage.xaml b/Demo/Silverlight/FlipControlPage.xaml
index 62477b5..8991f81 100644
--- a/Demo/Silverlight/FlipControlPage.xaml
+++ b/Demo/Silverlight/FlipControlPage.xaml
@@ -1,11 +1,13 @@
 <UserControl
-  x:Class="PixelLab.SL.Demo.FlipControlPage"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="400" Background="Gray"
-  xmlns:lib="clr-namespace:PixelLab.SL;assembly=PixelLab.SL" >
+    x:Class="PixelLab.SL.Demo.FlipControlPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    Background="Gray"
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
+    
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="400"  >
     <UserControl.Resources>
         <Style x:Key="PageButtonStyle" TargetType="RepeatButton">
             <Setter Property="VerticalAlignment" Value="Bottom"/>
diff --git a/Demo/Silverlight/PanZoomPage.xaml b/Demo/Silverlight/PanZoomPage.xaml
index 8c9b637..f2725de 100644
--- a/Demo/Silverlight/PanZoomPage.xaml
+++ b/Demo/Silverlight/PanZoomPage.xaml
@@ -2,7 +2,7 @@
     x:Class="PixelLab.SL.Demo.PanZoomPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:plsl="clr-namespace:PixelLab.SL;assembly=PixelLab.SL"
+    xmlns:bot="http://schemas.thinkpixellab.com/2011/xaml/presentation"
     
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -10,15 +10,15 @@
     d:DesignHeight="300" d:DesignWidth="400">
     
     <Grid x:Name="LayoutRoot" Background="White">
-        <plsl:PanZoomControl x:Name="PanZoom" Background="Transparent" MajorGridLineColor="#ebf4e9" MinorGridLineColor="#ebf4e9">
-            <plsl:AsBigAsYouWantPanel SizeChanged="AsBigAsYouWantPanel_SizeChanged">
+        <bot:PanZoomControl x:Name="PanZoom" Background="Transparent" MajorGridLineColor="#ebf4e9" MinorGridLineColor="#ebf4e9">
+            <bot:AsBigAsYouWantPanel SizeChanged="AsBigAsYouWantPanel_SizeChanged">
                 <TextBlock Text="Monkey!" FontSize="50" />
-            </plsl:AsBigAsYouWantPanel>
-        </plsl:PanZoomControl>
+            </bot:AsBigAsYouWantPanel>
+        </bot:PanZoomControl>
         
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right">
             <Button Content="1:1" Command="{Binding Path=ResetCommand, ElementName=PanZoom}" Padding="5" />
-            <plsl:DiscreteSlider x:Name="ZoomSlider" Minimum="0.2" Maximum="2" SmallChange="0.2" LargeChange="0.2" Value="{Binding Path=Scale, ElementName=PanZoom, Mode=TwoWay}" Width="200" />
+            <bot:DiscreteSlider x:Name="ZoomSlider" Minimum="0.2" Maximum="2" SmallChange="0.2" LargeChange="0.2" Value="{Binding Path=Scale, ElementName=PanZoom, Mode=TwoWay}" Width="200" />
         </StackPanel>
 
     </Grid>
diff --git a/Demo/Silverlight/SpriteButtonPage.xaml b/Demo/Silverlight/SpriteButtonPage.xaml
index 9036d38..6246d04 100644
--- a/Demo/Silverlight/SpriteButtonPage.xaml
+++ b/Demo/Silverlight/SpriteButtonPage.xaml
@@ -1,15 +1,16 @@
 <UserControl
-  x:Class="PixelLab.SL.Demo.SpriteButtonPage"
-  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-  mc:Ignorable="d"
-  d:DesignHeight="300" d:DesignWidth="400"
-  xmlns:sl="clr-namespace:PixelLab.SL;assembly=PixelLab.SL">
+    x:Class="PixelLab.SL.Demo.SpriteButtonPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:bot="http://schemas.thinkpixellab.com/2011/xaml/presentation"
+    
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    d:DesignHeight="300" d:DesignWidth="400">
 
     <UserControl.Resources>
-        <Style TargetType="sl:SpriteButton" x:Key="spriteStyle">
+        <Style TargetType="bot:SpriteButton" x:Key="spriteStyle">
             <Setter Property="ImageSource" Value="/PixelLab.SL.Demo;component/Assets/sprite.png"/>
             <Setter Property="Width" Value="32"/>
             <Setter Property="Height" Value="32"/>
@@ -24,12 +25,12 @@
     <Grid x:Name="LayoutRoot" Background="White" HorizontalAlignment="Center" VerticalAlignment="Center">
 
         <StackPanel Orientation="Horizontal" >
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="0" />
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="1" />
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="2" />
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="3" />
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="4" />
-            <sl:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="5" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="0" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="1" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="2" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="3" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="4" />
+            <bot:SpriteButton Style="{StaticResource spriteStyle}" SpriteIndex="5" />
         </StackPanel>
 
     </Grid>
diff --git a/Demo/Wpf/AnimatingTilePanelPage.xaml b/Demo/Wpf/AnimatingTilePanelPage.xaml
index a1cbfd7..67a4588 100644
--- a/Demo/Wpf/AnimatingTilePanelPage.xaml
+++ b/Demo/Wpf/AnimatingTilePanelPage.xaml
@@ -2,15 +2,14 @@
   x:Class="PixelLab.Wpf.Demo.AnimatingTilePanelPage"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:common="clr-namespace:PixelLab.Common;assembly=PixelLab.Common"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   Name="m_page">
     <Page.Resources>
         <Style TargetType="Rectangle">
             <Setter Property="Margin" Value="5"/>
         </Style>
 
-        <common:RoundDoubleConverter x:Key="RoundDoubleConverter"/>
+        <lib:RoundDoubleConverter x:Key="RoundDoubleConverter"/>
 
         <Style TargetType="TextBox">
             <Setter Property="Margin" Value="1"/>
diff --git a/Demo/Wpf/App.xaml b/Demo/Wpf/App.xaml
index 20ae936..3194d39 100644
--- a/Demo/Wpf/App.xaml
+++ b/Demo/Wpf/App.xaml
@@ -2,7 +2,7 @@
   x:Class="PixelLab.Wpf.Demo.App"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   StartupUri="MainPage.xaml">
 
     <Application.Resources>
diff --git a/Demo/Wpf/BlockBarPage.xaml b/Demo/Wpf/BlockBarPage.xaml
index b52e23f..e2d1dc1 100644
--- a/Demo/Wpf/BlockBarPage.xaml
+++ b/Demo/Wpf/BlockBarPage.xaml
@@ -1,7 +1,7 @@
 <Page
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   xmlns:core="clr-namespace:PixelLab.Core"
   core:DemoMetadataProperties.DemoName="BlockBar Control"
   core:DemoMetadataProperties.DemoDescription="Sometimes you just want a control that does its own rendering without worrying about a template. This is an example of a control that supports all of the standard data binding tricks and also draws itself. A baseclass is used to centralize common infrastructure.">
diff --git a/Demo/Wpf/ColorPicker/ColorPickerPage.xaml b/Demo/Wpf/ColorPicker/ColorPickerPage.xaml
index 5012fb5..05b085a 100644
--- a/Demo/Wpf/ColorPicker/ColorPickerPage.xaml
+++ b/Demo/Wpf/ColorPicker/ColorPickerPage.xaml
@@ -1,7 +1,7 @@
 <Page
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   xmlns:local="clr-namespace:PixelLab.Wpf.Demo"
   xmlns:core="clr-namespace:PixelLab.Core"
   core:DemoMetadataProperties.DemoName="ColorPicker Control"
diff --git a/Demo/Wpf/Graph/GraphPage.xaml b/Demo/Wpf/Graph/GraphPage.xaml
index 0fb9afd..45eb54a 100644
--- a/Demo/Wpf/Graph/GraphPage.xaml
+++ b/Demo/Wpf/Graph/GraphPage.xaml
@@ -1,13 +1,12 @@
 <Page x:Class="PixelLab.Wpf.Demo.GraphPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="clr-namespace:PixelLab.Common;assembly=PixelLab.Common"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
     xmlns:local="clr-namespace:PixelLab.Wpf.Demo"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <Page.Resources>
 
-        <common:RoundDoubleConverter x:Key="RoundDoubleConverter"/>
+        <lib:RoundDoubleConverter x:Key="RoundDoubleConverter"/>
         <local:NodeTemplateSelector x:Key="nodeTemplateSelector" />
         <local:NodeColorConverter x:Key="NodeColorConverter"/>
 
diff --git a/Demo/Wpf/InfoTextBoxPage.xaml b/Demo/Wpf/InfoTextBoxPage.xaml
index 7273397..1cbe2c6 100644
--- a/Demo/Wpf/InfoTextBoxPage.xaml
+++ b/Demo/Wpf/InfoTextBoxPage.xaml
@@ -1,7 +1,7 @@
 <Page
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   xmlns:core="clr-namespace:PixelLab.Core"
   core:DemoMetadataProperties.DemoName="Info TextBox"
   core:DemoMetadataProperties.DemoDescription="When should I build a custom control? This is a question I get a lot. I think InfoTextBox is a great example of a where a custom control adds a lot of value. You'll notice that I didn't start from scratch. I simply added a couple of properties to the existing TextBox. The properties I add are pretty boring, actually, just HasText (bool) and TextBoxInfo (string). The magic comes when I leverage these new properties in a new ControlTemplate for InfoTextBox. I think you'll agree that the results are pretty cool.">
diff --git a/Demo/Wpf/Interactive3DPage.xaml b/Demo/Wpf/Interactive3DPage.xaml
index fd09371..15c2801 100644
--- a/Demo/Wpf/Interactive3DPage.xaml
+++ b/Demo/Wpf/Interactive3DPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.Interactive3DPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
     <lib:TreeMap3DUserControl Name="m_treeMap3DUserControl"/>
 
diff --git a/Demo/Wpf/ListPagerPage.xaml b/Demo/Wpf/ListPagerPage.xaml
index f204bcc..79a1e40 100644
--- a/Demo/Wpf/ListPagerPage.xaml
+++ b/Demo/Wpf/ListPagerPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.ListPagerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation">
     <Page.Resources>
         <lib:UIListPager x:Key="listPager" PageSize="20" />
 
diff --git a/Demo/Wpf/MainPage.xaml b/Demo/Wpf/MainPage.xaml
index bf62f2f..f089edb 100644
--- a/Demo/Wpf/MainPage.xaml
+++ b/Demo/Wpf/MainPage.xaml
@@ -3,7 +3,7 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:local="clr-namespace:PixelLab.Demo.Core"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   ShowsNavigationUI="False" WindowTitle="The WPF Bag of Tricks - by Pixel Lab" Background="#00AB5B5B">
     <Page.Resources>
 
diff --git a/Demo/Wpf/NotifyWorkerPage.xaml b/Demo/Wpf/NotifyWorkerPage.xaml
index 4cade3c..475fdfa 100644
--- a/Demo/Wpf/NotifyWorkerPage.xaml
+++ b/Demo/Wpf/NotifyWorkerPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.NotifyWorkerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:common="clr-namespace:PixelLab.Common;assembly=PixelLab.Common">
+    xmlns:common="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
     <Page.Resources>
 
diff --git a/Demo/Wpf/NumericUpDownPage.xaml b/Demo/Wpf/NumericUpDownPage.xaml
index 56ef8ef..6abe6d4 100644
--- a/Demo/Wpf/NumericUpDownPage.xaml
+++ b/Demo/Wpf/NumericUpDownPage.xaml
@@ -1,7 +1,7 @@
 <Page
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   xmlns:core="clr-namespace:PixelLab.Core"
   core:DemoMetadataProperties.DemoName="NumericUpDown Control"
   core:DemoMetadataProperties.DemoDescription="NumericUpDown is a control I am frequently asked about, so I thought I'd write it. I was briefly tempted to subclass RangeBase for this, but at the end of the day, one really wants Decimal to be the base value, and RangeBase uses Double. There's quite a bit going on here: lot's of nested, styled controls. Binding. Commands. RoutedEvents. DependencyProperty Coercion. Like InfoTextBox, this control and its resources lives in an external library. Feel free to reuse it. This is still a work in progress, but I think most of the work is in the style (maybe a little to handle up-down arrow keys).">
diff --git a/Demo/Wpf/OrgTree/OrgTreePage.xaml b/Demo/Wpf/OrgTree/OrgTreePage.xaml
index c3eb398..985a3f0 100644
--- a/Demo/Wpf/OrgTree/OrgTreePage.xaml
+++ b/Demo/Wpf/OrgTree/OrgTreePage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.OrgTree.OrgTreePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
     xmlns:local="clr-namespace:PixelLab.Wpf.Demo.OrgTree">
 
     <Page.Resources>
diff --git a/Demo/Wpf/ReorderListboxPage.xaml b/Demo/Wpf/ReorderListboxPage.xaml
index f6a3bb3..924b26b 100644
--- a/Demo/Wpf/ReorderListboxPage.xaml
+++ b/Demo/Wpf/ReorderListboxPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.ReorderListBoxPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
     <Page.Resources>
         <DataTemplate DataType="{x:Type SolidColorBrush}">
diff --git a/Demo/Wpf/RevealPage.xaml b/Demo/Wpf/RevealPage.xaml
index 032d5e9..7210442 100644
--- a/Demo/Wpf/RevealPage.xaml
+++ b/Demo/Wpf/RevealPage.xaml
@@ -2,7 +2,7 @@
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
   xmlns:core="clr-namespace:PixelLab.Core"
   core:DemoMetadataProperties.DemoName="Reveal"
   core:DemoMetadataProperties.DemoDescription="This is a great example of how a custom widget--namely, Reveal--can be used in a number of places. TreeView and Expander, for example.">
diff --git a/Demo/Wpf/Set/SetPage.xaml b/Demo/Wpf/Set/SetPage.xaml
index 8e661fb..39c89a8 100644
--- a/Demo/Wpf/Set/SetPage.xaml
+++ b/Demo/Wpf/Set/SetPage.xaml
@@ -2,7 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:app="clr-namespace:PixelLab.Wpf.Demo.Set"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
     WindowTitle="WPF Set - 2008-01-30" ShowsNavigationUI="false">
 
     <Page.Background>
diff --git a/Demo/Wpf/ShowElementPage.xaml b/Demo/Wpf/ShowElementPage.xaml
index b9a61ec..9da9d87 100644
--- a/Demo/Wpf/ShowElementPage.xaml
+++ b/Demo/Wpf/ShowElementPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.ShowElementPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
     <lib:ShowElement Name="m_showElement"/>
 
diff --git a/Demo/Wpf/TreeMapPanelPage.xaml b/Demo/Wpf/TreeMapPanelPage.xaml
index c040ffe..5a0d6e2 100644
--- a/Demo/Wpf/TreeMapPanelPage.xaml
+++ b/Demo/Wpf/TreeMapPanelPage.xaml
@@ -2,7 +2,7 @@
   x:Class="PixelLab.Wpf.Demo.TreeMapPanelPage"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+  xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
     <lib:TreeMapPanel Name="m_treeMap"/>
 
diff --git a/Demo/Wpf/TreeViewHelperClasses/TreeViewHelperPage.xaml b/Demo/Wpf/TreeViewHelperClasses/TreeViewHelperPage.xaml
index 3ea2b9b..da6c39b 100644
--- a/Demo/Wpf/TreeViewHelperClasses/TreeViewHelperPage.xaml
+++ b/Demo/Wpf/TreeViewHelperClasses/TreeViewHelperPage.xaml
@@ -1,7 +1,7 @@
 <Page x:Class="PixelLab.Wpf.Demo.TreeViewHelperPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:tvh="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf">
+    xmlns:tvh="http://schemas.thinkpixellab.com/2011/xaml/presentation">
     <Page.Resources>
         <Style TargetType="{x:Type Button}">
             <Setter Property="Margin" Value="3"/>
diff --git a/Demo/Wpf/ZapPage.xaml b/Demo/Wpf/ZapPage.xaml
index 38437df..cdc6a68 100644
--- a/Demo/Wpf/ZapPage.xaml
+++ b/Demo/Wpf/ZapPage.xaml
@@ -1,7 +1,7 @@
 <Page  x:Class="PixelLab.Wpf.Demo.ZapPage"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:lib="clr-namespace:PixelLab.Wpf;assembly=PixelLab.Wpf"
+    xmlns:lib="http://schemas.thinkpixellab.com/2011/xaml/presentation"
     xmlns:local="clr-namespace:PixelLab.Demo.Core"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <Page.Resources>
diff --git a/Silverlight/Properties/AssemblyInfo.cs b/Silverlight/Properties/AssemblyInfo.cs
index 5f28270..4a3b32b 100644
--- a/Silverlight/Properties/AssemblyInfo.cs
+++ b/Silverlight/Properties/AssemblyInfo.cs
@@ -1 +1,3 @@
-
\ No newline at end of file
+using System.Windows.Markup;
+
+[assembly: XmlnsDefinition("http://schemas.thinkpixellab.com/2011/xaml/presentation", "PixelLab.SL")]
diff --git a/Silverlight/Themes/generic.xaml b/Silverlight/Themes/generic.xaml
index 954d5a8..73256e3 100644
--- a/Silverlight/Themes/generic.xaml
+++ b/Silverlight/Themes/generic.xaml
@@ -1,17 +1,17 @@
 <ResourceDictionary
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-  xmlns:plsl="clr-namespace:PixelLab.SL">
+  xmlns:bot="http://schemas.thinkpixellab.com/2011/xaml/presentation">
 
-    <Style TargetType="plsl:SpriteButton">
+    <Style TargetType="bot:SpriteButton">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderBrush" Value="{x:Null}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="plsl:SpriteButton">
+                <ControlTemplate TargetType="bot:SpriteButton">
                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <plsl:SpriteElement HorizontalAlignment="Center" VerticalAlignment="Center"
+                        <bot:SpriteElement HorizontalAlignment="Center" VerticalAlignment="Center"
                                 SpriteWidth="{TemplateBinding SpriteWidth}" SpriteHeight="{TemplateBinding SpriteHeight}"
                                 ImageSource="{TemplateBinding ImageSource}"
                                 NextOffsetX="{TemplateBinding NextOffsetX}" NextOffsetY="{TemplateBinding NextOffsetY}"
@@ -26,14 +26,14 @@
         </Setter>
     </Style>
 
-    <Style TargetType="plsl:PanZoomControl">
+    <Style TargetType="bot:PanZoomControl">
         <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="plsl:PanZoomControl">
+                <ControlTemplate TargetType="bot:PanZoomControl">
                     <Grid Background="{TemplateBinding Background}" UseLayoutRounding="True">
 
-                        <plsl:GridLineControl x:Name="glc"
+                        <bot:GridLineControl x:Name="glc"
                                               IsHitTestVisible="False"
                                               MajorGridLineColor="{TemplateBinding MajorGridLineColor}"
                                               MajorGridLineDistance="{TemplateBinding MajorGridLineDistance}"
@@ -159,7 +159,7 @@
         <Setter Property="Margin" Value="0 0 2 0" />
     </Style>
 
-    <Style TargetType="plsl:EditableTextBlock">
+    <Style TargetType="bot:EditableTextBlock">
         <Setter Property="BorderBrush">
             <Setter.Value>
                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
@@ -179,7 +179,7 @@
         <Setter Property="ReadOnlyForeground" Value="#FF000000"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="plsl:EditableTextBlock">
+                <ControlTemplate TargetType="bot:EditableTextBlock">
                     <Grid x:Name="RootElement">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
diff --git a/Wpf/Properties/AssemblyInfo.cs b/Wpf/Properties/AssemblyInfo.cs
index 2db8471..ddaeaee 100644
--- a/Wpf/Properties/AssemblyInfo.cs
+++ b/Wpf/Properties/AssemblyInfo.cs
@@ -1,3 +1,5 @@
 using System.Windows;
+using System.Windows.Markup;
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)]
+[assembly: XmlnsDefinition("http://schemas.thinkpixellab.com/2011/xaml/presentation", "PixelLab.Wpf")]
diff --git a/XamlAssemblyInfo.cs b/XamlAssemblyInfo.cs
new file mode 100644
index 0000000..2bc62e5
--- /dev/null
+++ b/XamlAssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Windows.Markup;
+
+[assembly: XmlnsDefinition("http://schemas.thinkpixellab.com/2011/xaml/presentation", "PixelLab.Common")]