diff --git a/SpiralSound/PluginManager.C b/SpiralSound/PluginManager.C
index 28d772e..b6b0bc3 100644
--- a/SpiralSound/PluginManager.C
+++ b/SpiralSound/PluginManager.C
@@ -50,7 +50,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginName)
 	// Link the neccesary functions 
 	char *error;
 	
-	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "CreateInstance"); 	
+	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_CreateInstance"); 	
 	
 	if ((error = dlerror()) != NULL)
     {
@@ -58,7 +58,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginName)
          return PluginError;
     }
 	
-	NewPlugin->GetIcon = (char **(*)()) dlsym(NewPlugin->Handle, "GetIcon");
+	NewPlugin->GetIcon = (char **(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_GetIcon");
 
     if ((error = dlerror()) != NULL)
     {
@@ -66,7 +66,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginName)
          return PluginError;
     }
 
-	NewPlugin->GetID  = (int(*)()) dlsym(NewPlugin->Handle, "GetID"); 	
+	NewPlugin->GetID  = (int(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_GetID"); 	
 			
     if ((error = dlerror()) != NULL)
     {
@@ -74,7 +74,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginName)
         return PluginError;
     }  
 	     
-	NewPlugin->GetGroupName  = (string(*)()) dlsym(NewPlugin->Handle, "GetGroupName"); 	
+	NewPlugin->GetGroupName  = (string(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_GetGroupName"); 	
 			
     if ((error = dlerror()) != NULL)
     {
diff --git a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
index d9ba771..cd3d528 100644
--- a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
+++ b/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
@@ -24,22 +24,22 @@
 #define PI 3.141592654
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new AmpPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0009;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Amps/Mixers";
 }
diff --git a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
index 0d55d30..a1e5607 100644
--- a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
+++ b/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
@@ -26,22 +26,22 @@
 static const int GRANULARITY = 10;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new AnotherFilterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 43;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
index 18cc77e..9d307ac 100644
--- a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
+++ b/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new BeatMatchPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 48;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
index 9913582..cd688ca 100644
--- a/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
+++ b/SpiralSound/Plugins/ComplexEnvelopePlugin/ComplexEnvelopePlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new ComplexEnvelopePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 33;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "SpiralSound";
 }
diff --git a/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C b/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
index 6588832..a620081 100644
--- a/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
+++ b/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
@@ -23,22 +23,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new ControllerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0003;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
index 13a68e9..7d5f43c 100644
--- a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
+++ b/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new CounterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 45;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C b/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
index b306cbc..c59473d 100644
--- a/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
+++ b/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
@@ -23,22 +23,22 @@
 static const float MAX_DELAY=1.0f;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new DelayPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000f;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
diff --git a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C
index f6f2e5d..aa00a14 100644
--- a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C
+++ b/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPlugin.C
@@ -45,22 +45,22 @@ static const HostInfo* host;
 
 extern "C"
 {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new DiskWriterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {	
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 41;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "InputOutput";
 }
diff --git a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
index 7ce8c77..97fa182 100644
--- a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
+++ b/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new DistributorPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0056;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C b/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
index caed83c..5f14f92 100644
--- a/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
+++ b/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
@@ -23,22 +23,22 @@
 static const float MAX_DELAY=1.0f;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new EchoPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000e;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
diff --git a/SpiralSound/Plugins/Edit.sh b/SpiralSound/Plugins/Edit.sh
index 067fe18..9c8d702 100755
--- a/SpiralSound/Plugins/Edit.sh
+++ b/SpiralSound/Plugins/Edit.sh
@@ -5,6 +5,6 @@ do
 echo $file
 cd $file/
 chmod +w $file.C
-nedit $file.C
+python ../sr.py $file.C ../sr.csv
 cd ..
 done
diff --git a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
index ac566a5..ad06365 100644
--- a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
+++ b/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new EnvFollowerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0013;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
index 29870f6..5b2948d 100644
--- a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
+++ b/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new EnvelopePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0005;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C b/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
index 249c6fe..3a8adf6 100644
--- a/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
+++ b/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
@@ -27,22 +27,22 @@ static const float MIN_CUTOFF = 500;
 static const int   FILTERGRAN = 50;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new FilterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000b;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
index 98dc626..3219aea 100644
--- a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
+++ b/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new FlipflopPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 46;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
index 9a62118..311c813 100644
--- a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
+++ b/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
@@ -60,22 +60,22 @@ static double memory[5][10]={{0,0,0,0,0,0,0,0,0,0},
 //---------------------------------------------------------------------------------
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new FormantFilterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 42;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/JackPlugin/JackPlugin.C b/SpiralSound/Plugins/JackPlugin/JackPlugin.C
index 47c797d..8a84ccf 100644
--- a/SpiralSound/Plugins/JackPlugin/JackPlugin.C
+++ b/SpiralSound/Plugins/JackPlugin/JackPlugin.C
@@ -314,22 +314,22 @@ void JackClient::SetOutputBuf(int ID, float* s)
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new JackPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {	
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 31;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "InputOutput";
 }
diff --git a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
index 59dcbb8..8d623cf 100644
--- a/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
+++ b/SpiralSound/Plugins/JoystickPlugin/JoystickPlugin.C
@@ -34,22 +34,22 @@ int JoystickPlugin::m_RefCount=0;
 int JoystickPlugin::m_NoExecuted=0;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
   return new JoystickPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {	
   return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
   return 0x0070;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "SpiralSound";
 }
diff --git a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C
index aaaa0f2..f852c48 100644
--- a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C
+++ b/SpiralSound/Plugins/KeyboardPlugin/KeyboardPlugin.C
@@ -22,22 +22,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new KeyboardPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 40;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "InputOutput";
 }
diff --git a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in
index 0ce5486..14c5e9a 100644
--- a/SpiralSound/Plugins/KeyboardPlugin/Makefile.in
+++ b/SpiralSound/Plugins/KeyboardPlugin/Makefile.in
@@ -47,7 +47,6 @@ HEADERS =	../SpiralPlugin.h \
 		../Widgets/Fl_Knob.H \
 		../Widgets/Fl_DragBar.H \
 		../../Sample.h \
-		../../Midi.h \
 		KeyboardPlugin.h \
 		KeyboardPluginGUI.h
 SOURCES =	../SpiralPlugin.C \
@@ -56,7 +55,6 @@ SOURCES =	../SpiralPlugin.C \
 		../Widgets/Fl_Knob.cxx \
 		../Widgets/Fl_DragBar.cxx \
 		../../Sample.C \
-		../../Midi.C \
 		KeyboardPlugin.C \
 		KeyboardPluginGUI.C
 OBJECTS =	../SpiralPlugin.o \
@@ -65,7 +63,6 @@ OBJECTS =	../SpiralPlugin.o \
 		../Widgets/Fl_Knob.o \
 		../Widgets/Fl_DragBar.o \
 		../../Sample.o \
-		../../Midi.o \
 		KeyboardPlugin.o \
 		KeyboardPluginGUI.o
 INTERFACES =	
@@ -147,10 +144,6 @@ install:
 		../../Sample.h \
 		../../SpiralInfo.h
 
-../../Midi.o: ../../Midi.C \
-		../../Midi.h \
-		../../NoteTable.h
-
 KeyboardPlugin.o: KeyboardPlugin.C \
 		KeyboardPlugin.h \
 		../SpiralPlugin.h \
@@ -163,7 +156,6 @@ KeyboardPlugin.o: KeyboardPlugin.C \
 		../SpiralPluginGUI.h \
 		../Widgets/Fl_DragBar.H \
 		../../NoteTable.h \
-		../../Midi.h \
 		SpiralIcon.xpm
 
 KeyboardPluginGUI.o: KeyboardPluginGUI.C \
diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
index a705bda..c2218f8 100644
--- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
+++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
@@ -28,22 +28,22 @@
 ////////////////////////////////////////////////////
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new LADSPAPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0016;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
index 05b8e54..7e9d37f 100644
--- a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
+++ b/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
@@ -22,13 +22,13 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance() { return new LFOPlugin; }
+SpiralPlugin* SpiralPlugin_CreateInstance() { return new LFOPlugin; }
 
-char** GetIcon() { return SpiralIcon_xpm; }
+char** SpiralPlugin_GetIcon() { return SpiralIcon_xpm; }
 
-int GetID() { return 124; }
+int SpiralPlugin_GetID() { return 124; }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Oscillators";
 }
diff --git a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
index 591836c..b566ed7 100644
--- a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
+++ b/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
@@ -23,22 +23,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new LogicPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 52;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
index 30d27cb..a065b90 100644
--- a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
+++ b/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
@@ -29,22 +29,22 @@ float RandRange(float L, float H)
 }
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new MasherPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 54;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
index fa71d23..8fdfc18 100644
--- a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
+++ b/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
@@ -23,22 +23,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new MatrixPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0012;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Sequencing";
 }
diff --git a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C
index 22af8b5..9af6fee 100644
--- a/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C
+++ b/SpiralSound/Plugins/MeterPlugin/MeterPlugin.C
@@ -21,13 +21,13 @@
 
 extern "C" {
 
-SpiralPlugin* CreateInstance() { return new MeterPlugin; }
+SpiralPlugin* SpiralPlugin_CreateInstance() { return new MeterPlugin; }
 
-char** GetIcon() { return SpiralIcon_xpm; }
+char** SpiralPlugin_GetIcon() { return SpiralIcon_xpm; }
 
-int GetID() { return 123; }
+int SpiralPlugin_GetID() { return 123; }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
index a34c4e2..664a2b5 100644
--- a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
+++ b/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
@@ -26,22 +26,22 @@
 int MidiPlugin::m_RefCount = 0;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new MidiPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0002;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "InputOutput";
 }
diff --git a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
index f38d818..005848a 100644
--- a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
+++ b/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
@@ -23,13 +23,13 @@
 
 extern "C" {
 
-   SpiralPlugin* CreateInstance () { return new MixSwitchPlugin; }
+   SpiralPlugin* SpiralPlugin_CreateInstance () { return new MixSwitchPlugin; }
 
-   char** GetIcon () { return SpiralIcon_xpm; }
+   char** SpiralPlugin_GetIcon () { return SpiralIcon_xpm; }
 
-   int GetID () { return 126; }
+   int SpiralPlugin_GetID () { return 126; }
 
-   string GetGroupName() { return "Maths/Logic"; }
+   string SpiralPlugin_GetGroupName() { return "Maths/Logic"; }
 }
 
 ///////////////////////////////////////////////////////
diff --git a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
index 4b1ce76..59bd89f 100644
--- a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
+++ b/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
@@ -23,22 +23,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new MixerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0007;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Amps/Mixers";
 }
diff --git a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
index 5868adb..3a22802 100644
--- a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
+++ b/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
@@ -26,22 +26,22 @@
 static const int GRANULARITY = 10;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new MoogFilterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000d;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
index c9ac369..faa9ef2 100644
--- a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
+++ b/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
@@ -22,22 +22,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new NoisePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 49;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Oscillators";
 }
diff --git a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
index 0086615..795febf 100644
--- a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
+++ b/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new NoteSnapPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0018;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
index 5e7e824..fe009e9 100644
--- a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
+++ b/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new OperatorPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 44;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
index 5f83da4..4212ae8 100644
--- a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
+++ b/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
@@ -28,22 +28,22 @@ static const int IN_SHLEN = 2;
 static const int OUT_MAIN = 0;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new OscillatorPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0004;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Oscillators";
 }
diff --git a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C
index e70af7b..64a8e7c 100644
--- a/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C
+++ b/SpiralSound/Plugins/OutputPlugin/OutputPlugin.C
@@ -66,22 +66,22 @@ OutputPlugin::Mode OutputPlugin::m_Mode=NO_MODE;
 
 extern "C"
 {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new OutputPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {	
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0000;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "InputOutput";
 }
diff --git a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
index 8fa9bfc..9b1926d 100644
--- a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
+++ b/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
@@ -31,22 +31,22 @@ static const int   S2_INPUT   = 19;
 static const int   S3_INPUT   = 20;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new PoshSamplerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 32;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
@@ -100,7 +100,7 @@ m_Recording(false)
 		
 		SampleDesc* NewDesc = new SampleDesc;
 		char temp[256];
-		sprintf(temp,"PoshSampler%d_%d",GetID(),n);				
+		sprintf(temp,"PoshSampler%d_%d",SpiralPlugin_GetID(),n);				
 		NewDesc->Pathname   = temp; 
 		NewDesc->Volume     = 1.0f;
 		NewDesc->Velocity   = 1.0f;
@@ -464,7 +464,7 @@ bool PoshSamplerPlugin::SaveExternalFiles(const string &Dir)
 	for (int n=0; n<NUM_SAMPLES; n++)
 	{		
 		char temp[256];
-		sprintf(temp,"PoshSampler%d_%d.wav",GetID(),n);				
+		sprintf(temp,"PoshSampler%d_%d.wav",SpiralPlugin_GetID(),n);				
 		m_SampleDescVec[n]->Pathname   = temp; 
 	}
 
@@ -484,7 +484,7 @@ void PoshSamplerPlugin::LoadExternalFiles(const string &Dir)
 	for (int n=0; n<NUM_SAMPLES; n++)
 	{		
 		char temp[256];
-		sprintf(temp,"PoshSampler%d_%d.wav",GetID(),n);				
+		sprintf(temp,"PoshSampler%d_%d.wav",SpiralPlugin_GetID(),n);				
 		m_SampleDescVec[n]->Pathname   = temp; 
 	}
 	
diff --git a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
index b331c7e..f33d1d2 100644
--- a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
+++ b/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
@@ -22,22 +22,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new RingModPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000a;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C
index 6d38c6a..afb2d69 100644
--- a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C
+++ b/SpiralSound/Plugins/SVFilterPlugin/SVFilterPlugin.C
@@ -24,22 +24,22 @@ static const double PI = 3.141592654;
 static const int GRANULARITY = 10;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SVFilterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x000c;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
index 785f68e..ad83ec0 100644
--- a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
+++ b/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SampleHoldPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0033;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
index df0ade9..3eaeee5 100644
--- a/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
+++ b/SpiralSound/Plugins/SamplerPlugin/SamplerPlugin.C
@@ -25,22 +25,22 @@
 static const int   NOTETRIG    = NUM_SAMPLES*2+1;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SamplerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0010;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
diff --git a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
index 9fee147..3e8dcd2 100644
--- a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
+++ b/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
@@ -22,22 +22,22 @@
 
 extern "C"
 {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new ScopePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0001;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
index 408b456..aab12da 100644
--- a/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
+++ b/SpiralSound/Plugins/SeqPlugin/SeqPlugin.C
@@ -26,22 +26,22 @@
 static const float TRIGGER_LEV=0.1;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SeqPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0011;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Sequencing";
 }
diff --git a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
index cf213df..ea8f938 100644
--- a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
+++ b/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SeqSelectorPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0015;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Sequencing";
 }
diff --git a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
index cd8fdba..1ff7bc6 100644
--- a/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
+++ b/SpiralSound/Plugins/SequencerPlugin/SequencerPlugin.C
@@ -418,22 +418,22 @@ ostream &operator<<(ostream &s, Track &o)
 ////////////////////////////////////////////////////////////////////////////////////
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SequencerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0011;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Sequencing";
 }
diff --git a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
index c6d1f74..4db2f41 100644
--- a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
+++ b/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SmoothPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0014;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
index f2c8daa..9d13667 100644
--- a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
+++ b/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
@@ -27,22 +27,22 @@ static const int   RECBUFFERSIZE = 16384;
 static const float RECORD_GAIN = 1.0f;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SpiralLoopPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x001a;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
@@ -251,7 +251,7 @@ void SpiralLoopPlugin::StreamIn(istream &s)
 bool SpiralLoopPlugin::SaveExternalFiles(const string &Dir)
 {
 	char temp[256];
-	sprintf(temp,"%sSpiralLoopSample%d.wav",Dir.c_str(),GetID());	
+	sprintf(temp,"%sSpiralLoopSample%d.wav",Dir.c_str(),SpiralPlugin_GetID());	
 	SaveWav(temp);
 	return true;
 }
@@ -259,7 +259,7 @@ bool SpiralLoopPlugin::SaveExternalFiles(const string &Dir)
 void SpiralLoopPlugin::LoadExternalFiles(const string &Dir)
 {
 	char temp[256];
-	sprintf(temp,"%sSpiralLoopSample%d.wav",Dir.c_str(),GetID());	
+	sprintf(temp,"%sSpiralLoopSample%d.wav",Dir.c_str(),SpiralPlugin_GetID());	
 	LoadWav(temp);
 }
 
diff --git a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
index a416549..4c5703a 100644
--- a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
+++ b/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
@@ -23,13 +23,13 @@
 
 extern "C" {
 
-   SpiralPlugin* CreateInstance () { return new SplitSwitchPlugin; }
+   SpiralPlugin* SpiralPlugin_CreateInstance () { return new SplitSwitchPlugin; }
 
-   char** GetIcon () { return SpiralIcon_xpm; }
+   char** SpiralPlugin_GetIcon () { return SpiralIcon_xpm; }
 
-   int GetID () { return 125; }
+   int SpiralPlugin_GetID () { return 125; }
 
-   string GetGroupName() { return "Maths/Logic"; }
+   string SpiralPlugin_GetGroupName() { return "Maths/Logic"; }
 }
 
 ///////////////////////////////////////////////////////
diff --git a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
index 3f76744..2d6c13a 100644
--- a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
+++ b/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SplitterPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0006;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Control";
 }
diff --git a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
index 996adb0..6e60c91 100644
--- a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
+++ b/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
@@ -21,22 +21,22 @@
 #include "SpiralIcon.xpm"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new StereoMixerPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0008;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Amps/Mixers";
 }
diff --git a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
index 7d6b601..65afd61 100644
--- a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
+++ b/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
@@ -26,22 +26,22 @@ static const float TRIG_THRESH = 0.1;
 static const float BUFSECONDS = 1.0f;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new StreamPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0119;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Delay/Sampling";
 }
diff --git a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
index 13e8e8a..6e1bb5c 100644
--- a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
+++ b/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
@@ -22,22 +22,22 @@
 #include "../../NoteTable.h"
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new SwitchPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 47;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C
index 3d1b9c6..4b1692a 100644
--- a/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C
+++ b/SpiralSound/Plugins/TransposePlugin/TransposePlugin.C
@@ -23,19 +23,19 @@
 
 extern "C" {
 
-SpiralPlugin* CreateInstance () {
+SpiralPlugin* SpiralPlugin_CreateInstance () {
     return new TransposePlugin;
 }
 
-char** GetIcon () {
+char** SpiralPlugin_GetIcon () {
     return SpiralIcon_xpm;
 }
 
-int GetID () {
+int SpiralPlugin_GetID () {
     return 122;
 }
 
-string GetGroupName() {
+string SpiralPlugin_GetGroupName() {
     return "Control";
 }
 
diff --git a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
index f34cd9a..9f66982 100644
--- a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
+++ b/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
@@ -25,22 +25,22 @@ static const float PI=3.141592654;
 static const float RAD=(PI/180)*360;
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new TrigPlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 53;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Maths/Logic";
 }
diff --git a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C
index 4481f71..8d7c78f 100644
--- a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C
+++ b/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPlugin.C
@@ -22,18 +22,18 @@
 
 extern "C" {
 
-SpiralPlugin* CreateInstance() {
+SpiralPlugin* SpiralPlugin_CreateInstance() {
   return new WaveShaperPlugin;
 }
 
-char** GetIcon() {
+char** SpiralPlugin_GetIcon() {
   return SpiralIcon_xpm;
 }
 
-int GetID() {
+int SpiralPlugin_GetID() {
   return 0x0032;
 }
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Filters/FX";
 }
diff --git a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
index 537e3b9..4ddfbd8 100644
--- a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
+++ b/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
@@ -28,22 +28,22 @@ static const int OUT_MAIN = 0;
 
 extern "C"
 {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new WaveTablePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x0017;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Oscillators";
 }
diff --git a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
index 22adf98..0311438 100644
--- a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
+++ b/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
@@ -24,22 +24,22 @@
 #define PI 3.141592654
 
 extern "C" {
-SpiralPlugin* CreateInstance()
+SpiralPlugin* SpiralPlugin_CreateInstance()
 {
 	return new XFadePlugin;
 }
 
-char** GetIcon()
+char** SpiralPlugin_GetIcon()
 {
 	return SpiralIcon_xpm;
 }
 
-int GetID()
+int SpiralPlugin_GetID()
 {
 	return 0x001b;
 }
 
-string GetGroupName()
+string SpiralPlugin_GetGroupName()
 {
 	return "Amps/Mixers";
 }
diff --git a/SpiralSynthModular.C b/SpiralSynthModular.C
index 261293c..a2cad8d 100644
--- a/SpiralSynthModular.C
+++ b/SpiralSynthModular.C
@@ -87,7 +87,7 @@ m_PauseAudio(false)
 	m_Info.OUTPUTFILE = SpiralInfo::OUTPUTFILE;
 	m_Info.MIDIFILE   = SpiralInfo::MIDIFILE;
 	m_Info.POLY       = SpiralInfo::POLY;
-	//m_Info.GUI_COLOUR = SpiralInfo::GUI_COLOUR;
+	//m_Info.SpiralSynthModularInfo::GUICOL_Button = SpiralInfo::SpiralSynthModularInfo::GUICOL_Button;
 
 	for (int n=0; n<512; n++) Numbers[n]=n;
 
@@ -231,26 +231,25 @@ SpiralWindowType *SynthModular::CreateWindow()
 	m_TopWindow = new SpiralWindowType(MAIN_WIDTH, MAIN_HEIGHT, LABEL.c_str());
 	//m_TopWindow->resizable(m_TopWindow);
 
-	int but=44;
-        int ToolbarHeight=but+20;
+	int but=50;
+        int ToolbarHeight=but+0;
 
         m_Topbar = new Fl_Pack (0, 0, MAIN_WIDTH, ToolbarHeight, "");
         m_Topbar->user_data((void*)(this));
        	m_Topbar->type(FL_HORIZONTAL);
+		m_Topbar->color(SpiralSynthModularInfo::GUICOL_Button);
         m_TopWindow->add(m_Topbar);
 
         m_ToolbarPanel = new Fl_Pack (0, 0, but*5, ToolbarHeight, "");
         m_ToolbarPanel->user_data((void*)(this));
        	m_ToolbarPanel->type(FL_VERTICAL);
+		m_ToolbarPanel->color(SpiralSynthModularInfo::GUICOL_Button);
         m_Topbar->add(m_ToolbarPanel);
 
-        m_ToolbarFiller = new Fl_Group (0, 0, but*5, 20, "");
-        m_ToolbarPanel->add(m_ToolbarFiller);
-
         m_Toolbar = new Fl_Pack (0, 0, but*5, but, "");
         m_Toolbar->user_data((void*)(this));
        	m_Toolbar->type(FL_HORIZONTAL);
-        m_Toolbar->color(SpiralSynthModularInfo::GUICOL_Tool);
+		m_Toolbar->color(SpiralSynthModularInfo::GUICOL_Button);
         m_ToolbarPanel->add(m_Toolbar);
 
         m_Load = new Fl_Button(0, 0, but, but, "");
@@ -318,11 +317,14 @@ SpiralWindowType *SynthModular::CreateWindow()
 	m_NewComment->callback((Fl_Callback*)cb_NewComment);
 	m_Toolbar->add(m_NewComment);
 
-        m_GroupFiller = new Fl_Group (0, 0, 5, ToolbarHeight, "");
+        m_GroupFiller = new Fl_Group (0, 0, 0, ToolbarHeight, "");
+		m_GroupFiller->color(SpiralSynthModularInfo::GUICOL_Button);
 	m_Topbar->add (m_GroupFiller);
 
        	m_GroupTab = new Fl_Tabs (0, 0, MAIN_WIDTH-m_GroupFiller->w()-but*5, ToolbarHeight, "");
         m_GroupTab->user_data ((void*)(this));
+		m_GroupTab->box(FL_PLASTIC_DOWN_BOX);
+		m_GroupTab->color(SpiralSynthModularInfo::GUICOL_Button);
         m_GroupTab->callback((Fl_Callback*)cb_GroupTab);
 	m_Topbar->add (m_GroupTab);
 
@@ -412,8 +414,8 @@ vector<string> SynthModular::BuildPluginList(const string &Path)
 void SynthModular::LoadPlugins(string pluginPath)
 {
 
-	int Width  = 40;
-	int Height = 40;
+	int Width  = 35;
+	int Height = 35;
 
 	int SWidth  = 256;
 	int SHeight = 256;
@@ -475,7 +477,7 @@ void SynthModular::LoadPlugins(string pluginPath)
 			cerr << ID << " = Plugin [" << *i << "]" << endl;
 			#endif
 
-			Fl_Button *NewButton = new Fl_Button(0,0,Width,Height,"");
+			Fl_ToolButton *NewButton = new Fl_ToolButton(0,0,Width,Height,"");
                         NewButton->user_data((void*)(this));
 			NewButton->labelsize(1);
 			Fl_Pixmap *tPix = new Fl_Pixmap(PluginManager::Get()->GetPlugin(ID)->GetIcon());
@@ -489,9 +491,10 @@ void SynthModular::LoadPlugins(string pluginPath)
 			map<string,Fl_Pack*>::iterator gi=m_PluginGroupMap.find(GroupName);
 			if (gi==m_PluginGroupMap.end())
 			{
-                                the_group = new Fl_Pack (m_GroupTab->x(), 20, m_GroupTab->w(), m_GroupTab->h()-20, GroupName.c_str());
+                                the_group = new Fl_Pack (m_GroupTab->x(), 16, m_GroupTab->w(), m_GroupTab->h()-15, GroupName.c_str());
 	                        the_group->type(FL_HORIZONTAL);
                                 the_group->labelsize(8);
+								the_group->color(SpiralSynthModularInfo::GUICOL_Button);
                                 the_group->user_data((void*)(this));
 	                        //m_GroupTab->add(the_group);
                                 m_GroupTab->value(the_group);
@@ -502,9 +505,10 @@ void SynthModular::LoadPlugins(string pluginPath)
 				the_group=gi->second;
 			}
                         NewButton->type(0);
-			NewButton->box(FL_PLASTIC_UP_BOX);
-			NewButton->color(SpiralSynthModularInfo::GUICOL_Button);
-			NewButton->selection_color(SpiralSynthModularInfo::GUICOL_Tool);
+			NewButton->box(FL_NO_BOX);
+			NewButton->down_box(FL_NO_BOX);
+			//NewButton->color(SpiralSynthModularInfo::GUICOL_Button);
+			//NewButton->selection_color(SpiralSynthModularInfo::GUICOL_Button);
 			the_group->add(NewButton);
 
 			string tooltip=*i;
@@ -533,7 +537,10 @@ void SynthModular::LoadPlugins(string pluginPath)
         map<string,Fl_Pack*>::iterator PlugGrp;
 
         for (PlugGrp = m_PluginGroupMap.begin(); PlugGrp!= m_PluginGroupMap.end(); ++PlugGrp)
+		{
                 m_GroupTab->add(PlugGrp->second);
+				PlugGrp->second->add(new Fl_Box(0,0,600,100,""));
+		}
 
 	// try to show the SpiralSound group
         PlugGrp = m_PluginGroupMap.find("SpiralSound");
diff --git a/SpiralSynthModular.h b/SpiralSynthModular.h
index c3726c3..c4d467d 100644
--- a/SpiralSynthModular.h
+++ b/SpiralSynthModular.h
@@ -59,6 +59,14 @@ public:
 	Fl_DeviceGUI* m_DeviceGUI;
 };
 
+class Fl_ToolButton : public Fl_Button
+{
+public:
+	Fl_ToolButton(int x, int y, int w, int h, const char *n=NULL) : 
+		Fl_Button(x,y,w,h,n) {}
+	virtual void draw() { draw_label(); }
+};
+
 class SynthModular
 {
 public: