diff --git a/OpenContent/View.ascx b/OpenContent/View.ascx
index 1d8f3686..ffdf0b88 100644
--- a/OpenContent/View.ascx
+++ b/OpenContent/View.ascx
@@ -3,47 +3,9 @@
 <uc1:TemplateInit runat="server" ID="TemplateInitControl" />
 
 <asp:Panel ID="pInit" runat="server" Visible="false">
-    <style>
-        .dnnFormItem input[type="checkbox"], .dnnFormItem input[type="radio"] {
-            display: inline-block;
-            width: auto;
-            margin: 6px 5px 6px 5px;
-        }
-        .octemplate {
-            float: left;
-            width: 160px;
-        }
-        .octemplate a {
-            background-color: #3D3C3C;
-            display: block;
-            height: 2em;
-            padding: 0.3em 0.5em;
-            margin: 0.3em;
-            color: #ffffff;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            border-radius: 3px;
-        }
-        .octemplate a.advanced {
-            background-color: #1DAFE5;
-        }
-        .octemplate a.advanced:hover {
-            color: #3D3C3C;
-        }
-        .octemplate a:visited {
-            color: #ffffff;
-        }
-        .octemplate a:hover {
-            color: #1DAFE5;
-        }
-        [v-cloak] {
-            display: none;
-        }
-    </style>
 
 <asp:Panel ID="pVue" runat="server"  >
-    <div v-if="step==1" v-cloak>
+    <div class="oc-view" v-if="step==1" v-cloak>
         <div v-if ="!advanced ">
             <p style="text-align:center">Choose a template</p>
             <div class="octemplate" v-for="(val, index) in templates" v-if="index < 23">
@@ -480,4 +442,4 @@
     }(jQuery, window.Sys));
 </script>
 
-</asp:Panel>
\ No newline at end of file
+</asp:Panel>
diff --git a/OpenContent/module.css b/OpenContent/module.css
index e594c20f..18692b4b 100644
--- a/OpenContent/module.css
+++ b/OpenContent/module.css
@@ -1,12 +1,12 @@
-.aspNetDisabled, a.aspNetDisabled, .dnnDisabled, a.dnnDisabled {
+.DnnModule-OpenContent .aspNetDisabled, .DnnModule-OpenContent a.aspNetDisabled, .DnnModule-OpenContent .dnnDisabled, a.dnnDisabled {
     color: #ccc !important;
 }
 
-.dnnFormPopup {
+.DnnModule-OpenContent .dnnFormPopup {
     z-index: 10000000;
 }
 
-.dnnFormPopup .ui-dialog-titlebar {
+.DnnModule-OpenContent .dnnFormPopup .ui-dialog-titlebar {
     position: relative;
     border-bottom: none;
     font-size: 14px;
@@ -15,7 +15,7 @@
     /*margin-bottom: 5px;*/
 }
 
-.easyimage {
+.DnnModule-OpenContent .easyimage {
     background: transparent;
     border: none;
     outline: 0px;
@@ -25,17 +25,57 @@
     text-align: center;
 }
 
-.easyimage img {
+.DnnModule-OpenContent .easyimage img {
     display: block;
     height: auto;
     margin: 0 auto;
     max-width: 100%;
 }
 
-.easyimage.easyimage-side {
+.DnnModule-OpenContent .easyimage.easyimage-side {
     float: right;
     max-width: 50%;
     min-width: 10em;
     margin-left: 1.5em;
 }
 
+
+/* For Template Picker */
+
+.DnnModule-OpenContent .oc-view .dnnFormItem input[type="checkbox"], .DnnModule-OpenContent .oc-view .dnnFormItem input[type="radio"] {
+	display: inline-block;
+	width: auto;
+	margin: 6px 5px 6px 5px;
+}
+.DnnModule-OpenContent .oc-view .octemplate {
+	float: left;
+	width: 160px;
+}
+.DnnModule-OpenContent .oc-view .octemplate a {
+	background-color: #3D3C3C;
+	display: block;
+	height: 2em;
+	padding: 0.3em 0.5em;
+	margin: 0.3em;
+	color: #ffffff;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	border-radius: 3px;
+}
+.DnnModule-OpenContent .oc-view .octemplate a.advanced {
+	background-color: #1DAFE5;
+}
+.DnnModule-OpenContent .oc-view .octemplate a.advanced:hover {
+	color: #3D3C3C;
+}
+.DnnModule-OpenContent .oc-view .octemplate a:visited {
+	color: #ffffff;
+}
+.DnnModule-OpenContent .oc-view .octemplate a:hover {
+	color: #1DAFE5;
+}
+
+.DnnModule-OpenContent .oc-view [v-cloak] {
+	display: none;
+}