diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt
index ac75a4b9..2846df6b 100644
--- a/audio_sink/CMakeLists.txt
+++ b/audio_sink/CMakeLists.txt
@@ -13,4 +13,20 @@ include_directories("src/")
 
 add_library(audio_sink SHARED ${SRC})
 target_link_libraries(audio_sink PRIVATE sdrpp_core)
-set_target_properties(audio_sink PROPERTIES PREFIX "")
\ No newline at end of file
+set_target_properties(audio_sink PROPERTIES PREFIX "")
+
+if (MSVC)
+    find_package(portaudio CONFIG REQUIRED)
+    target_link_libraries(sdrpp_core PUBLIC portaudio)
+else (MSVC)
+    find_package(PkgConfig)
+
+    pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0)
+
+    target_include_directories(sdrpp_core ${PORTAUDIO_INCLUDE_DIRS})
+
+    target_link_directories(sdrpp_core PUBLIC ${PORTAUDIO_LIBRARY_DIRS})
+
+    target_link_libraries(sdrpp_core PUBLIC ${PORTAUDIO_LIBRARIES})
+
+endif (MSVC)
\ No newline at end of file
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 290e8320..550bf166 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -46,12 +46,6 @@ if (MSVC)
     find_package(FFTW3f CONFIG REQUIRED)
     target_link_libraries(sdrpp_core PUBLIC FFTW3::fftw3f)
 
-    # PortAudio
-    find_package(portaudio CONFIG REQUIRED)
-    target_link_libraries(sdrpp_core PUBLIC portaudio portaudio_static)
-
-    target_link_libraries(sdrpp_core PUBLIC volk)
-
 else()
     find_package(PkgConfig)
     find_package(OpenGL REQUIRED)
@@ -60,32 +54,28 @@ else()
     pkg_check_modules(FFTW3 REQUIRED fftw3f)
     pkg_check_modules(VOLK REQUIRED volk)
     pkg_check_modules(GLFW3 REQUIRED glfw3)
-    pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0)
 
     target_include_directories(sdrpp_core PUBLIC
         ${GLEW_INCLUDE_DIRS}
         ${FFTW3_INCLUDE_DIRS}
         ${GLFW3_INCLUDE_DIRS}
         ${VOLK_INCLUDE_DIRS}
-        ${PORTAUDIO_INCLUDE_DIRS}
-        )
+    )
 
     target_link_directories(sdrpp_core PUBLIC
         ${GLEW_LIBRARY_DIRS}
         ${FFTW3_LIBRARY_DIRS}
         ${GLFW3_LIBRARY_DIRS}
         ${VOLK_LIBRARY_DIRS}
-        ${PORTAUDIO_LIBRARY_DIRS}
-        )
+    )
 
     target_link_libraries(sdrpp_core PUBLIC
         ${OPENGL_LIBRARIES}
-        ${GLEW_STATIC_LIBRARIES}
-        ${FFTW3_STATIC_LIBRARIES}
-        ${GLFW3_STATIC_LIBRARIES}
-        ${VOLK_STATIC_LIBRARIES}
-        ${PORTAUDIO_STATIC_LIBRARIES}
-        )
+        ${GLEW_LIBRARIES}
+        ${FFTW3_LIBRARIES}
+        ${GLFW3_LIBRARIES}
+        ${VOLK_LIBRARIES}
+    )
 
     if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
         target_link_libraries(sdrpp_core PUBLIC stdc++fs)
diff --git a/core/src/dsp/buffer.h b/core/src/dsp/buffer.h
index c8c5b1a7..c5999f69 100644
--- a/core/src/dsp/buffer.h
+++ b/core/src/dsp/buffer.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <dsp/block.h>
+#include <string.h>
 
 #define RING_BUF_SZ 1000000
 
diff --git a/sdrpp_v0.2.5_beta_preview_x64/band_colors.json b/sdrpp_v0.2.5_beta_preview_x64/band_colors.json
deleted file mode 100644
index 2e9d8a95..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/band_colors.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "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
deleted file mode 100644
index 600c8eef..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/bandplans/general.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-    "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
deleted file mode 100644
index c9568bf8..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/bandplans/germany.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
-    "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
deleted file mode 100644
index 3ebcb11c..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/bandplans/russia.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-    "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
deleted file mode 100644
index 3e200136..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/config.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "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
deleted file mode 100644
index e69de29b..00000000
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
deleted file mode 100644
index cf337e35..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/plutosdr_source_config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index bfd4e339..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/radio_config.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "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
deleted file mode 100644
index 4a5ca25e..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/recorder_config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "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
deleted file mode 100644
index e69de29b..00000000
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
deleted file mode 100644
index 39c63d74..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/fonts/Roboto-Medium.ttf and /dev/null 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
deleted file mode 100644
index 00bf8482..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/center_tuning.png and /dev/null 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
deleted file mode 100644
index b830b5b5..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/menu.png and /dev/null 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
deleted file mode 100644
index e7a1ad55..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/muted.png and /dev/null 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
deleted file mode 100644
index 76d171e2..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/normal_tuning.png and /dev/null 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
deleted file mode 100644
index a5bc44df..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/play.png and /dev/null 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
deleted file mode 100644
index 9ef26c2c..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.ico and /dev/null 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
deleted file mode 100644
index 03cf6183..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/sdrpp.png and /dev/null 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
deleted file mode 100644
index 6fac0cbc..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/stop.png and /dev/null 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
deleted file mode 100644
index 64fcb987..00000000
Binary files a/sdrpp_v0.2.5_beta_preview_x64/res/icons/unmuted.png and /dev/null 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
deleted file mode 100644
index 376198a8..00000000
--- a/sdrpp_v0.2.5_beta_preview_x64/soapy_source_config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "device": "",
-    "devices": {}
-}
\ No newline at end of file
diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt
index 5647f24d..d7ae77b2 100644
--- a/soapy_source/CMakeLists.txt
+++ b/soapy_source/CMakeLists.txt
@@ -19,6 +19,8 @@ if (MSVC)
 
     # Misc headers
     target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/")
+
+    target_link_libraries(sdrpp_core PUBLIC SoapySDR)
 else (MSVC)
     find_package(PkgConfig)