diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..bd1691e
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,64 @@
+---
+Language:        Cpp
+# BasedOnStyle: JUCE (Custom)
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: Align
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakAfterJavaFieldAnnotations: false
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList : BeforeColon
+BreakStringLiterals: false
+ColumnLimit: 0
+# ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: Inner
+PackConstructorInitializers: CurrentLine
+PointerAlignment: Left
+ReflowComments: false
+SortIncludes: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeParens: NonEmptyParentheses
+SpaceInEmptyParentheses: false
+SpaceBeforeInheritanceColon: true
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: "c++17"
+TabWidth: 4
+UseTab: Never
+---
+
diff --git a/Source/OpenEphysLib.cpp b/Source/OpenEphysLib.cpp
index cf1b42c..3262fb0 100644
--- a/Source/OpenEphysLib.cpp
+++ b/Source/OpenEphysLib.cpp
@@ -20,76 +20,76 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <PluginInfo.h>
 #include "PanelBase.h"
+#include <PluginInfo.h>
 #include <string>
 
 #ifdef _WIN32
 #include <Windows.h>
-#define EXPORT __declspec(dllexport)
+#define EXPORT __declspec (dllexport)
 #else
-#define EXPORT __attribute__((visibility("default")))
+#define EXPORT __attribute__ ((visibility ("default")))
 #endif
 
 using namespace Plugin;
 //Number of plugins defined on the library. Can be of different types (Processors, RecordEngines, etc...)
 #define NUM_PLUGINS 2
 
-extern "C" EXPORT void getLibInfo(Plugin::LibraryInfo* info)
+extern "C" EXPORT void getLibInfo (Plugin::LibraryInfo* info)
 {
-	/* API version, defined by the GUI source.
+    /* API version, defined by the GUI source.
 	Should not be changed to ensure it is always equal to the one used in the latest codebase.
 	The GUI refueses to load plugins with mismatched API versions */
-	info->apiVersion = PLUGIN_API_VER;
+    info->apiVersion = PLUGIN_API_VER;
 
-	//Name of the Library, used only for information
-	info->name = "TTL Panels";
+    //Name of the Library, used only for information
+    info->name = "TTL Panels";
 
-	//Version of the library, used only for information
-	info->libVersion = "0.1.0";
-	info->numPlugins = NUM_PLUGINS;
+    //Version of the library, used only for information
+    info->libVersion = "0.1.0";
+    info->numPlugins = NUM_PLUGINS;
 }
 
-extern "C" EXPORT int getPluginInfo(int index, Plugin::PluginInfo* info)
+extern "C" EXPORT int getPluginInfo (int index, Plugin::PluginInfo* info)
 {
-	switch (index)
-	{
-		//one case per plugin.
-	case 0:
-		// Sources, sinks, and visualizers are all "processors".
-		info->type = Plugin::Type::PROCESSOR;
-		//Processor name shown in the GUI.
-		info->processor.name = "TTL Toggle Panel";
-		//Type of processor.
-		info->processor.type = Plugin::Processor::FILTER;
-		//Class factory pointer. Namespace and class name.
-		info->processor.creator = &(Plugin::createProcessor<TTLDebugTools::TTLTogglePanel>);
-		break;
-
-	case 1:
-		// Sources, sinks, and visualizers are all "processors".
-		info->type = Plugin::Type::PROCESSOR;
-		//Processor name shown in the GUI.
-		info->processor.name = "TTL Display Panel";
-		//Type of processor.
-		info->processor.type = Plugin::Processor::SINK;
-		//Class factory pointer. Namespace and class name.
-		info->processor.creator = &(Plugin::createProcessor<TTLDebugTools::TTLFrontPanel>);
-		break;
-
-	default:
-		return -1;
-		break;
-	}
-	return 0;
+    switch (index)
+    {
+            //one case per plugin.
+        case 0:
+            // Sources, sinks, and visualizers are all "processors".
+            info->type = Plugin::Type::PROCESSOR;
+            //Processor name shown in the GUI.
+            info->processor.name = "TTL Toggle Panel";
+            //Type of processor.
+            info->processor.type = Plugin::Processor::FILTER;
+            //Class factory pointer. Namespace and class name.
+            info->processor.creator = &(Plugin::createProcessor<TTLDebugTools::TTLTogglePanel>);
+            break;
+
+        case 1:
+            // Sources, sinks, and visualizers are all "processors".
+            info->type = Plugin::Type::PROCESSOR;
+            //Processor name shown in the GUI.
+            info->processor.name = "TTL Display Panel";
+            //Type of processor.
+            info->processor.type = Plugin::Processor::SINK;
+            //Class factory pointer. Namespace and class name.
+            info->processor.creator = &(Plugin::createProcessor<TTLDebugTools::TTLFrontPanel>);
+            break;
+
+        default:
+            return -1;
+            break;
+    }
+    return 0;
 }
 
 #ifdef WIN32
-BOOL WINAPI DllMain(IN HINSTANCE hDllHandle,
-	IN DWORD     nReason,
-	IN LPVOID    Reserved)
+BOOL WINAPI DllMain (IN HINSTANCE hDllHandle,
+                     IN DWORD nReason,
+                     IN LPVOID Reserved)
 {
-	return TRUE;
+    return TRUE;
 }
 
 #endif
diff --git a/Source/PanelBase.cpp b/Source/PanelBase.cpp
index fa95497..5ece126 100644
--- a/Source/PanelBase.cpp
+++ b/Source/PanelBase.cpp
@@ -1,51 +1,44 @@
-#include "PanelBaseEditor.h"
 #include "PanelBase.h"
+#include "PanelBaseEditor.h"
 #include <climits>
 
 using namespace TTLDebugTools;
 
-
 // Base class for front panel and toggle panel.
 
-
 // Constructor.
-TTLPanelBase::TTLPanelBase(const std::string &name, bool wantSource) : GenericProcessor(name)
+TTLPanelBase::TTLPanelBase (const std::string& name, bool wantSource) : GenericProcessor (name)
 {
     isTTLSource = wantSource;
 
-    addIntParameter(Parameter::STREAM_SCOPE,
-		"ttl_word",
-        "Word",
-		"TTL word for a given stream",
-		0,
-		INT_MIN,
-        INT_MAX,
-		false);
-
+    addIntParameter (Parameter::STREAM_SCOPE,
+                     "ttl_word",
+                     "Word",
+                     "TTL word for a given stream",
+                     0,
+                     INT_MIN,
+                     INT_MAX,
+                     false);
 }
 
-
 // Destructor.
 TTLPanelBase::~TTLPanelBase()
 {
     // Nothing to do.
 }
 
-
 // Editor accessor.
 AudioProcessorEditor* TTLPanelBase::createEditor()
 {
     // NOTE - We need to set the "editor" variable in GenericProcessor.
-    editor = std::make_unique<TTLPanelBaseEditor>(this);
+    editor = std::make_unique<TTLPanelBaseEditor> (this);
     return editor.get();
 }
 
-
 // Rebuild external configuration information.
 // This is where we detect input geometry, for the front panel.
 void TTLPanelBase::updateSettings()
 {
-
     localEventChannels.clear();
     currentTTLWord.clear();
     lastTTLWord.clear();
@@ -53,37 +46,35 @@ void TTLPanelBase::updateSettings()
     for (auto stream : getDataStreams())
     {
         const uint16 streamId = stream->getStreamId();
-        
+
         if (isTTLSource)
         {
             // TTL Channel
             EventChannel* ttlChan;
-            EventChannel::Settings ttlChannelSettings{
+            EventChannel::Settings ttlChannelSettings {
                 EventChannel::Type::TTL,
                 "TTL Toggle Panel output",
                 "Triggers whenever a TTL button is toggled.",
                 "togglepanel.ttl",
-                getDataStream(stream->getStreamId())
+                getDataStream (stream->getStreamId())
             };
 
-            ttlChan = new EventChannel(ttlChannelSettings);
-            ttlChan->addProcessor(this);
-            eventChannels.add(ttlChan);
+            ttlChan = new EventChannel (ttlChannelSettings);
+            ttlChan->addProcessor (this);
+            eventChannels.add (ttlChan);
 
             localEventChannels[streamId] = eventChannels.getLast();
         }
-        
+
         currentTTLWord[streamId] = 0;
         lastTTLWord[streamId] = 0;
-
     }
 
     pushStateToDisplay();
 }
 
-
 // Processing loop.
-void TTLPanelBase::process(AudioSampleBuffer& buffer)
+void TTLPanelBase::process (AudioSampleBuffer& buffer)
 {
     // If we're a filter, report queued changes to TTL output state.
     // If we're a sink, input events will be received via handleEvent(); we still need to call checkForEvents().
@@ -96,16 +87,16 @@ void TTLPanelBase::process(AudioSampleBuffer& buffer)
         for (auto stream : dataStreams)
         {
             const uint16 streamId = stream->getStreamId();
-            
+
             if (currentTTLWord[streamId] != lastTTLWord[streamId])
             {
                 Array<TTLEventPtr> events = TTLEvent::createTTLEvent (localEventChannels[streamId],
-                                                                      getFirstSampleNumberForBlock(streamId),
+                                                                      getFirstSampleNumberForBlock (streamId),
                                                                       static_cast<uint64> (currentTTLWord[streamId]));
 
                 for (auto event : events)
                 {
-                    addEvent(event, 0);
+                    addEvent (event, 0);
                 }
 
                 lastTTLWord[streamId] = currentTTLWord[streamId];
@@ -121,12 +112,10 @@ void TTLPanelBase::process(AudioSampleBuffer& buffer)
     }
 }
 
-
 // Input TTL events enter via this hook.
-void TTLPanelBase::handleTTLEvent(TTLEventPtr event)
+void TTLPanelBase::handleTTLEvent (TTLEventPtr event)
 {
-    
-	const uint16 streamId = event->getStreamId();
+    const uint16 streamId = event->getStreamId();
     bool ttlState = event->getState();
     int ttlBit = event->getLine();
 
@@ -134,7 +123,6 @@ void TTLPanelBase::handleTTLEvent(TTLEventPtr event)
         currentTTLWord[streamId] |= (1 << ttlBit);
     else
         currentTTLWord[streamId] &= ~(1 << ttlBit);
-
 }
 
 // Pushes latest state to display
@@ -142,44 +130,38 @@ void TTLPanelBase::pushStateToDisplay()
 {
     TTLPanelBaseEditor* editor = (TTLPanelBaseEditor*) getEditor();
 
-	editor->pushStateToEditor(currentTTLWord);
-
+    editor->pushStateToEditor (currentTTLWord);
 }
 
-
 // Parameter accessor. This is guaranteed to be called under safe conditions.
 // Variables used by "process" should only be modified here.
-void TTLPanelBase::parameterValueChanged(Parameter* parameter)
+void TTLPanelBase::parameterValueChanged (Parameter* parameter)
 {
-    LOGD("Parameter value changed!");
+    LOGD ("Parameter value changed!");
     const uint16 streamId = parameter->getStreamId();
 
-    int64 valueI64 = int64(parameter->getValue());
-	uint32 valueU32 = uint32(valueI64 + INT_MAX);
+    int64 valueI64 = int64 (parameter->getValue());
+    uint32 valueU32 = uint32 (valueI64 + INT_MAX);
 
-	LOGD("New TTL word for stream ", streamId, ": ", valueU32);
+    LOGD ("New TTL word for stream ", streamId, ": ", valueU32);
 
-	currentTTLWord[streamId] = valueU32;
-    
+    currentTTLWord[streamId] = valueU32;
 }
 
-
 // Accessors for querying and modifying state.
 // Modifying is done via setParameter, since that's guaranteed safe.
 // NOTE - We're not calling query accessors any more!
 
-
 bool TTLPanelBase::isEventSourcePanel()
 {
-// Don't tattle this except for debugging; it gets spammy.
-//T_PRINT( "isEventSourcePanel() returning " << (isTTLSource ? "true." : "false.") );
+    // Don't tattle this except for debugging; it gets spammy.
+    //T_PRINT( "isEventSourcePanel() returning " << (isTTLSource ? "true." : "false.") );
     return isTTLSource;
 }
 
-
 // Toggle panel (filter).
 
-TTLTogglePanel::TTLTogglePanel() : TTLPanelBase("TTL Toggle Panel", true)
+TTLTogglePanel::TTLTogglePanel() : TTLPanelBase ("TTL Toggle Panel", true)
 {
 }
 
@@ -187,10 +169,9 @@ TTLTogglePanel::~TTLTogglePanel()
 {
 }
 
-
 // Front panel (sink).
 
-TTLFrontPanel::TTLFrontPanel() : TTLPanelBase("TTL Display Panel", false)
+TTLFrontPanel::TTLFrontPanel() : TTLPanelBase ("TTL Display Panel", false)
 {
 }
 
@@ -198,5 +179,4 @@ TTLFrontPanel::~TTLFrontPanel()
 {
 }
 
-
 // This is the end of the file.
diff --git a/Source/PanelBase.h b/Source/PanelBase.h
index cce5f4b..30dbb98 100644
--- a/Source/PanelBase.h
+++ b/Source/PanelBase.h
@@ -15,88 +15,83 @@
 
 namespace TTLDebugTools
 {
-	class TTLPanelBase : public GenericProcessor
-	{
-	public:
-		/** Constructor.
+class TTLPanelBase : public GenericProcessor
+{
+public:
+    /** Constructor.
 			Set "wantSource" true to make this a toggle panel (filter), or false for a front panel (sink) */
-		TTLPanelBase(const std::string &name, bool wantSource);
+    TTLPanelBase (const std::string& name, bool wantSource);
 
-		/** Destructor */
-		~TTLPanelBase();
+    /** Destructor */
+    ~TTLPanelBase();
 
-		/** Create custom editor */
-		AudioProcessorEditor* createEditor() override;
+    /** Create custom editor */
+    AudioProcessorEditor* createEditor() override;
 
-		/** Create event channels */
-		void updateSettings() override;
+    /** Create event channels */
+    void updateSettings() override;
 
-		/** Processing loop. */
-		void process(AudioBuffer<float>& buffer) override;
+    /** Processing loop. */
+    void process (AudioBuffer<float>& buffer) override;
 
-		// If we're configured as a front panel, we need to handle events.
-		void handleTTLEvent(TTLEventPtr event) override;
+    // If we're configured as a front panel, we need to handle events.
+    void handleTTLEvent (TTLEventPtr event) override;
 
-		// This is guaranteed to be called under safe conditions.
-		// Variables used by "process" should only be modified here.
-		void parameterValueChanged(Parameter* parameter) override;
+    // This is guaranteed to be called under safe conditions.
+    // Variables used by "process" should only be modified here.
+    void parameterValueChanged (Parameter* parameter) override;
 
-		// Accessors for querying and modifying state.
-		// Modifying is done via parameterValueChanged, since that's guaranteed safe.
-		// NOTE - Calling query accessors while running isn't safe!
-		bool isEventSourcePanel();
+    // Accessors for querying and modifying state.
+    // Modifying is done via parameterValueChanged, since that's guaranteed safe.
+    // NOTE - Calling query accessors while running isn't safe!
+    bool isEventSourcePanel();
 
-		// Updates the display with latest state.
-		void pushStateToDisplay();
+    // Updates the display with latest state.
+    void pushStateToDisplay();
 
-	protected:
-		bool isTTLSource;
-		std::map<uint16, uint32> currentTTLWord;
-		std::map<uint16, uint32> lastTTLWord;
-		std::map<uint16, EventChannel*> localEventChannels;
+protected:
+    bool isTTLSource;
+    std::map<uint16, uint32> currentTTLWord;
+    std::map<uint16, uint32> lastTTLWord;
+    std::map<uint16, EventChannel*> localEventChannels;
 
-	private:
-		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TTLPanelBase);
-	};
+private:
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TTLPanelBase);
+};
 
-	/** 
+/** 
 		Creates an array of buttons to toggle TTL events on and off
 	*/
-	class TTLTogglePanel : public TTLPanelBase
-	{
-	public:
-		
-		/** Constructor */
-		TTLTogglePanel();
-		
-		/** Destructor */
-		~TTLTogglePanel();
+class TTLTogglePanel : public TTLPanelBase
+{
+public:
+    /** Constructor */
+    TTLTogglePanel();
 
-		
-	private:
+    /** Destructor */
+    ~TTLTogglePanel();
 
-		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TTLTogglePanel);
-	};
+private:
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TTLTogglePanel);
+};
 
-	/** 
+/** 
 	
 		Creates an array of indicators to show the state of individual TTL lines
 		
 	*/
-	class TTLFrontPanel : public TTLPanelBase
-	{
-	public:
-
-		/** Constructor */
-		TTLFrontPanel();
+class TTLFrontPanel : public TTLPanelBase
+{
+public:
+    /** Constructor */
+    TTLFrontPanel();
 
-		/** Destructor*/
-		~TTLFrontPanel();
+    /** Destructor*/
+    ~TTLFrontPanel();
 
-		
-	private:
-		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TTLFrontPanel);
-	};
-}
+private:
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TTLFrontPanel);
+};
+} // namespace TTLDebugTools
 
 #endif
diff --git a/Source/PanelBaseEditor.cpp b/Source/PanelBaseEditor.cpp
index cc584c0..0a6f3cd 100644
--- a/Source/PanelBaseEditor.cpp
+++ b/Source/PanelBaseEditor.cpp
@@ -1,11 +1,10 @@
 #include "PanelBaseEditor.h"
 #include "PanelBase.h"
-#include <sstream>
 #include <climits>
+#include <sstream>
 
 using namespace TTLDebugTools;
 
-
 // Private magic constants for GUI geometry.
 
 #define TITLEBAR_YOFFSET 35
@@ -28,156 +27,142 @@ using namespace TTLDebugTools;
 #define NUMLABEL_XGAP 8
 #define NUMLABEL_XPITCH (NUMLABEL_XGAP + NUMLABEL_XTITLE + NUMLABEL_XSIZE)
 
-#define BUTTONROW_XSIZE_EN_NO (BITBUTTON_SLAB_XSIZE + 2*NUMLABEL_XPITCH)
+#define BUTTONROW_XSIZE_EN_NO (BITBUTTON_SLAB_XSIZE + 2 * NUMLABEL_XPITCH)
 #define BUTTONROW_XSIZE_EN_YES (ENBUTTON_XSIZE + ENBUTTON_XGAP + BUTTONROW_XSIZE_EN_NO)
 #define BUTTONROW_XHALO 10
-#define BUTTONROW_XPITCH_EN_NO (BUTTONROW_XSIZE_EN_NO + 2*BUTTONROW_XHALO)
-#define BUTTONROW_XPITCH_EN_YES (BUTTONROW_XSIZE_EN_YES + 2*BUTTONROW_XHALO)
-
+#define BUTTONROW_XPITCH_EN_NO (BUTTONROW_XSIZE_EN_NO + 2 * BUTTONROW_XHALO)
+#define BUTTONROW_XPITCH_EN_YES (BUTTONROW_XSIZE_EN_YES + 2 * BUTTONROW_XHALO)
 
 //
 // One bank of TTLs with associated controls.
 
-
 // Constructor.
-TTLPanelButton::TTLPanelButton(int line_, Colour colour_) :
-    Button(String(line)), line(line_), colour(colour_)
+TTLPanelButton::TTLPanelButton (int line_, Colour colour_) : Button (String (line)), line (line_), colour (colour_)
 {
-   
 }
 
-
 // Destructor.
 TTLPanelButton::~TTLPanelButton()
 {
     // Nothing to do.
 }
 
-
 // GUI callbacks.
 
-void TTLPanelButton::paintButton(Graphics& g, bool isHighlighted, bool isDown)
+void TTLPanelButton::paintButton (Graphics& g, bool isHighlighted, bool isDown)
 {
-
     if (getToggleState())
-        g.setColour(colour);
+        g.setColour (colour);
     else
-        g.setColour(findColour (ThemeColours::widgetBackground));
+        g.setColour (findColour (ThemeColours::widgetBackground));
 
-	
-        
-    g.fillRect(0, 0, getWidth(), getHeight());
-    
-    g.setColour(findColour (ThemeColours::defaultText));
-	g.setFont(11.0f);
-    g.drawText(String(line + 1), Rectangle<float>(getWidth(), getHeight()), Justification::centred);
+    g.fillRect (0, 0, getWidth(), getHeight());
 
-    if (isHighlighted && getClickingTogglesState())
-        g.setColour(colour);
+    g.setColour (findColour (ThemeColours::defaultText));
+    g.setFont (11.0f);
+    g.drawText (String (line + 1), Rectangle<float> (getWidth(), getHeight()), Justification::centred);
 
-    g.drawLine(0, getHeight(), getWidth(), getHeight(), 2.0);
+    if (isHighlighted && getClickingTogglesState())
+        g.setColour (colour);
 
+    g.drawLine (0, getHeight(), getWidth(), getHeight(), 2.0);
 }
 
-
 //
 // GUI tray holding a small number of TTL banks.
 
 // Constructor.
-TTLPanelBaseEditor::TTLPanelBaseEditor(TTLPanelBase* newParent) : GenericEditor(newParent)
+TTLPanelBaseEditor::TTLPanelBaseEditor (TTLPanelBase* newParent) : GenericEditor (newParent)
 {
     parent = newParent;
 
     Array<Colour> eventColours = {
-        Colour(224, 185, 36),
-        Colour(243, 119, 33),
-        Colour(237, 37, 36),
-        Colour(217, 46, 171),
-        Colour(101, 31, 255),
-        Colour(48, 117, 255),
-        Colour(116, 227, 156),
-        Colour(82, 173, 0)
+        Colour (224, 185, 36),
+        Colour (243, 119, 33),
+        Colour (237, 37, 36),
+        Colour (217, 46, 171),
+        Colour (101, 31, 255),
+        Colour (48, 117, 255),
+        Colour (116, 227, 156),
+        Colour (82, 173, 0)
     };
 
     for (int bidx = 0; bidx < TTLDEBUG_PANEL_UI_MAX_BUTTONS; bidx++)
     {
-
         int row = bidx / TTLDEBUG_PANEL_UI_BUTTONS_PER_ROW;
         int column = bidx % TTLDEBUG_PANEL_UI_BUTTONS_PER_ROW;
 
-        TTLPanelButton* button = new TTLPanelButton(bidx, eventColours[column]);
-        buttons.add(button);
+        TTLPanelButton* button = new TTLPanelButton (bidx, eventColours[column]);
+        buttons.add (button);
 
-		button->setBounds(BUTTONROW_XHALO + column * BITBUTTON_XPITCH,
-                          TITLEBAR_YOFFSET + row * BUTTONROW_YPITCH,
-                          BITBUTTON_XSIZE, BUTTONROW_YSIZE);
+        button->setBounds (BUTTONROW_XHALO + column * BITBUTTON_XPITCH,
+                           TITLEBAR_YOFFSET + row * BUTTONROW_YPITCH,
+                           BITBUTTON_XSIZE,
+                           BUTTONROW_YSIZE);
 
-        addAndMakeVisible(button);
+        addAndMakeVisible (button);
 
         if (parent->isEventSourcePanel())
-		{
-            button->setClickingTogglesState(true);
-			button->addListener(this);
+        {
+            button->setClickingTogglesState (true);
+            button->addListener (this);
         }
-        else {
-            button->setToggleState(false, dontSendNotification);
+        else
+        {
+            button->setToggleState (false, dontSendNotification);
         }
     }
 
-    setDesiredWidth(260);
+    setDesiredWidth (260);
 
-    editableLabel = std::make_unique<CustomTextBox>("TTL Word", "0", "0123456789", "");
-    editableLabel->setFont(FontOptions("CP Mono", "Plain", 14.0f));
-    editableLabel->setBounds(205, 50, 50, 18);
-    addAndMakeVisible(editableLabel.get());
-    editableLabel->onTextChange = [this] { editableLabel->setTooltip (editableLabel->getText());};
+    editableLabel = std::make_unique<CustomTextBox> ("TTL Word", "0", "0123456789", "");
+    editableLabel->setFont (FontOptions ("CP Mono", "Plain", 14.0f));
+    editableLabel->setBounds (205, 50, 50, 18);
+    addAndMakeVisible (editableLabel.get());
+    editableLabel->onTextChange = [this]
+    { editableLabel->setTooltip (editableLabel->getText()); };
 
-    ttlWordLabel = std::make_unique<Label>("Word Label", "Word");
-    ttlWordLabel->setFont(FontOptions("Inter", "Regular", 14.0f));
+    ttlWordLabel = std::make_unique<Label> ("Word Label", "Word");
+    ttlWordLabel->setFont (FontOptions ("Inter", "Regular", 14.0f));
     ttlWordLabel->setSize (50, 18);
     ttlWordLabel->attachToComponent (editableLabel.get(), false);
-    addAndMakeVisible(ttlWordLabel.get());
+    addAndMakeVisible (ttlWordLabel.get());
 
     if (parent->isEventSourcePanel())
     {
-
-        editableLabel->setEditable(true);
-        
-        setButton = std::make_unique<UtilityButton>("Set");
-        setButton->addListener(this);
-        setButton->setRadius(3.0f);
-        setButton->setBounds(210, 75, 40, 18);
-        addAndMakeVisible(setButton.get());
-
-        clearButton = std::make_unique<UtilityButton>("Clear");
-        clearButton->addListener(this);
-        clearButton->setRadius(3.0f);
-        clearButton->setBounds(210, 98, 40, 18);
-        addAndMakeVisible(clearButton.get());
+        editableLabel->setEditable (true);
+
+        setButton = std::make_unique<UtilityButton> ("Set");
+        setButton->addListener (this);
+        setButton->setRadius (3.0f);
+        setButton->setBounds (210, 75, 40, 18);
+        addAndMakeVisible (setButton.get());
+
+        clearButton = std::make_unique<UtilityButton> ("Clear");
+        clearButton->addListener (this);
+        clearButton->setRadius (3.0f);
+        clearButton->setBounds (210, 98, 40, 18);
+        addAndMakeVisible (clearButton.get());
     }
-    
-
 }
 
 // Destructor.
 TTLPanelBaseEditor::~TTLPanelBaseEditor()
 {
     // "OwnedArray" and "ScopedPointer" take care of de-allocation for us.
-
 }
 
 void TTLPanelBaseEditor::startAcquisition()
 {
-    if (!parent->isEventSourcePanel())
+    if (! parent->isEventSourcePanel())
     {
-        startTimer(TTLDEBUG_PANEL_DISPLAY_REFRESH_MS);
+        startTimer (TTLDEBUG_PANEL_DISPLAY_REFRESH_MS);
     }
-
 }
 
 void TTLPanelBaseEditor::stopAcquisition()
 {
-    if (!parent->isEventSourcePanel())
+    if (! parent->isEventSourcePanel())
     {
         stopTimer();
     }
@@ -188,85 +173,86 @@ void TTLPanelBaseEditor::selectedStreamHasChanged()
     redrawAllButtons();
 }
 
-void TTLPanelBaseEditor::buttonClicked(Button* button)
+void TTLPanelBaseEditor::buttonClicked (Button* button)
 {
-    if (buttons.contains((TTLPanelButton*) button))
+    if (buttons.contains ((TTLPanelButton*) button))
     {
-        TTLPanelButton* panelButton = (TTLPanelButton*)button;
+        TTLPanelButton* panelButton = (TTLPanelButton*) button;
 
         if (panelButton->getToggleState())
             currentTTLWord[getCurrentStream()] |= (1 << panelButton->getLine());
         else
             currentTTLWord[getCurrentStream()] &= ~(1 << panelButton->getLine());
 
-        LOGD("Current ttlWord: ", currentTTLWord[getCurrentStream()]);
+        LOGD ("Current ttlWord: ", currentTTLWord[getCurrentStream()]);
 
         IntParameter* ttlWordParam = getTTLWordParameter();
 
         if (ttlWordParam != nullptr)
         {
-            int64 valueI64 = int64(currentTTLWord[getCurrentStream()]);
-            int converted = int(valueI64 - INT_MAX);
-            ttlWordParam->setNextValue(var(converted), false);
+            int64 valueI64 = int64 (currentTTLWord[getCurrentStream()]);
+            int converted = int (valueI64 - INT_MAX);
+            ttlWordParam->setNextValue (var (converted), false);
         }
-        else {
-            LOGD("No parameter found.");
+        else
+        {
+            LOGD ("No parameter found.");
         }
 
-        editableLabel->setText(String(currentTTLWord[getCurrentStream()]), dontSendNotification);
+        editableLabel->setText (String (currentTTLWord[getCurrentStream()]), dontSendNotification);
     }
     else if (button == clearButton.get())
     {
         currentTTLWord[getCurrentStream()] = 0;
-        
+
         IntParameter* ttlWordParam = getTTLWordParameter();
-        
+
         if (ttlWordParam != nullptr)
         {
-            int64 valueI64 = int64(currentTTLWord[getCurrentStream()]);
-            int converted = int(valueI64 - INT_MAX);
-            ttlWordParam->setNextValue(var(converted), false);
+            int64 valueI64 = int64 (currentTTLWord[getCurrentStream()]);
+            int converted = int (valueI64 - INT_MAX);
+            ttlWordParam->setNextValue (var (converted), false);
         }
-        else {
-            LOGD("No parameter found.");
+        else
+        {
+            LOGD ("No parameter found.");
         }
 
         redrawAllButtons();
     }
     else if (button == setButton.get())
     {
-
         int candidateValue = editableLabel->getText().getIntValue();
-        
+
         if (candidateValue >= 0 && candidateValue < INT_MAX)
         {
-			currentTTLWord[getCurrentStream()] = candidateValue;
-
-			IntParameter* ttlWordParam = getTTLWordParameter();
-
-			if (ttlWordParam != nullptr)
-			{
-				int64 valueI64 = int64(currentTTLWord[getCurrentStream()]);
-				int converted = int(valueI64 - INT_MAX);
-				ttlWordParam->setNextValue(var(converted), false);
-			}
-			else {
-				LOGD("No parameter found.");
-			}
-
-			redrawAllButtons();
-		}
-		else {
-			LOGD("Invalid value.");
+            currentTTLWord[getCurrentStream()] = candidateValue;
+
+            IntParameter* ttlWordParam = getTTLWordParameter();
+
+            if (ttlWordParam != nullptr)
+            {
+                int64 valueI64 = int64 (currentTTLWord[getCurrentStream()]);
+                int converted = int (valueI64 - INT_MAX);
+                ttlWordParam->setNextValue (var (converted), false);
+            }
+            else
+            {
+                LOGD ("No parameter found.");
+            }
+
+            redrawAllButtons();
+        }
+        else
+        {
+            LOGD ("Invalid value.");
         }
     }
-    
-    
 }
 
 IntParameter* TTLPanelBaseEditor::getTTLWordParameter()
 {
-    return (IntParameter*)parent->getDataStream(getCurrentStream())->getParameter("ttl_word");
+    return (IntParameter*) parent->getDataStream (getCurrentStream())->getParameter ("ttl_word");
 }
 
 // Timer callback.
@@ -275,14 +261,12 @@ void TTLPanelBaseEditor::timerCallback()
     redrawAllButtons();
 }
 
-
 // Accessor to push plugin state to the editor.
-void TTLPanelBaseEditor::pushStateToEditor(std::map<uint16, uint32> currentTTLWord_)
+void TTLPanelBaseEditor::pushStateToEditor (std::map<uint16, uint32> currentTTLWord_)
 {
     currentTTLWord = currentTTLWord_;
 }
 
-
 // Redraw function. Should be called from the timer, not the plugin.
 void TTLPanelBaseEditor::redrawAllButtons()
 {
@@ -293,18 +277,14 @@ void TTLPanelBaseEditor::redrawAllButtons()
 
     for (int bidx = 0; bidx < TTLDEBUG_PANEL_UI_MAX_BUTTONS; bidx++)
     {
-        buttons[bidx]->setToggleState((state >> bidx) & 1, dontSendNotification);
+        buttons[bidx]->setToggleState ((state >> bidx) & 1, dontSendNotification);
         buttons[bidx]->repaint();
     }
 
-	editableLabel->setText(String(currentTTLWord[getCurrentStream()]), dontSendNotification);
-        
+    editableLabel->setText (String (currentTTLWord[getCurrentStream()]), dontSendNotification);
 }
 
-
-
 //
 // NOTE - Visualizer canvas holding a large number of TTL banks could go here.
 
-
 // This is the end of the file.
diff --git a/Source/PanelBaseEditor.h b/Source/PanelBaseEditor.h
index 0e2f184..f4d83d3 100644
--- a/Source/PanelBaseEditor.h
+++ b/Source/PanelBaseEditor.h
@@ -17,86 +17,85 @@
 
 namespace TTLDebugTools
 {
-	class TTLPanelBase;
+class TTLPanelBase;
 
-	// One TTL toggle button
-	class TTLPanelButton : public Button
-	{
-	public:
-		// Constructor
-		TTLPanelButton(int line, Colour colour);
-
-		// Destructor
-		~TTLPanelButton();
-
-		// Returns the ttl line
-		int getLine() {
-			return line;
-		}
-
-		// Draw the button
-		void paintButton(Graphics& g, bool isHighlighted, bool isDown);
-		
-	private:
-		int line;
-		Colour colour;
-
-		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TTLPanelButton);
-	};
-
-
-	// GUI tray holding a small number of TTL banks.
-	// NOTE - GenericEditor already inherits from Timer.
-	class TTLPanelBaseEditor : public GenericEditor,
-							   public Button::Listener,
-							   public Timer
-	{
-	public:
-		/** Constructor */
-		TTLPanelBaseEditor(TTLPanelBase* newParent);
-
-		/** Destructor */
-		~TTLPanelBaseEditor();
+// One TTL toggle button
+class TTLPanelButton : public Button
+{
+public:
+    // Constructor
+    TTLPanelButton (int line, Colour colour);
+
+    // Destructor
+    ~TTLPanelButton();
+
+    // Returns the ttl line
+    int getLine()
+    {
+        return line;
+    }
+
+    // Draw the button
+    void paintButton (Graphics& g, bool isHighlighted, bool isDown);
+
+private:
+    int line;
+    Colour colour;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TTLPanelButton);
+};
+
+// GUI tray holding a small number of TTL banks.
+// NOTE - GenericEditor already inherits from Timer.
+class TTLPanelBaseEditor : public GenericEditor,
+                           public Button::Listener,
+                           public Timer
+{
+public:
+    /** Constructor */
+    TTLPanelBaseEditor (TTLPanelBase* newParent);
 
-		/** Timer hooks */
-		void timerCallback();
+    /** Destructor */
+    ~TTLPanelBaseEditor();
 
-		/** Called at start of acquisition*/
-		void startAcquisition() override;
+    /** Timer hooks */
+    void timerCallback();
 
-		/** Called at start of acquisition*/
-		void stopAcquisition() override;
+    /** Called at start of acquisition*/
+    void startAcquisition() override;
 
-		/** Button callback*/
-		void buttonClicked(Button* button);
+    /** Called at start of acquisition*/
+    void stopAcquisition() override;
 
-		/** Called when selected stream is updated */
-		void selectedStreamHasChanged() override;
+    /** Button callback*/
+    void buttonClicked (Button* button);
 
-		/** The plugin has to push data to us, rather than us pulling it. */
-		void pushStateToEditor(std::map<uint16, uint32> currentTTLWord);
+    /** Called when selected stream is updated */
+    void selectedStreamHasChanged() override;
 
-		/** Redraws TTL indicators*/
-		void redrawAllButtons();
+    /** The plugin has to push data to us, rather than us pulling it. */
+    void pushStateToEditor (std::map<uint16, uint32> currentTTLWord);
 
-		/** Gets the relevant parameter from the parent */
-		IntParameter* getTTLWordParameter();
+    /** Redraws TTL indicators*/
+    void redrawAllButtons();
 
-	private:
-		TTLPanelBase* parent;
-		OwnedArray<TTLPanelButton> buttons;
-		std::unique_ptr<Label> ttlWordLabel;
-		std::unique_ptr<CustomTextBox> editableLabel;
-		std::unique_ptr<UtilityButton> setButton;
-		std::unique_ptr<UtilityButton> clearButton;
-		std::map<uint16, uint32> currentTTLWord;
-		std::map<uint16, uint32> lastTTLWord;
+    /** Gets the relevant parameter from the parent */
+    IntParameter* getTTLWordParameter();
 
-		JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TTLPanelBaseEditor);
-	};
+private:
+    TTLPanelBase* parent;
+    OwnedArray<TTLPanelButton> buttons;
+    std::unique_ptr<Label> ttlWordLabel;
+    std::unique_ptr<CustomTextBox> editableLabel;
+    std::unique_ptr<UtilityButton> setButton;
+    std::unique_ptr<UtilityButton> clearButton;
+    std::map<uint16, uint32> currentTTLWord;
+    std::map<uint16, uint32> lastTTLWord;
 
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TTLPanelBaseEditor);
+};
 
-	// NOTE - Visualizer canvas holding a large number of TTL banks could go here.
-}
+// NOTE - Visualizer canvas holding a large number of TTL banks could go here.
+} // namespace TTLDebugTools
 
 #endif