diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index 8d26fff..9538e00 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -58,9 +58,22 @@ AppFrame::AppFrame() :
     demodModeSelector->addChoice(DEMOD_TYPE_LSB, "LSB");
     demodModeSelector->addChoice(DEMOD_TYPE_USB, "USB");
     demodModeSelector->addChoice(DEMOD_TYPE_DSB, "DSB");
-    demodModeSelector->setSelection(DEMOD_TYPE_FM);
     demodModeSelector->setHelpTip("Choose modulation type: Frequency Modulation, Amplitude Modulation and Lower, Upper or Double Side-Band.");
     demodTray->Add(demodModeSelector, 2, wxEXPAND | wxALL, 0);
+    
+    demodModeSelectoradv = new ModeSelectorCanvas(this, attribList);
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_ASK, "ASK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_APSK, "APSK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_BPSK, "BPSK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_DPSK, "DPSK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_PSK, "PSK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_OOK, "OOK");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_ST, "ST");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_SQAM, "SQAM");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_QAM, "QAM");
+    demodModeSelectoradv->addChoice(DEMOD_TYPE_QPSK, "QPSK");
+    demodModeSelectoradv->setHelpTip("Choose advanced modulation types.");
+    demodTray->Add(demodModeSelectoradv, 3, wxEXPAND | wxALL, 0);
 
 //    demodTray->AddSpacer(2);
 
diff --git a/src/AppFrame.h b/src/AppFrame.h
index cadb4fa..39911d1 100644
--- a/src/AppFrame.h
+++ b/src/AppFrame.h
@@ -62,6 +62,8 @@ private:
     SpectrumCanvas *spectrumCanvas;
     WaterfallCanvas *waterfallCanvas;
     ModeSelectorCanvas *demodModeSelector;
+    ModeSelectorCanvas *demodModeSelectoradv;
+    ModeSelectorCanvas *demodModeSelectoradv2;
     SpectrumCanvas *demodSpectrumCanvas;
     WaterfallCanvas *demodWaterfallCanvas;
     MeterCanvas *demodSignalMeter;
diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
index 51c1434..db696e6 100644
--- a/src/CubicSDR.cpp
+++ b/src/CubicSDR.cpp
@@ -88,7 +88,7 @@ bool CubicSDR::OnInit() {
         sdrThread->setDeviceId(devId);
     }
     else if(devs.size() == 0) {
-        wxGetApp().OnMessage("No devices found!", "warning");
+        wxGetApp().showMessage("No devices found!", "warning");
     }
     
     t_PostSDR = new std::thread(&SDRPostThread::threadMain, sdrPostThread);
@@ -290,7 +290,7 @@ int CubicSDR::getFrequencySnap() {
     return snap;
 }
 
-void CubicSDR::OnMessage(std::string text, std::string title) {
+void CubicSDR::showMessage(std::string text, std::string title) {
     wxMessageDialog *message = new wxMessageDialog(NULL, wxString::Format(text.c_str()), wxString::Format(title.c_str()), wxOK | wxICON_ERROR );
     message->ShowModal();
 }
\ No newline at end of file
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index aee8fb2..cd98341 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -62,7 +62,7 @@ public:
 
     void showFrequencyInput();
 
-    void OnMessage(std::string message, std::string title);
+    void showMessage(std::string message, std::string title);
 
 private:
     AppFrame *appframe;
diff --git a/src/demod/DemodDefs.h b/src/demod/DemodDefs.h
index 6282ac0..cc1365f 100644
--- a/src/demod/DemodDefs.h
+++ b/src/demod/DemodDefs.h
@@ -13,6 +13,16 @@
 #define DEMOD_TYPE_LSB 3
 #define DEMOD_TYPE_USB 4
 #define DEMOD_TYPE_DSB 5
+#define DEMOD_TYPE_ASK 6
+#define DEMOD_TYPE_APSK 7
+#define DEMOD_TYPE_BPSK 8
+#define DEMOD_TYPE_DPSK 9
+#define DEMOD_TYPE_PSK 10
+#define DEMOD_TYPE_OOK 11
+#define DEMOD_TYPE_ST 12
+#define DEMOD_TYPE_SQAM 13
+#define DEMOD_TYPE_QAM 14
+#define DEMOD_TYPE_QPSK 15
 
 class DemodulatorThread;
 class DemodulatorThreadCommand {