diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt
index 8c197903..64415557 100644
--- a/airspyhf_source/CMakeLists.txt
+++ b/airspyhf_source/CMakeLists.txt
@@ -23,9 +23,9 @@ if (MSVC)
 else (MSVC)
     find_package(PkgConfig)
 
-    pkg_check_modules(SOAPY REQUIRED airspyhf)
+    pkg_check_modules(SOAPY REQUIRED libairspyhf)
 
-    target_include_directories(airspyhf_source PUBLIC ${AIRSPYHF_INCLUDE_DIRS})
+    target_include_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_INCLUDE_DIRS})
     target_link_directories(airspyhf_source PUBLIC ${AIRSPYHF_LIBRARY_DIRS})
-    target_link_libraries(airspyhf_source PUBLIC ${AIRSPYHF_LIBRARIES})
+    target_link_libraries(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARIES})
 endif (MSVC)
\ No newline at end of file
diff --git a/airspyhf_source/src/main.cpp b/airspyhf_source/src/main.cpp
index 42493c8c..ce85fdf4 100644
--- a/airspyhf_source/src/main.cpp
+++ b/airspyhf_source/src/main.cpp
@@ -1,6 +1,6 @@
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <core.h>
diff --git a/audio_sink/src/main.cpp b/audio_sink/src/main.cpp
index b8bb1d86..6c31bb7e 100644
--- a/audio_sink/src/main.cpp
+++ b/audio_sink/src/main.cpp
@@ -1,5 +1,5 @@
 #include <imgui.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <signal_path/sink.h>
diff --git a/core/src/core.h b/core/src/core.h
index 6a0dbde2..f9b3be8b 100644
--- a/core/src/core.h
+++ b/core/src/core.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <config.h>
-#include <new_module.h>
+#include <module.h>
 #include <scripting.h>
-#include <new_module.h>
+#include <module.h>
 
 namespace core {
     SDRPP_EXPORT ConfigManager configManager;
diff --git a/core/src/credits.h b/core/src/credits.h
index a31dcc8c..f70c70fc 100644
--- a/core/src/credits.h
+++ b/core/src/credits.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <new_module.h>
+#include <module.h>
 
 namespace sdrpp_credits {
     SDRPP_EXPORT const char* contributors[];
diff --git a/core/src/gui/gui.h b/core/src/gui/gui.h
index 7ba33d1e..e6a2ee5a 100644
--- a/core/src/gui/gui.h
+++ b/core/src/gui/gui.h
@@ -3,7 +3,7 @@
 #include <gui/widgets/frequency_select.h>
 #include <gui/widgets/menu.h>
 #include <gui/dialogs/loading_screen.h>
-#include <new_module.h>
+#include <module.h>
 
 namespace gui {
     SDRPP_EXPORT ImGui::WaterFall waterfall;
diff --git a/core/src/gui/widgets/menu.h b/core/src/gui/widgets/menu.h
index 825f308f..24622a76 100644
--- a/core/src/gui/widgets/menu.h
+++ b/core/src/gui/widgets/menu.h
@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <new_module.h>
+#include <module.h>
 
 class Menu {
 public:
diff --git a/core/src/new_module.cpp b/core/src/module.cpp
similarity index 99%
rename from core/src/new_module.cpp
rename to core/src/module.cpp
index 4f41d8bd..58a79e4e 100644
--- a/core/src/new_module.cpp
+++ b/core/src/module.cpp
@@ -1,4 +1,4 @@
-#include <new_module.h>
+#include <module.h>
 #include <filesystem>
 #include <spdlog/spdlog.h>
 
diff --git a/core/src/new_module.h b/core/src/module.h
similarity index 100%
rename from core/src/new_module.h
rename to core/src/module.h
diff --git a/core/src/options.h b/core/src/options.h
index aec4d71e..c7e88b34 100644
--- a/core/src/options.h
+++ b/core/src/options.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <string>
-#include <new_module.h>
+#include <module.h>
 
 namespace options {
     struct CMDLineOptions {
diff --git a/core/src/signal_path/signal_path.h b/core/src/signal_path/signal_path.h
index 7bdf6100..49693270 100644
--- a/core/src/signal_path/signal_path.h
+++ b/core/src/signal_path/signal_path.h
@@ -3,7 +3,7 @@
 #include <signal_path/vfo_manager.h>
 #include <signal_path/source.h>
 #include <signal_path/sink.h>
-#include <new_module.h>
+#include <module.h>
 
 namespace sigpath {
     SDRPP_EXPORT SignalPath signalPath;
diff --git a/core/src/version.h b/core/src/version.h
index c9e3de76..330e64fc 100644
--- a/core/src/version.h
+++ b/core/src/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STR "0.2.5_alpha"
\ No newline at end of file
+#define VERSION_STR "0.2.5_beta"
\ No newline at end of file
diff --git a/plutosdr_source/src/main.cpp b/plutosdr_source/src/main.cpp
index f4dcad91..e4e0f5ae 100644
--- a/plutosdr_source/src/main.cpp
+++ b/plutosdr_source/src/main.cpp
@@ -1,6 +1,6 @@
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <core.h>
diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index 626b79d9..54d3e583 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -5,7 +5,7 @@
 #include <gui/style.h>
 #include <signal_path/signal_path.h>
 #include <radio_demod.h>
-#include <new_module.h>
+#include <module.h>
 #include <wfm_demod.h>
 #include <fm_demod.h>
 #include <am_demod.h>
diff --git a/recorder/src/main.cpp b/recorder/src/main.cpp
index a6b375b0..c5096886 100644
--- a/recorder/src/main.cpp
+++ b/recorder/src/main.cpp
@@ -1,5 +1,5 @@
 #include <imgui.h>
-#include <new_module.h>
+#include <module.h>
 #include <watcher.h>
 #include <wav.h>
 #include <dsp/types.h>
diff --git a/rtl_tcp_source/src/main.cpp b/rtl_tcp_source/src/main.cpp
index 0e0b2529..dd09a363 100644
--- a/rtl_tcp_source/src/main.cpp
+++ b/rtl_tcp_source/src/main.cpp
@@ -1,7 +1,7 @@
 #include <rtltcp_client.h>
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <core.h>
diff --git a/sdrpp_v0.2.5_beta_preview_x64/band_colors.json b/sdrpp_v0.2.5_beta_preview_x64/band_colors.json
new file mode 100644
index 00000000..2e9d8a95
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/band_colors.json
@@ -0,0 +1,7 @@
+{
+    "broadcast": "#0000FFFF",
+    "amateur": "#FF0000FF",
+    "aviation": "#00FF00FF",
+    "marine": "#00FFFFFF",
+    "military": "#FFFF00FF"
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/bandplans/general.json b/sdrpp_v0.2.5_beta_preview_x64/bandplans/general.json
new file mode 100644
index 00000000..600c8eef
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/bandplans/general.json
@@ -0,0 +1,267 @@
+{
+    "name": "General",
+    "country_name": "Worldwide",
+    "country_code": "--",
+    "author_name": "Ryzerth",
+    "author_url": "https://github.com/AlexandreRouma",
+    "bands": [
+        {
+            "name": "Long Wave",
+            "type": "broadcast",
+            "start": 148500,
+            "end": 283500
+        },
+        {
+            "name": "Medium Wave",
+            "type": "broadcast",
+            "start": 526500,
+            "end": 1606500
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 2300000,
+            "end": 2468000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 3200000,
+            "end": 3400000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 3950000,
+            "end": 4000000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 4750000,
+            "end": 4995000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 5005000,
+            "end": 5060000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 5900000,
+            "end": 6200000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 7200000,
+            "end": 7450000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 9400000,
+            "end": 9900000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 11600000,
+            "end": 12100000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 13570000,
+            "end": 13870000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 15100000,
+            "end": 15800000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 17480000,
+            "end": 17900000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 18900000,
+            "end": 19020000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 21450000,
+            "end": 21850000
+        },
+        {
+            "name": "Shortwave Broadcast",
+            "type": "broadcast",
+            "start": 25670000,
+            "end": 26100000
+        },
+        {
+            "name": "FM Broadcast",
+            "type": "broadcast",
+            "start": 87500000,
+            "end": 108000000
+        },
+        {
+            "name": "Air Band VOR/ILS",
+            "type": "aviation",
+            "start": 108000000,
+            "end": 118000000
+        },
+        {
+            "name": "Air Band Voice",
+            "type": "aviation",
+            "start": 118000000,
+            "end": 137000000
+        },
+        {
+            "name": "160m Ham Band",
+            "type": "amateur",
+            "start": 1800000,
+            "end": 2000000
+        },
+        {
+            "name": "80m Ham Band",
+            "type": "amateur",
+            "start": 3500000,
+            "end": 3950000
+        },
+        {
+            "name": "60m Ham Band",
+            "type": "amateur",
+            "start": 5351500,
+            "end": 5366500
+        },
+        {
+            "name": "40m Ham Band",
+            "type": "amateur",
+            "start": 7000000,
+            "end": 7200000
+        },
+        {
+            "name": "30m Ham Band",
+            "type": "amateur",
+            "start": 10100000,
+            "end": 10150000
+        },
+        {
+            "name": "20m Ham Band",
+            "type": "amateur",
+            "start": 14000000,
+            "end": 14350000
+        },
+        {
+            "name": "17m Ham Band",
+            "type": "amateur",
+            "start": 18068000,
+            "end": 18168000
+        },
+        {
+            "name": "15m Ham Band",
+            "type": "amateur",
+            "start": 21000000,
+            "end": 21450000
+        },
+        {
+            "name": "12m Ham Band",
+            "type": "amateur",
+            "start": 24890000,
+            "end": 24990000
+        },
+        {
+            "name": "CB",
+            "type": "amateur",
+            "start": 26960000,
+            "end": 27410000
+        },
+        {
+            "name": "10m Ham Band",
+            "type": "amateur",
+            "start": 28000000,
+            "end": 29750000
+        },
+        {
+            "name": "6m Ham Band",
+            "type": "amateur",
+            "start": 50000000,
+            "end": 54000000
+        },
+        {
+            "name": "2m Ham Band",
+            "type": "amateur",
+            "start": 144000000,
+            "end": 148000000
+        },
+        {
+            "name": "Marine",
+            "type": "marine",
+            "start": 156000000,
+            "end": 162025000
+        },
+        {
+            "name": "1.25m Ham Band",
+            "type": "amateur",
+            "start": 222000000,
+            "end": 225000000
+        },
+        {
+            "name": "Military Air",
+            "type": "military",
+            "start": 225000000,
+            "end": 380000000
+        },
+        {
+            "name": "Military Sat",
+            "type": "military",
+            "start": 240000000,
+            "end": 270000000
+        },
+        {
+            "name": "70cm Ham Band",
+            "type": "amateur",
+            "start": 420000000,
+            "end": 450000000
+        },
+        {
+            "name": "PMR446",
+            "type": "amateur",
+            "start": 446000000,
+            "end": 446200000
+        },
+        {
+            "name": "33cm Ham Band",
+            "type": "amateur",
+            "start": 902000000,
+            "end": 928000000
+        },
+        {
+            "name": "23cm Ham Band",
+            "type": "amateur",
+            "start": 1240000000,
+            "end": 1300000000
+        },
+        {
+            "name": "13cm Ham Band",
+            "type": "amateur",
+            "start": 2300000000,
+            "end": 2310000000
+        },
+        {
+            "name": "13cm Ham Band",
+            "type": "amateur",
+            "start": 2390000000,
+            "end": 2450000000
+        }
+    ]
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/bandplans/germany.json b/sdrpp_v0.2.5_beta_preview_x64/bandplans/germany.json
new file mode 100644
index 00000000..c9568bf8
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/bandplans/germany.json
@@ -0,0 +1,141 @@
+{
+    "name": "Germany",
+    "country_name": "Germany",
+    "country_code": "DE",
+    "author_name": "Tobias Mädel",
+    "author_url": "https://tbspace.de",
+    "bands": [
+        {
+            "name": "LW",
+            "type": "amateur",
+            "start": 135700,
+            "end": 137800
+        },
+        {
+            "name": "630m",
+            "type": "amateur",
+            "start": 472000,
+            "end": 479000
+        },
+        {
+            "name": "160m",
+            "type": "amateur",
+            "start": 1810000,
+            "end": 2000000
+        },
+        {
+            "name": "80m",
+            "type": "amateur",
+            "start": 3500000,
+            "end": 3800000
+        },
+        {
+            "name": "60m",
+            "type": "amateur",
+            "start": 5351500,
+            "end": 5366500
+        },
+        {
+            "name": "40m",
+            "type": "amateur",
+            "start": 7000000,
+            "end": 7200000
+        },
+        {
+            "name": "30m",
+            "type": "amateur",
+            "start": 10100000,
+            "end": 10150000
+        },
+        {
+            "name": "20m",
+            "type": "amateur",
+            "start": 14000000,
+            "end": 14350000
+        },
+        {
+            "name": "17m",
+            "type": "amateur",
+            "start": 18068000,
+            "end": 18168000
+        },
+        {
+            "name": "15m",
+            "type": "amateur",
+            "start": 21000000,
+            "end": 21450000
+        },
+        {
+            "name": "12m",
+            "type": "amateur",
+            "start": 24890000,
+            "end": 24990000
+        },
+        {
+            "name": "CB",
+            "type": "other",
+            "start": 26565000,
+            "end": 27405000
+        },
+        {
+            "name": "10m",
+            "type": "amateur",
+            "start": 28000000,
+            "end": 29700000
+        },
+        {
+            "name": "6m",
+            "type": "amateur",
+            "start": 50030000,
+            "end": 51000000
+        },
+        {
+            "name": "4m",
+            "type": "amateur",
+            "start": 70150000,
+            "end": 70200000
+        },
+        {
+            "name": "FM",
+            "type": "broadcast",
+            "start": 87500000,
+            "end": 108000000
+        },
+        {
+            "name": "2m",
+            "type": "amateur",
+            "start": 144000000,
+            "end": 146000000
+        },
+        {
+            "name": "Freenet",
+            "type": "other",
+            "start": 149025000,
+            "end": 149115625
+        },
+        {
+            "name": "70cm",
+            "type": "amateur",
+            "start": 430000000,
+            "end": 440000000
+        },
+        {
+            "name": "PMR446",
+            "type": "other",
+            "start": 446006250,
+            "end": 446196875
+        },
+        {
+            "name": "23cm",
+            "type": "amateur",
+            "start": 1240000000,
+            "end": 1300000000
+        },
+        {
+            "name": "13cm",
+            "type": "amateur",
+            "start": 2320000000,
+            "end": 2450000000
+        }
+    ]
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/bandplans/russia.json b/sdrpp_v0.2.5_beta_preview_x64/bandplans/russia.json
new file mode 100644
index 00000000..3ebcb11c
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/bandplans/russia.json
@@ -0,0 +1,135 @@
+{
+    "name": "Russia",
+    "country_name": "Russia",
+    "country_code": "RU",
+    "author_name": "Raov",
+    "author_url": "https://twitter.com/raov_birbtog",
+    "bands": [
+        {
+            "name": "160m CW",
+            "type": "amateur",
+            "start": 1810000,
+            "end": 1838000
+        },
+        {
+            "name": "160m NB",
+            "type": "amateur",
+            "start": 1838000,
+            "end": 1840000
+        },
+        {
+            "name": "160m + Digi",
+            "type": "amateur",
+            "start": 1840000,
+            "end": 1843000
+        },
+        {
+            "name": "160m",
+            "type": "amateur",
+            "start": 1843000,
+            "end": 2000000
+        },
+        {
+            "name": "80m CW",
+            "type": "amateur",
+            "start": 3500000,
+            "end": 3510000
+        },
+        {
+            "name": "80m CW Contest",
+            "type": "amateur",
+            "start": 3510000,
+            "end": 3560000
+        },
+        {
+            "name": "80m CW",
+            "type": "amateur",
+            "start": 3560000,
+            "end": 3570000
+        },
+        {
+            "name": "80m NB, Digi 200Hz",
+            "type": "amateur",
+            "start": 3570000,
+            "end": 3580000
+        },
+        {
+            "name": "80m NB, Digi 500Hz",
+            "type": "amateur",
+            "start": 3580000,
+            "end": 3600000
+        },
+        {
+            "name": "80m SSB Contest",
+            "type": "amateur",
+            "start": 3600000,
+            "end": 3650000
+        },
+        {
+            "name": "80m",
+            "type": "amateur",
+            "start": 3650000,
+            "end": 3700000
+        },
+        {
+            "name": "80m SSB Contest",
+            "type": "amateur",
+            "start": 3700000,
+            "end": 3800000
+        },
+        {
+            "name": "60m CW 200Hz",
+            "type": "amateur",
+            "start": 5351500,
+            "end": 5354000
+        },
+        {
+            "name": "60m USB",
+            "type": "amateur",
+            "start": 5354000,
+            "end": 5366000
+        },
+        {
+            "name": "60m CW 20Hz",
+            "type": "amateur",
+            "start": 5356000,
+            "end": 5366500
+        },
+        {
+            "name": "40m CW",
+            "type": "amateur",
+            "start": 7000000,
+            "end": 7040000
+        },
+        {
+            "name": "40m NB, Digi 500Hz",
+            "type": "amateur",
+            "start": 7040000,
+            "end": 7050000
+        },
+        {
+            "name": "40m",
+            "type": "amateur",
+            "start": 7050000,
+            "end": 7060000
+        },
+        {
+            "name": "40m SSB Contest",
+            "type": "amateur",
+            "start": 7060000,
+            "end": 7100000
+        },
+        {
+            "name": "40m",
+            "type": "amateur",
+            "start": 7100000,
+            "end": 7130000
+        },
+        {
+            "name": "40m SSB Contest",
+            "type": "amateur",
+            "start": 7130000,
+            "end": 7200000
+        }
+    ]
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/config.json b/sdrpp_v0.2.5_beta_preview_x64/config.json
new file mode 100644
index 00000000..3e200136
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/config.json
@@ -0,0 +1,51 @@
+{
+    "bandColors": {
+        "amateur": "#FF0000FF",
+        "aviation": "#00FF00FF",
+        "broadcast": "#0000FFFF",
+        "marine": "#00FFFFFF",
+        "military": "#FFFF00FF"
+    },
+    "bandPlan": "General",
+    "bandPlanEnabled": true,
+    "centerTuning": false,
+    "fftHeight": 300,
+    "frequency": 2410927000,
+    "max": 0.0,
+    "maximized": true,
+    "menuOrder": [
+        "Source",
+        "Radio",
+        "Recorder",
+        "Sinks",
+        "Audio",
+        "Scripting",
+        "Band Plan",
+        "Display"
+    ],
+    "menuWidth": 300,
+    "min": -65.44117736816406,
+    "moduleInstances": {
+        "Audio Sink": "audio_sink",
+        "PlutoSDR Source": "plutosdr_source",
+        "RTL-TCP Source": "rtl_tcp_source",
+        "Radio": "radio",
+        "Recorder": "recorder",
+        "SoapySDR Source": "soapy_source"
+    },
+    "modules": [],
+    "offset": 0.0,
+    "showWaterfall": true,
+    "source": "",
+    "streams": {
+        "Radio": {
+            "muted": true,
+            "sink": "Audio",
+            "volume": 0.29591837525367737
+        }
+    },
+    "windowSize": {
+        "h": 720,
+        "w": 1280
+    }
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/modules/.gitkeep b/sdrpp_v0.2.5_beta_preview_x64/modules/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/sdrpp_v0.2.5_beta_preview_x64/plutosdr_source_config.json b/sdrpp_v0.2.5_beta_preview_x64/plutosdr_source_config.json
new file mode 100644
index 00000000..cf337e35
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/plutosdr_source_config.json
@@ -0,0 +1,6 @@
+{
+    "IP": "192.168.2.1",
+    "gain": 0.0,
+    "gainMode": 2,
+    "sampleRate": 4000000.0
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/radio_config.json b/sdrpp_v0.2.5_beta_preview_x64/radio_config.json
new file mode 100644
index 00000000..bfd4e339
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/radio_config.json
@@ -0,0 +1,38 @@
+{
+    "Radio": {
+        "AM": {
+            "bandwidth": 12500.0,
+            "snapInterval": 1000.0
+        },
+        "CW": {
+            "bandwidth": 200.0,
+            "snapInterval": 10.0
+        },
+        "DSB": {
+            "bandwidth": 6000.0,
+            "snapInterval": 100.0
+        },
+        "FM": {
+            "bandwidth": 12500.0,
+            "snapInterval": 10000.0
+        },
+        "LSB": {
+            "bandwidth": 3000.0,
+            "snapInterval": 100.0
+        },
+        "RAW": {
+            "snapInterval": 10000.0
+        },
+        "USB": {
+            "bandwidth": 3000.0,
+            "snapInterval": 100.0
+        },
+        "WFM": {
+            "bandwidth": 200000.0,
+            "deempMode": 0,
+            "snapInterval": 100000.0,
+            "squelchLevel": -100.0
+        },
+        "selectedDemodId": 2
+    }
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/recorder_config.json b/sdrpp_v0.2.5_beta_preview_x64/recorder_config.json
new file mode 100644
index 00000000..4a5ca25e
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/recorder_config.json
@@ -0,0 +1,6 @@
+{
+    "Recorder": {
+        "directory": "%ROOT%/recordings",
+        "recMode": 1
+    }
+}
\ No newline at end of file
diff --git a/sdrpp_v0.2.5_beta_preview_x64/recordings/.gitkeep b/sdrpp_v0.2.5_beta_preview_x64/recordings/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/fonts/Roboto-Medium.ttf b/sdrpp_v0.2.5_beta_preview_x64/res/fonts/Roboto-Medium.ttf
new file mode 100644
index 00000000..39c63d74
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/fonts/Roboto-Medium.ttf differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/center_tuning.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/center_tuning.png
new file mode 100644
index 00000000..00bf8482
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/center_tuning.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/menu.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/menu.png
new file mode 100644
index 00000000..b830b5b5
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/menu.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/muted.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/muted.png
new file mode 100644
index 00000000..e7a1ad55
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/muted.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/normal_tuning.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/normal_tuning.png
new file mode 100644
index 00000000..76d171e2
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/normal_tuning.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/play.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/play.png
new file mode 100644
index 00000000..a5bc44df
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/play.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.ico b/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.ico
new file mode 100644
index 00000000..9ef26c2c
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.ico differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.png
new file mode 100644
index 00000000..03cf6183
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/stop.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/stop.png
new file mode 100644
index 00000000..6fac0cbc
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/stop.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/res/icons/unmuted.png b/sdrpp_v0.2.5_beta_preview_x64/res/icons/unmuted.png
new file mode 100644
index 00000000..64fcb987
Binary files /dev/null and b/sdrpp_v0.2.5_beta_preview_x64/res/icons/unmuted.png differ
diff --git a/sdrpp_v0.2.5_beta_preview_x64/soapy_source_config.json b/sdrpp_v0.2.5_beta_preview_x64/soapy_source_config.json
new file mode 100644
index 00000000..376198a8
--- /dev/null
+++ b/sdrpp_v0.2.5_beta_preview_x64/soapy_source_config.json
@@ -0,0 +1,4 @@
+{
+    "device": "",
+    "devices": {}
+}
\ No newline at end of file
diff --git a/soapy_source/src/main.cpp b/soapy_source/src/main.cpp
index 84331c2a..f6237e99 100644
--- a/soapy_source/src/main.cpp
+++ b/soapy_source/src/main.cpp
@@ -1,6 +1,6 @@
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <SoapySDR/Device.hpp>
diff --git a/spyserver_source/src/main.cpp b/spyserver_source/src/main.cpp
index 64c82a9a..7611c74e 100644
--- a/spyserver_source/src/main.cpp
+++ b/spyserver_source/src/main.cpp
@@ -1,7 +1,7 @@
 #include <spyserver_client.h>
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <new_module.h>
+#include <module.h>
 #include <gui/gui.h>
 #include <signal_path/signal_path.h>
 #include <core.h>