diff --git a/Makefile b/Makefile
index a6829e2..ffbcb6d 100644
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,12 @@ xycontroller:
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-CPP_debug:
+debug:
 	$(MAKE) -f Makefile.dbg -C c++/carla-backend
 	$(MAKE) -f Makefile.dbg -C c++/carla-bridge
 	$(MAKE) -f Makefile.dbg -C c++/carla-discovery NATIVE=1
+	$(MAKE) -f Makefile.dbg -C c++/jackmeter
+	$(MAKE) -f Makefile.dbg -C c++/xycontroller
 
 doc:
 	$(MAKE) doc -C c++/carla-backend
diff --git a/c++/carla-backend/fluidsynth.cpp b/c++/carla-backend/fluidsynth.cpp
index 22011e6..697806c 100644
--- a/c++/carla-backend/fluidsynth.cpp
+++ b/c++/carla-backend/fluidsynth.cpp
@@ -39,7 +39,8 @@ CARLA_BACKEND_START_NAMESPACE
 class FluidSynthPlugin : public CarlaPlugin
 {
 public:
-    FluidSynthPlugin(CarlaEngine* const engine, unsigned short id) : CarlaPlugin(engine, id)
+    FluidSynthPlugin(CarlaEngine* const engine, const unsigned short id)
+        : CarlaPlugin(engine, id)
     {
         qDebug("FluidSynthPlugin::FluidSynthPlugin()");
 
diff --git a/c++/carla-backend/linuxsampler.cpp b/c++/carla-backend/linuxsampler.cpp
index faf263b..2d34209 100644
--- a/c++/carla-backend/linuxsampler.cpp
+++ b/c++/carla-backend/linuxsampler.cpp
@@ -42,7 +42,8 @@ CARLA_BACKEND_START_NAMESPACE
 class LinuxSamplerPlugin : public CarlaPlugin
 {
 public:
-    LinuxSamplerPlugin(CarlaEngine* const engine_, unsigned short id, bool isGIG) : CarlaPlugin(engine_, id)
+    LinuxSamplerPlugin(CarlaEngine* const engine_, const unsigned short id, const bool isGIG)
+        : CarlaPlugin(engine_, id)
     {
         qDebug("LinuxSamplerPlugin::LinuxSamplerPlugin()");
 
diff --git a/c++/carla-discovery/Makefile b/c++/carla-discovery/Makefile
index 9dab1d4..8fe8bdf 100644
--- a/c++/carla-discovery/Makefile
+++ b/c++/carla-discovery/Makefile
@@ -4,8 +4,8 @@
 # Created by falkTX
 #
 
-CXX     ?= g++
-STRIP   ?= strip
+CXX   ?= g++
+STRIP ?= strip
 
 BASE_FLAGS   = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall
 BASE_FLAGS  += -I../carla-backend -I../carla-includes
diff --git a/c++/carla-discovery/Makefile.dbg b/c++/carla-discovery/Makefile.dbg
index 7082c49..3eead4a 100644
--- a/c++/carla-discovery/Makefile.dbg
+++ b/c++/carla-discovery/Makefile.dbg
@@ -4,7 +4,7 @@
 # Created by falkTX
 #
 
-CXX     ?= g++
+CXX ?= g++
 
 BASE_FLAGS   = -O0 -g -Wall
 BASE_FLAGS  += -I../carla-backend -I../carla-includes
diff --git a/c++/jackmeter/Makefile.dbg b/c++/jackmeter/Makefile.dbg
new file mode 100644
index 0000000..482b98b
--- /dev/null
+++ b/c++/jackmeter/Makefile.dbg
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+# Makefile for jackmeter #
+# -------------------------------- #
+# Created by falkTX
+#
+
+CXX ?= g++
+
+BASE_FLAGS   = -O0 -g -Wall
+
+BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
+BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack)
+BUILD_FLAGS += -DDEBUG
+
+LINK_FLAGS   = $(LDFLAGS)
+LINK_FLAGS  += $(shell pkg-config --libs QtCore QtGui jack)
+
+ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true)
+BUILD_FLAGS += -DHAVE_JACKSESSION
+endif
+
+OBJS = jackmeter.o \
+	../widgets/digitalpeakmeter.o
+
+# --------------------------------------------------------------
+
+all: cadence-jackmeter
+
+cadence-jackmeter: $(OBJS)
+	$(CXX) $^ $(LINK_FLAGS) -o $@
+
+cadence-jackmeter.exe: $(OBJS)
+	$(CXX) $^ -static -mwindows $(LINK_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
+.cpp.o:
+	$(CXX) -c $< $(BUILD_FLAGS) -o $@
+
+clean:
+	rm -f $(OBJS) cadence-jackmeter*
diff --git a/c++/xycontroller/Makefile.dbg b/c++/xycontroller/Makefile.dbg
new file mode 100644
index 0000000..ced86c1
--- /dev/null
+++ b/c++/xycontroller/Makefile.dbg
@@ -0,0 +1,71 @@
+#!/usr/bin/make -f
+# Makefile for xycontroller #
+# ------------------------------------ #
+# Created by falkTX
+#
+
+CXX   ?= g++
+MOC   ?= moc
+RCC   ?= rcc
+UIC   ?= uic
+WINDRES ?= windres
+
+BASE_FLAGS   = -O0 -g -Wall -I../widgets
+
+BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
+BUILD_FLAGS += $(shell pkg-config --cflags QtCore QtGui jack)
+BUILD_FLAGS += -DDEBUG
+
+LINK_FLAGS   = $(LDFLAGS)
+LINK_FLAGS  += $(shell pkg-config --libs QtCore QtGui jack)
+
+ifeq ($(shell pkg-config --atleast-version=0.121.0 jack && echo true),true)
+BUILD_FLAGS += -DHAVE_JACKSESSION
+endif
+
+FILES = \
+	xycontroller.moc \
+	ui_xycontroller.h \
+	../widgets/moc_pixmapkeyboard.cpp \
+	../../resources/qrc_resources.cpp
+
+OBJS  = xycontroller.o \
+	../widgets/pixmapdial.o \
+	../widgets/pixmapkeyboard.o \
+	../widgets/moc_pixmapkeyboard.o \
+	../../resources/qrc_resources.o
+
+# --------------------------------------------------------------
+
+all: cadence-xycontroller
+
+cadence-xycontroller: $(FILES) $(OBJS)
+	$(CXX) $(OBJS) $(LINK_FLAGS) -o $@
+
+cadence-xycontroller.exe: $(FILES) $(OBJS) icon.o
+	$(CXX) $(OBJS) icon.o -static -mwindows $(LINK_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
+xycontroller.moc: xycontroller.cpp
+	$(MOC) $< -o $@
+
+ui_xycontroller.h: ../../src/ui/xycontroller.ui
+	$(UIC) $< -o $@
+
+icon.o: ../../resources/ico/cadence.rc
+	$(WINDRES) -i $< -o $@ -O coff
+
+../widgets/moc_pixmapkeyboard.cpp: ../widgets/pixmapkeyboard.h
+	$(MOC) $< -o $@
+
+../../resources/qrc_resources.cpp: ../../resources/resources.qrc
+	$(RCC) -name resources $< -o $@
+
+# --------------------------------------------------------------
+
+.cpp.o:
+	$(CXX) -c $< $(BUILD_FLAGS) -o $@
+
+clean:
+	rm -f $(FILES) $(OBJS) icon.o cadence-xycontroller*