diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml
index 20908f53..d7ed922d 100644
--- a/.github/workflows/build_linux_amd64.yml
+++ b/.github/workflows/build_linux_amd64.yml
@@ -3,52 +3,61 @@ name: Linux Build
 on: [push, pull_request]
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
+    # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+    BUILD_TYPE: Release
 
 jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-20.04
+    build_linux:
+        # The CMake configure and build commands are platform agnostic and should work equally
+        # well on Windows or Mac.  You can convert this to a matrix build if you need
+        # cross-platform coverage.
+        # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+        runs-on: ubuntu-20.04
 
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: Update repositories
-      run: sudo apt update 
-    
-    - name: Install dependencies
-      run: sudo apt install libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Update repositories
+            run: sudo apt update 
+        
+        - name: Install dependencies
+            run: sudo apt install libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
 
-    - name: Create Build Environment
-      # Some projects don't allow in-source building, so create a separate build directory
-      # We'll use this as our working directory for all subsequent commands
-      run: cmake -E make_directory ${{runner.workspace}}/build
+        - name: Create Build Environment
+            # Some projects don't allow in-source building, so create a separate build directory
+            # We'll use this as our working directory for all subsequent commands
+            run: cmake -E make_directory ${{runner.workspace}}/build
 
-    - name: Configure CMake
-      # Use a bash shell so we can use the same syntax for environment variable
-      # access regardless of the host operating system
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source 
-      # and build directories, but this is only available with CMake 3.13 and higher.  
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE  -DOPT_BUILD_SDRPLAY_SOURCE=OFF
+        - name: Configure CMake
+            # Use a bash shell so we can use the same syntax for environment variable
+            # access regardless of the host operating system
+            shell: bash
+            working-directory: ${{runner.workspace}}/build
+            # Note the current convention is to use the -S and -B options here to specify source 
+            # and build directories, but this is only available with CMake 3.13 and higher.  
+            # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+            run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE  -DOPT_BUILD_SDRPLAY_SOURCE=OFF
 
-    - name: Build
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
+        - name: Build
+            working-directory: ${{runner.workspace}}/build
+            shell: bash
+            # Execute the build.  You can specify a specific target with "--target <NAME>"
+            run: cmake --build . --config $BUILD_TYPE
 
-    - name: Create Deb Archive
-      run: cd $GITHUB_WORKSPACE && sh make_debian_package.sh ${{runner.workspace}}/build
+        - name: Create Deb Archive
+            run: cd $GITHUB_WORKSPACE && sh make_debian_package.sh ${{runner.workspace}}/build
 
-    - name: Save Deb Archive
-      uses: actions/upload-artifact@v2
-      with:
-          name: sdrpp_debian_amd64
-          path: /home/runner/work/SDRPlusPlus/SDRPlusPlus/sdrpp_debian_amd64.deb
\ No newline at end of file
+        - name: Save Deb Archive
+            uses: actions/upload-artifact@v2
+            with:
+                name: sdrpp_debian_amd64
+                path: /home/runner/work/SDRPlusPlus/SDRPlusPlus/sdrpp_debian_amd64.deb
+
+    build_windows:
+        runs-on: windows-latest
+
+        steps:
+        - uses: actions/checkout@v2
+        
+        - name: Testing Windows
+            run: echo test
\ No newline at end of file
diff --git a/.github/workflows/build_windows_amd64.yml b/.github/workflows/build_windows_amd64.yml
deleted file mode 100644
index 9d3ce971..00000000
--- a/.github/workflows/build_windows_amd64.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Windows Build
-
-on: [push, pull_request]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Release
-
-jobs:
-  build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: Testing
-    - run: echo This is a test
\ No newline at end of file