diff --git a/src/yaw-shepard/CMakeLists.txt b/src/yaw-shepard/CMakeLists.txt
index ae967e6..957f03c 100644
--- a/src/yaw-shepard/CMakeLists.txt
+++ b/src/yaw-shepard/CMakeLists.txt
@@ -1,4 +1,4 @@
-dpf_add_plugin(yaw-tab
+dpf_add_plugin(yaw-tab-shepard
   TARGETS vst2
   FILES_DSP
       dsp.cpp
@@ -8,15 +8,9 @@ dpf_add_plugin(yaw-tab
       rtstylus.cpp
       ui.cpp)
 
-target_include_directories(yaw-tab PUBLIC 
+target_include_directories(yaw-tab-shepard PUBLIC 
     "."
     "../../lib/wintab"
 )
-target_compile_definitions(yaw-tab PUBLIC YAW_USE_WINTAB)
-
-set_target_properties(yaw-tab PROPERTIES VS_DOTNET_REFERENCES "System")
-set_target_properties(yaw-tab PROPERTIES COMPILE_FLAGS "/clr")
-set_target_properties(yaw-tab PROPERTIES COMPILE_FLAGS "/Zc:twoPhase-")
-
-# default compiler flags from CMAKE conflict with managed code compliation, probably a better way of doing this.
 
+target_compile_definitions(yaw-tab-shepard PUBLIC YAW_USE_WINTAB)
\ No newline at end of file
diff --git a/src/yaw-shepard/dsp.cpp b/src/yaw-shepard/dsp.cpp
index 0091087..8658b69 100644
--- a/src/yaw-shepard/dsp.cpp
+++ b/src/yaw-shepard/dsp.cpp
@@ -15,13 +15,13 @@ public:
 	}
 
 protected:
-	const char* getLabel() const override { return "yaw-tab"; }
-	const char* getDescription() const override { return "Drawing tablet synth UI"; }
+	const char* getLabel() const override { return "yaw-tab-shepard"; }
+	const char* getDescription() const override { return "Drawing tablet Shepard buzz tone"; }
 	const char* getMaker() const override { return "yaw-audio"; }
 	const char* getHomePage() const override { return "https://yaw.man/plugins/yaw-tab"; }
 	const char* getLicense() const override { return "ISC"; }
 	uint32_t    getVersion() const override { return d_version(1, 0, 0); }
-	int64_t     getUniqueId() const override { return d_cconst('y', 'w', 't', 'b'); }
+	int64_t     getUniqueId() const override { return d_cconst('y', 's', 'p', 'd'); }
 
 
 	void initParameter(uint32_t index, Parameter& parameter) override
diff --git a/src/yaw-tab/CMakeLists.txt b/src/yaw-tab/CMakeLists.txt
index ae967e6..fc52001 100644
--- a/src/yaw-tab/CMakeLists.txt
+++ b/src/yaw-tab/CMakeLists.txt
@@ -1,3 +1,6 @@
+option(USE_WINTAB true)
+option(USE_CLR false)
+
 dpf_add_plugin(yaw-tab
   TARGETS vst2
   FILES_DSP
@@ -12,11 +15,13 @@ target_include_directories(yaw-tab PUBLIC
     "."
     "../../lib/wintab"
 )
+
 target_compile_definitions(yaw-tab PUBLIC YAW_USE_WINTAB)
 
+if(USE_CLR)
 set_target_properties(yaw-tab PROPERTIES VS_DOTNET_REFERENCES "System")
 set_target_properties(yaw-tab PROPERTIES COMPILE_FLAGS "/clr")
 set_target_properties(yaw-tab PROPERTIES COMPILE_FLAGS "/Zc:twoPhase-")
-
+endif()
 # default compiler flags from CMAKE conflict with managed code compliation, probably a better way of doing this.