diff --git a/CMakeLists.txt b/CMakeLists.txt
index b56c2bba0..27a8c574d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,8 @@ project(obs-studio)
 
 option(BUILD_CAPTIONS "Build captions" FALSE)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 if(WIN32)
 	cmake_minimum_required(VERSION 3.16)
 
diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
index a660f3267..bf1fc8e6d 100644
--- a/UI/CMakeLists.txt
+++ b/UI/CMakeLists.txt
@@ -402,6 +402,7 @@ if (APPLE)
 			Qt5::MacExtras)
 	set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")
 endif()
+set_target_properties(obs PROPERTIES FOLDER "frontend")
 
 define_graphic_modules(obs)
 
diff --git a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
index 44039d299..508a7eddd 100644
--- a/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
+++ b/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
@@ -64,5 +64,6 @@ target_link_libraries(decklink-ouput-ui
 	obs-frontend-api
 	Qt5::Widgets
 	libobs)
+set_target_properties(decklink-ouput-ui PROPERTIES FOLDER "frontend")
 
 install_obs_plugin_with_data(decklink-ouput-ui data)
diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt
index f9e8782d7..a2ae832c3 100644
--- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt
+++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt
@@ -122,5 +122,6 @@ target_link_libraries(frontend-tools
 	obs-frontend-api
 	Qt5::Widgets
 	libobs)
+set_target_properties(frontend-tools PROPERTIES FOLDER "frontend")
 
 install_obs_plugin_with_data(frontend-tools data)
diff --git a/UI/obs-frontend-api/CMakeLists.txt b/UI/obs-frontend-api/CMakeLists.txt
index 445cfef7d..9d69b7088 100644
--- a/UI/obs-frontend-api/CMakeLists.txt
+++ b/UI/obs-frontend-api/CMakeLists.txt
@@ -22,6 +22,7 @@ add_library(obs-frontend-api SHARED
 	${obs-frontend-api_HEADERS})
 target_link_libraries(obs-frontend-api
 	libobs)
+set_target_properties(obs-frontend-api PROPERTIES FOLDER "frontend")
 
 if(UNIX AND NOT APPLE)
 	set_target_properties(obs-frontend-api
diff --git a/UI/win-update/updater/CMakeLists.txt b/UI/win-update/updater/CMakeLists.txt
index a65ceab3a..faa5d2265 100644
--- a/UI/win-update/updater/CMakeLists.txt
+++ b/UI/win-update/updater/CMakeLists.txt
@@ -51,3 +51,4 @@ target_link_libraries(updater
 	shell32
 	winhttp
 	)
+set_target_properties(updater PROPERTIES FOLDER "frontend")
diff --git a/deps/blake2/CMakeLists.txt b/deps/blake2/CMakeLists.txt
index f73ead78c..6c407a202 100644
--- a/deps/blake2/CMakeLists.txt
+++ b/deps/blake2/CMakeLists.txt
@@ -30,3 +30,4 @@ set(blake2_HEADERS
 add_library(blake2 STATIC
 	${blake2_SOURCES}
 	${blake2_HEADERS})
+set_target_properties(blake2 PROPERTIES FOLDER "deps")
diff --git a/deps/file-updater/CMakeLists.txt b/deps/file-updater/CMakeLists.txt
index f4d1a8bd0..d32462354 100644
--- a/deps/file-updater/CMakeLists.txt
+++ b/deps/file-updater/CMakeLists.txt
@@ -30,3 +30,4 @@ target_link_libraries(file-updater
 	${LIBCURL_LIBRARIES}
 	${file-updater_PLATFORM_DEPS}
 	libobs)
+set_target_properties(file-updater PROPERTIES FOLDER "deps")
diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt
index 2c4cf13ac..a98f4ff28 100644
--- a/deps/glad/CMakeLists.txt
+++ b/deps/glad/CMakeLists.txt
@@ -35,6 +35,7 @@ add_library(glad SHARED
 	${glad_SOURCES}
 	${glad_PLATFORM_SOURCES})
 set_target_properties(glad PROPERTIES
+	FOLDER "deps"
 	OUTPUT_NAME obsglad
 	VERSION "0"
 	SOVERSION "0")
diff --git a/deps/ipc-util/CMakeLists.txt b/deps/ipc-util/CMakeLists.txt
index ac6103957..3e2f19144 100644
--- a/deps/ipc-util/CMakeLists.txt
+++ b/deps/ipc-util/CMakeLists.txt
@@ -29,6 +29,7 @@ endif()
 add_library(ipc-util STATIC
 	${ipc-util_SOURCES}
 	${ipc-util_HEADERS})
+set_target_properties(ipc-util PROPERTIES FOLDER "deps")
 target_include_directories(ipc-util
 	PUBLIC .)
 target_link_libraries(ipc-util)
diff --git a/deps/jansson/CMakeLists.txt b/deps/jansson/CMakeLists.txt
index 885917f9e..aeabe85c6 100644
--- a/deps/jansson/CMakeLists.txt
+++ b/deps/jansson/CMakeLists.txt
@@ -342,7 +342,7 @@ set(JANSSON_HDR_PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}/src/utf.h
    ${CMAKE_CURRENT_BINARY_DIR}/private_include/jansson_private_config.h)
 
-set(JANSSON_HDR_PUBLIC 
+set(JANSSON_HDR_PUBLIC
    ${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h
    ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h)
 
@@ -351,21 +351,22 @@ source_group("Library Private Headers" FILES ${JANSSON_HDR_PRIVATE})
 source_group("Library Public Headers" FILES ${JANSSON_HDR_PUBLIC})
 
 if(JANSSON_BUILD_SHARED_LIBS)
-   add_library(jansson SHARED 
-      ${JANSSON_SRC} 
-      ${JANSSON_HDR_PRIVATE} 
-      ${JANSSON_HDR_PUBLIC} 
+   add_library(jansson SHARED
+      ${JANSSON_SRC}
+      ${JANSSON_HDR_PRIVATE}
+      ${JANSSON_HDR_PUBLIC}
       src/jansson.def)
 
    set_target_properties(jansson PROPERTIES
       VERSION ${JANSSON_VERSION}
       SOVERSION ${JANSSON_SOVERSION})
 else()
-   add_library(jansson 
+   add_library(jansson
       ${JANSSON_SRC}
-      ${JANSSON_HDR_PRIVATE} 
+      ${JANSSON_HDR_PRIVATE}
       ${JANSSON_HDR_PUBLIC})
 endif()
+set_target_properties(jansson PROPERTIES FOLDER "deps")
 
 if (JANSSON_EXAMPLES)
 	add_executable(simple_parse "${PROJECT_SOURCE_DIR}/examples/simple_parse.c")
@@ -379,12 +380,12 @@ if (JANSSON_BUILD_DOCS)
    find_package(Sphinx)
 
    if (NOT SPHINX_FOUND)
-      message(WARNING "Sphinx not found. Cannot generate documentation! 
+      message(WARNING "Sphinx not found. Cannot generate documentation!
       Set -DJANSSON_BUILD_DOCS=OFF to get rid of this message.")
    else()
       if (Sphinx_VERSION_STRING VERSION_LESS 1.0)
-         message(WARNING "Your Sphinx version is too old! 
-               This project requires Sphinx v1.0 or above to produce 
+         message(WARNING "Your Sphinx version is too old!
+               This project requires Sphinx v1.0 or above to produce
                proper documentation (you have v${Sphinx_VERSION_STRING}).
                You will get output but it will have errors.")
       endif()
@@ -437,7 +438,7 @@ if (JANSSON_BUILD_DOCS)
             list(APPEND DOC_TARGETS latex)
          endif()
       endif()
-      
+
       # The doc target will build all documentation targets.
       add_custom_target(doc)
 
@@ -579,7 +580,7 @@ if (NOT JANSSON_WITHOUT_TESTS)
 
    # Enable using "make check" just like the autotools project.
    # By default cmake creates a target "make test"
-   add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} 
+   add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
                      DEPENDS json_process ${api_tests})
 endif ()
 
@@ -624,33 +625,33 @@ export(TARGETS jansson
 export(PACKAGE jansson)
 
 # Generate the config file for the build-tree.
-set(JANSSON__INCLUDE_DIRS 
+set(JANSSON__INCLUDE_DIRS
     "${PROJECT_SOURCE_DIR}/include"
     "${PROJECT_BINARY_DIR}/include")
 set(JANSSON_INCLUDE_DIRS ${JANSSON__INCLUDE_DIRS} CACHE PATH "Jansson include directories")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
-                ${PROJECT_BINARY_DIR}/JanssonConfig.cmake 
+                ${PROJECT_BINARY_DIR}/JanssonConfig.cmake
                 @ONLY)
 
 # Generate the config file for the installation tree.
-file(RELATIVE_PATH 
-    REL_INCLUDE_DIR 
+file(RELATIVE_PATH
+    REL_INCLUDE_DIR
     "${JANSSON_INSTALL_CMAKE_DIR}"
     "${JANSSON_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the Cmake dir.
 
-# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in, 
+# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in,
 # we escape it here so it's evaluated when it is included instead
-# so that the include dirs are given relative to where the 
+# so that the include dirs are given relative to where the
 # config file is located.
-set(JANSSON__INCLUDE_DIRS 
-    "\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}") 
+set(JANSSON__INCLUDE_DIRS
+    "\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
-                ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake 
+                ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
                 @ONLY)
 
 # Generate version info for both build-tree and install-tree.
 configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfigVersion.cmake.in
-                ${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake 
+                ${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake
                 @ONLY)
 
 # Define the public headers.
@@ -671,7 +672,7 @@ install(TARGETS jansson
         PUBLIC_HEADER DESTINATION "${JANSSON_INSTALL_INCLUDE_DIR}" COMPONENT dev)
 
 # Install the pkg-config.
-install (FILES 
+install (FILES
          ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc
          DESTINATION ${JANSSON_INSTALL_LIB_DIR}/pkgconfig COMPONENT dev)
 
@@ -682,7 +683,7 @@ install(FILES
     DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
 
 # Install exports for the install-tree.
-install(EXPORT JanssonTargets 
+install(EXPORT JanssonTargets
         DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}" COMPONENT dev)
 endif()
 
@@ -690,4 +691,4 @@ endif()
 set(JANSSON_LIBRARIES jansson CACHE STRING "Jansson libraries")
 
 target_include_directories(jansson
-        PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")
\ No newline at end of file
+        PUBLIC src "${CMAKE_CURRENT_BINARY_DIR}/include")
diff --git a/deps/libcaption/CMakeLists.txt b/deps/libcaption/CMakeLists.txt
index 578834f6c..1a2001deb 100644
--- a/deps/libcaption/CMakeLists.txt
+++ b/deps/libcaption/CMakeLists.txt
@@ -36,3 +36,4 @@ set(CAPTION_HEADERS
 )
 
 add_library(caption STATIC ${CAPTION_SOURCES})
+set_target_properties(caption PROPERTIES FOLDER "deps")
diff --git a/deps/libff/CMakeLists.txt b/deps/libff/CMakeLists.txt
index c1413c091..e23bf1040 100644
--- a/deps/libff/CMakeLists.txt
+++ b/deps/libff/CMakeLists.txt
@@ -50,6 +50,7 @@ endif(WIN32)
 add_library (libff STATIC
 	${libff_HEADERS}
 	${libff_SOURCES})
+set_target_properties(libff PROPERTIES FOLDER "deps")
 
 target_include_directories(libff
 	PUBLIC .)
diff --git a/deps/lzma/CMakeLists.txt b/deps/lzma/CMakeLists.txt
index 6908cd23e..6e64d3f06 100644
--- a/deps/lzma/CMakeLists.txt
+++ b/deps/lzma/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.2)
 
 project(lzma)
 
-set(LIBLZMA_INCLUDE_DIRS 
+set(LIBLZMA_INCLUDE_DIRS
 	"${CMAKE_CURRENT_SOURCE_DIR}"
-	"${CMAKE_CURRENT_SOURCE_DIR}/liblzma/api" 
+	"${CMAKE_CURRENT_SOURCE_DIR}/liblzma/api"
 		CACHE PATH "lzma include path")
 
 set(LIBLZMA_CONFIG
@@ -117,7 +117,7 @@ set(liblzma_simple_SOURCES
 	liblzma/simple/simple_coder.c
 	liblzma/simple/simple_encoder.c
 	liblzma/simple/simple_decoder.c
-	
+
 	liblzma/simple/arm.c
 	liblzma/simple/armthumb.c
 	liblzma/simple/ia64.c
@@ -145,3 +145,4 @@ add_library(lzma STATIC
 	${liblzma_lzma_SOURCES}
 	${liblzma_rangecoder_SOURCES}
 	${liblzma_simple_SOURCES})
+set_target_properties(lzma PROPERTIES FOLDER "deps")
diff --git a/deps/media-playback/CMakeLists.txt b/deps/media-playback/CMakeLists.txt
index 13b365733..39d00150d 100644
--- a/deps/media-playback/CMakeLists.txt
+++ b/deps/media-playback/CMakeLists.txt
@@ -41,3 +41,4 @@ endif()
 target_link_libraries(media-playback
 	${FFMPEG_LIBRARIES}
 	)
+set_target_properties(media-playback PROPERTIES FOLDER "deps")
diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
index 7dd316f14..a9aaa34ea 100644
--- a/deps/obs-scripting/CMakeLists.txt
+++ b/deps/obs-scripting/CMakeLists.txt
@@ -207,6 +207,8 @@ target_link_libraries(obs-scripting
 	${obs-scripting_PLATFORM_DEPS}
 	)
 
+set_target_properties(obs-scripting PROPERTIES FOLDER "scripting")
+
 if(PYTHONLIBS_FOUND)
 	add_subdirectory(obspython)
 endif()
diff --git a/deps/obs-scripting/obslua/CMakeLists.txt b/deps/obs-scripting/obslua/CMakeLists.txt
index 4553cfd70..041e6cf1d 100644
--- a/deps/obs-scripting/obslua/CMakeLists.txt
+++ b/deps/obs-scripting/obslua/CMakeLists.txt
@@ -35,6 +35,8 @@ else()
 endif()
 SWIG_LINK_LIBRARIES(obslua obs-scripting libobs ${LUA_LIBRARIES} ${EXTRA_LIBS})
 
+set_target_properties(obslua PROPERTIES FOLDER "scripting")
+
 function(install_plugin_bin_swig target additional_target)
 	if(APPLE)
 		set(_bit_suffix "")
diff --git a/deps/obs-scripting/obspython/CMakeLists.txt b/deps/obs-scripting/obspython/CMakeLists.txt
index 6f0b1881b..5ffaad369 100644
--- a/deps/obs-scripting/obspython/CMakeLists.txt
+++ b/deps/obs-scripting/obspython/CMakeLists.txt
@@ -54,6 +54,8 @@ ELSE()
 	SWIG_LINK_LIBRARIES(obspython obs-scripting libobs ${PYTHON_LIBRARIES})
 ENDIF()
 
+set_target_properties(_obspython PROPERTIES FOLDER "scripting")
+
 function(install_plugin_bin_swig target additional_target)
 	if(APPLE)
 		set(_bit_suffix "")
diff --git a/deps/w32-pthreads/CMakeLists.txt b/deps/w32-pthreads/CMakeLists.txt
index 7fd3808f9..e8b5cdab7 100644
--- a/deps/w32-pthreads/CMakeLists.txt
+++ b/deps/w32-pthreads/CMakeLists.txt
@@ -25,5 +25,6 @@ target_include_directories(w32-pthreads
 	PUBLIC
 		"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 target_link_libraries(w32-pthreads)
+set_target_properties(w32-pthreads PROPERTIES FOLDER "deps")
 
 install_obs_core(w32-pthreads EXPORT w32-pthreads)
diff --git a/libobs-d3d11/CMakeLists.txt b/libobs-d3d11/CMakeLists.txt
index 9bd76cdf5..e201523cc 100644
--- a/libobs-d3d11/CMakeLists.txt
+++ b/libobs-d3d11/CMakeLists.txt
@@ -47,6 +47,7 @@ add_library(libobs-d3d11 MODULE
 	${libobs-d3d11_HEADERS})
 set_target_properties(libobs-d3d11
 	PROPERTIES
+		FOLDER "core"
 		OUTPUT_NAME libobs-d3d11
 		PREFIX "")
 target_link_libraries(libobs-d3d11
diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt
index 1d53d518d..c2fa4fd67 100644
--- a/libobs-opengl/CMakeLists.txt
+++ b/libobs-opengl/CMakeLists.txt
@@ -84,11 +84,13 @@ endif()
 if(WIN32 OR APPLE)
 set_target_properties(libobs-opengl
 	PROPERTIES
+		FOLDER "core"
 		OUTPUT_NAME libobs-opengl
 		PREFIX "")
 else()
 set_target_properties(libobs-opengl
 	PROPERTIES
+		FOLDER "core"
 		OUTPUT_NAME obs-opengl
 		VERSION 0.0
 		SOVERSION 0
diff --git a/libobs-winrt/CMakeLists.txt b/libobs-winrt/CMakeLists.txt
index 1739fd50f..fe0806323 100644
--- a/libobs-winrt/CMakeLists.txt
+++ b/libobs-winrt/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(libobs-winrt MODULE
 	${libobs-winrt_HEADERS})
 set_target_properties(libobs-winrt
 	PROPERTIES
+		FOLDER "plugins/win-capture"
 		OUTPUT_NAME libobs-winrt
 		PREFIX "")
 target_precompile_headers(libobs-winrt
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 0b592d7ae..b7e4b7d81 100644
--- a/libobs/CMakeLists.txt
+++ b/libobs/CMakeLists.txt
@@ -480,6 +480,7 @@ if(UNIX AND NOT APPLE)
 endif()
 
 set_target_properties(libobs PROPERTIES
+	FOLDER "core"
 	OUTPUT_NAME obs
 	VERSION "0"
 	SOVERSION "0")
diff --git a/plugins/coreaudio-encoder/CMakeLists.txt b/plugins/coreaudio-encoder/CMakeLists.txt
index a300a701f..732eb70fd 100644
--- a/plugins/coreaudio-encoder/CMakeLists.txt
+++ b/plugins/coreaudio-encoder/CMakeLists.txt
@@ -37,5 +37,6 @@ add_library(coreaudio-encoder MODULE
 target_link_libraries(coreaudio-encoder
 	libobs
 	${coreaudio-encoder_LIBS})
+set_target_properties(coreaudio-encoder PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(coreaudio-encoder data)
diff --git a/plugins/decklink/linux/CMakeLists.txt b/plugins/decklink/linux/CMakeLists.txt
index 4f006ec4e..5c11bf056 100644
--- a/plugins/decklink/linux/CMakeLists.txt
+++ b/plugins/decklink/linux/CMakeLists.txt
@@ -63,5 +63,6 @@ add_library(linux-decklink MODULE
 target_link_libraries(linux-decklink
 	libobs
 	)
+set_target_properties(linux-decklink PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-decklink ../data)
diff --git a/plugins/decklink/mac/CMakeLists.txt b/plugins/decklink/mac/CMakeLists.txt
index 04a2a1a0c..adfd59278 100644
--- a/plugins/decklink/mac/CMakeLists.txt
+++ b/plugins/decklink/mac/CMakeLists.txt
@@ -74,5 +74,6 @@ add_library(mac-decklink MODULE
 target_link_libraries(mac-decklink
 	libobs
 	${COREFOUNDATION})
+set_target_properties(mac-decklink PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(mac-decklink ../data)
diff --git a/plugins/decklink/win/CMakeLists.txt b/plugins/decklink/win/CMakeLists.txt
index bdab65e32..fca4e5dc3 100644
--- a/plugins/decklink/win/CMakeLists.txt
+++ b/plugins/decklink/win/CMakeLists.txt
@@ -67,5 +67,6 @@ add_library(win-decklink MODULE
 
 target_link_libraries(win-decklink
 	libobs)
+set_target_properties(win-decklink PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(win-decklink ../data)
diff --git a/plugins/enc-amf b/plugins/enc-amf
index 7e78d6f09..6e934b6b2 160000
--- a/plugins/enc-amf
+++ b/plugins/enc-amf
@@ -1 +1 @@
-Subproject commit 7e78d6f0910563995954afc5484971348376a616
+Subproject commit 6e934b6b281cf675522ea43391376bd6bb089256
diff --git a/plugins/image-source/CMakeLists.txt b/plugins/image-source/CMakeLists.txt
index 6f983ed0d..95fff78c5 100644
--- a/plugins/image-source/CMakeLists.txt
+++ b/plugins/image-source/CMakeLists.txt
@@ -22,5 +22,6 @@ add_library(image-source MODULE
 target_link_libraries(image-source
 	libobs
 	${image-source_PLATFORM_DEPS})
+set_target_properties(image-source PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(image-source data)
diff --git a/plugins/linux-alsa/CMakeLists.txt b/plugins/linux-alsa/CMakeLists.txt
index 226a4e78b..c53308a40 100644
--- a/plugins/linux-alsa/CMakeLists.txt
+++ b/plugins/linux-alsa/CMakeLists.txt
@@ -30,5 +30,6 @@ target_link_libraries(linux-alsa
 	libobs
 	${ALSA_LIBRARY}
 )
+set_target_properties(linux-alsa PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-alsa data)
diff --git a/plugins/linux-capture/CMakeLists.txt b/plugins/linux-capture/CMakeLists.txt
index 70803461f..7f876954c 100644
--- a/plugins/linux-capture/CMakeLists.txt
+++ b/plugins/linux-capture/CMakeLists.txt
@@ -47,5 +47,6 @@ target_link_libraries(linux-capture
 	${X11_Xcomposite_LIB}
 	${XCB_LIBRARIES}
 )
+set_target_properties(linux-capture PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-capture data)
diff --git a/plugins/linux-jack/CMakeLists.txt b/plugins/linux-jack/CMakeLists.txt
index aac7a8db6..5aefba450 100644
--- a/plugins/linux-jack/CMakeLists.txt
+++ b/plugins/linux-jack/CMakeLists.txt
@@ -31,5 +31,6 @@ target_link_libraries(linux-jack
 	libobs
 	${JACK_LIBRARIES}
 )
+set_target_properties(linux-jack PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-jack data)
diff --git a/plugins/linux-pulseaudio/CMakeLists.txt b/plugins/linux-pulseaudio/CMakeLists.txt
index ae9ad805c..51814ea3b 100644
--- a/plugins/linux-pulseaudio/CMakeLists.txt
+++ b/plugins/linux-pulseaudio/CMakeLists.txt
@@ -31,5 +31,6 @@ target_link_libraries(linux-pulseaudio
 	libobs
 	${PULSEAUDIO_LIBRARY}
 )
+set_target_properties(linux-pulseaudio PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-pulseaudio data)
diff --git a/plugins/linux-v4l2/CMakeLists.txt b/plugins/linux-v4l2/CMakeLists.txt
index fbddd69ff..f2b58d95f 100644
--- a/plugins/linux-v4l2/CMakeLists.txt
+++ b/plugins/linux-v4l2/CMakeLists.txt
@@ -45,5 +45,6 @@ target_link_libraries(linux-v4l2
 	${LIBV4L2_LIBRARIES}
 	${UDEV_LIBRARIES}
 )
+set_target_properties(linux-v4l2 PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(linux-v4l2 data)
diff --git a/plugins/mac-avcapture/CMakeLists.txt b/plugins/mac-avcapture/CMakeLists.txt
index 8cb6ef6a7..75ce61032 100644
--- a/plugins/mac-avcapture/CMakeLists.txt
+++ b/plugins/mac-avcapture/CMakeLists.txt
@@ -26,7 +26,7 @@ set(mac-avcapture_SOURCES
 
 set_source_files_properties(av-capture.mm
 	PROPERTIES COMPILE_FLAGS "-fobjc-arc")
-	
+
 add_library(mac-avcapture MODULE
 	${mac-avcapture_SOURCES}
 	${mac-avcapture_HEADERS})
@@ -40,5 +40,6 @@ target_link_libraries(mac-avcapture
 	${COREVIDEO}
 	${COREMEDIAIO}
 	${COCOA})
+set_target_properties(mac-avcapture PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(mac-avcapture data)
diff --git a/plugins/mac-capture/CMakeLists.txt b/plugins/mac-capture/CMakeLists.txt
index 50e34f69c..66f1a1889 100644
--- a/plugins/mac-capture/CMakeLists.txt
+++ b/plugins/mac-capture/CMakeLists.txt
@@ -23,7 +23,7 @@ set(mac-capture_SOURCES
 	mac-display-capture.m
 	mac-window-capture.m
 	window-utils.m)
-	
+
 set_source_files_properties(mac-display-capture.m
 			    mac-window-capture.m
 			    window-utils.m
@@ -39,5 +39,6 @@ target_link_libraries(mac-capture
 	${COREFOUNDATION}
 	${IOSURF}
 	${COCOA})
+set_target_properties(mac-capture PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(mac-capture data)
diff --git a/plugins/mac-syphon/CMakeLists.txt b/plugins/mac-syphon/CMakeLists.txt
index a67b94ff4..e203136e2 100644
--- a/plugins/mac-syphon/CMakeLists.txt
+++ b/plugins/mac-syphon/CMakeLists.txt
@@ -85,5 +85,6 @@ target_link_libraries(mac-syphon
 
 set_property (TARGET mac-syphon APPEND_STRING PROPERTY
 	COMPILE_FLAGS "-fobjc-arc")
+set_target_properties(mac-syphon PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(mac-syphon data)
diff --git a/plugins/mac-vth264/CMakeLists.txt b/plugins/mac-vth264/CMakeLists.txt
index ce2239163..60632a638 100644
--- a/plugins/mac-vth264/CMakeLists.txt
+++ b/plugins/mac-vth264/CMakeLists.txt
@@ -28,5 +28,6 @@ target_link_libraries(mac-vth264
 	${COREVIDEO}
 	${VIDEOTOOLBOX}
 	${COREMEDIA})
+set_target_properties(mac-vth264 PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(mac-vth264 data)
diff --git a/plugins/obs-browser b/plugins/obs-browser
index 66f41fe74..22510c950 160000
--- a/plugins/obs-browser
+++ b/plugins/obs-browser
@@ -1 +1 @@
-Subproject commit 66f41fe741ce5f4974d3aeff2bb559c59bb7165e
+Subproject commit 22510c95068dd1986f1962c671f83e483ca9f5d4
diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt
index 007b05388..3f426bbda 100644
--- a/plugins/obs-ffmpeg/CMakeLists.txt
+++ b/plugins/obs-ffmpeg/CMakeLists.txt
@@ -65,6 +65,7 @@ target_link_libraries(obs-ffmpeg
 	media-playback
 	${obs-ffmpeg_PLATFORM_DEPS}
 	${FFMPEG_LIBRARIES})
+set_target_properties(obs-ffmpeg PROPERTIES FOLDER "plugins/obs-ffmpeg")
 
 install_obs_plugin_with_data(obs-ffmpeg data)
 
diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt
index c464b8e5f..c886ac622 100644
--- a/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt
+++ b/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt
@@ -17,4 +17,6 @@ add_executable(obs-ffmpeg-mux
 target_link_libraries(obs-ffmpeg-mux
 	${FFMPEG_LIBRARIES})
 
+set_target_properties(obs-ffmpeg-mux PROPERTIES FOLDER "plugins/obs-ffmpeg")
+
 install_obs_core(obs-ffmpeg-mux)
diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt
index 077bae1a4..6438e7e55 100644
--- a/plugins/obs-filters/CMakeLists.txt
+++ b/plugins/obs-filters/CMakeLists.txt
@@ -69,5 +69,6 @@ target_link_libraries(obs-filters
 	libobs
 	${obs-filters_PLATFORM_DEPS}
 	${obs-filters_LIBSPEEXDSP_LIBRARIES})
+set_target_properties(obs-filters PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-filters data)
diff --git a/plugins/obs-libfdk/CMakeLists.txt b/plugins/obs-libfdk/CMakeLists.txt
index f804d0124..2144b579b 100644
--- a/plugins/obs-libfdk/CMakeLists.txt
+++ b/plugins/obs-libfdk/CMakeLists.txt
@@ -24,5 +24,6 @@ add_library(obs-libfdk MODULE
 target_link_libraries(obs-libfdk
 	libobs
 	${LIBFDK_LIBRARIES})
+set_target_properties(obs-libfdk PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-libfdk data)
diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt
index de5f05d3c..5db2d52a3 100644
--- a/plugins/obs-outputs/CMakeLists.txt
+++ b/plugins/obs-outputs/CMakeLists.txt
@@ -176,5 +176,6 @@ target_link_libraries(obs-outputs
 	${ZLIB_LIBRARIES}
 	${ftl_IMPORTS}
 	${obs-outputs_PLATFORM_DEPS})
+set_target_properties(obs-outputs PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-outputs data)
diff --git a/plugins/obs-qsv11/CMakeLists.txt b/plugins/obs-qsv11/CMakeLists.txt
index b578523a4..6e5c6411e 100644
--- a/plugins/obs-qsv11/CMakeLists.txt
+++ b/plugins/obs-qsv11/CMakeLists.txt
@@ -91,6 +91,7 @@ target_link_libraries(obs-qsv11
 	)
 
 target_compile_definitions(obs-qsv11 PRIVATE DX11_D3D)
+set_target_properties(obs-qsv11 PROPERTIES FOLDER "plugins")
 
 source_group("obs-qsv11\\Source Files" FILES ${obs-qsv11_SOURCES})
 source_group("obs-qsv11\\Header Files" FILES ${obs-qsv11_HEADERS})
diff --git a/plugins/obs-text/CMakeLists.txt b/plugins/obs-text/CMakeLists.txt
index 9a3003e0d..43599fcd0 100644
--- a/plugins/obs-text/CMakeLists.txt
+++ b/plugins/obs-text/CMakeLists.txt
@@ -20,5 +20,6 @@ add_library(obs-text MODULE
 target_link_libraries(obs-text
 	libobs
 	${obs-text_PLATFORM_DEPS})
+set_target_properties(obs-text PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-text data)
diff --git a/plugins/obs-transitions/CMakeLists.txt b/plugins/obs-transitions/CMakeLists.txt
index 4a4ef1a3c..267e74e2a 100644
--- a/plugins/obs-transitions/CMakeLists.txt
+++ b/plugins/obs-transitions/CMakeLists.txt
@@ -22,5 +22,6 @@ add_library(obs-transitions MODULE
 	${obs-transitions_SOURCES})
 target_link_libraries(obs-transitions
 	libobs)
+set_target_properties(obs-transitions PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-transitions data)
diff --git a/plugins/obs-vst b/plugins/obs-vst
index 1ffbaea9f..bf9448207 160000
--- a/plugins/obs-vst
+++ b/plugins/obs-vst
@@ -1 +1 @@
-Subproject commit 1ffbaea9f7c106077cd9e0191963be1fe773c0d8
+Subproject commit bf94482077c3f6277f48d0703803ea241e14c6e3
diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt
index 4a95db2ab..c0308748a 100644
--- a/plugins/obs-x264/CMakeLists.txt
+++ b/plugins/obs-x264/CMakeLists.txt
@@ -20,5 +20,6 @@ add_library(obs-x264 MODULE
 target_link_libraries(obs-x264
 	libobs
 	${LIBX264_LIBRARIES})
+set_target_properties(obs-x264 PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(obs-x264 data)
diff --git a/plugins/oss-audio/CMakeLists.txt b/plugins/oss-audio/CMakeLists.txt
index 1348fcde7..b25f7f080 100644
--- a/plugins/oss-audio/CMakeLists.txt
+++ b/plugins/oss-audio/CMakeLists.txt
@@ -32,5 +32,6 @@ add_library(oss-audio MODULE
 target_link_libraries(oss-audio
 	libobs
 )
+set_target_properties(oss-audio PROPERTIES FOLDER "plugins")
 
 install_obs_plugin(oss-audio)
diff --git a/plugins/rtmp-services/CMakeLists.txt b/plugins/rtmp-services/CMakeLists.txt
index b565e3ffc..5232336b8 100644
--- a/plugins/rtmp-services/CMakeLists.txt
+++ b/plugins/rtmp-services/CMakeLists.txt
@@ -48,6 +48,8 @@ target_link_libraries(rtmp-services
 	${OBS_JANSSON_IMPORT}
 	${LIBCURL_LIBRARIES})
 
+set_target_properties(rtmp-services PROPERTIES FOLDER "plugins")
+
 target_include_directories(rtmp-services
 	PUBLIC
 		"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/plugins/rtmp-services>")
diff --git a/plugins/text-freetype2/CMakeLists.txt b/plugins/text-freetype2/CMakeLists.txt
index 66ee93c95..5b4e1e5dd 100644
--- a/plugins/text-freetype2/CMakeLists.txt
+++ b/plugins/text-freetype2/CMakeLists.txt
@@ -77,6 +77,7 @@ target_link_libraries(text-freetype2
 	libobs
 	${text-freetype2_PLATFORM_DEPS}
 	${FREETYPE_LIBRARIES})
+set_target_properties(text-freetype2 PROPERTIES FOLDER "plugins")
 
 if(NOT WIN32)
 	if(FONTCONFIG_FOUND)
diff --git a/plugins/vlc-video/CMakeLists.txt b/plugins/vlc-video/CMakeLists.txt
index 26370e75f..d8f5b6904 100644
--- a/plugins/vlc-video/CMakeLists.txt
+++ b/plugins/vlc-video/CMakeLists.txt
@@ -44,5 +44,6 @@ add_library(vlc-video MODULE
 target_link_libraries(vlc-video
 	libobs
 	${vlc-video_PLATFORM_DEPS})
+set_target_properties(vlc-video PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(vlc-video data)
diff --git a/plugins/win-capture/CMakeLists.txt b/plugins/win-capture/CMakeLists.txt
index 768d27e92..131d59b36 100644
--- a/plugins/win-capture/CMakeLists.txt
+++ b/plugins/win-capture/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(win-capture
 	libobs
 	ipc-util
 	psapi)
+set_target_properties(win-capture PROPERTIES FOLDER "plugins/win-capture")
 
 install_obs_plugin_with_data(win-capture data)
 
diff --git a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt
index 558940711..f1a0b38d2 100644
--- a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt
+++ b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt
@@ -24,6 +24,8 @@ target_link_libraries(get-graphics-offsets
 	dxgi.lib
 	d3d11.lib)
 
+set_target_properties(get-graphics-offsets PROPERTIES FOLDER "plugins/win-capture")
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(_output_suffix "64")
 else()
diff --git a/plugins/win-capture/graphics-hook/CMakeLists.txt b/plugins/win-capture/graphics-hook/CMakeLists.txt
index 4141861f8..f78f1c610 100644
--- a/plugins/win-capture/graphics-hook/CMakeLists.txt
+++ b/plugins/win-capture/graphics-hook/CMakeLists.txt
@@ -63,6 +63,7 @@ endif()
 
 set_target_properties(graphics-hook
 	PROPERTIES
+		FOLDER "plugins/win-capture"
 		OUTPUT_NAME "graphics-hook${_output_suffix}")
 
 if (VULKAN_FOUND)
diff --git a/plugins/win-capture/inject-helper/CMakeLists.txt b/plugins/win-capture/inject-helper/CMakeLists.txt
index 5213e177a..353216751 100644
--- a/plugins/win-capture/inject-helper/CMakeLists.txt
+++ b/plugins/win-capture/inject-helper/CMakeLists.txt
@@ -26,6 +26,7 @@ endif()
 
 set_target_properties(inject-helper
 	PROPERTIES
+		FOLDER "plugins/win-capture"
 		OUTPUT_NAME "inject-helper${_output_suffix}")
 
 install_obs_datatarget(inject-helper "obs-plugins/win-capture")
diff --git a/plugins/win-dshow/CMakeLists.txt b/plugins/win-dshow/CMakeLists.txt
index dff50b49e..355dba7d5 100644
--- a/plugins/win-dshow/CMakeLists.txt
+++ b/plugins/win-dshow/CMakeLists.txt
@@ -62,5 +62,6 @@ target_link_libraries(win-dshow
 	ksuser
 	wmcodecdspuuid
 	${FFMPEG_LIBRARIES})
+set_target_properties(win-dshow PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(win-dshow data)
diff --git a/plugins/win-mf/CMakeLists.txt b/plugins/win-mf/CMakeLists.txt
index 2b3f0099e..bffb0f03b 100644
--- a/plugins/win-mf/CMakeLists.txt
+++ b/plugins/win-mf/CMakeLists.txt
@@ -55,6 +55,8 @@ target_include_directories(win-mf
 	PUBLIC
 	"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
 
+set_target_properties(win-mf PROPERTIES FOLDER "plugins")
+
 if(ENABLE_WINMF)
 	install_obs_plugin_with_data(win-mf data)
 else()
diff --git a/plugins/win-wasapi/CMakeLists.txt b/plugins/win-wasapi/CMakeLists.txt
index 44f9c2adc..387efb608 100644
--- a/plugins/win-wasapi/CMakeLists.txt
+++ b/plugins/win-wasapi/CMakeLists.txt
@@ -16,5 +16,6 @@ add_library(win-wasapi MODULE
 	${win-wasapi_HEADERS})
 target_link_libraries(win-wasapi
 	libobs)
+set_target_properties(win-wasapi PROPERTIES FOLDER "plugins")
 
 install_obs_plugin_with_data(win-wasapi data)
diff --git a/test/osx/CMakeLists.txt b/test/osx/CMakeLists.txt
index 6cf3546f4..862acdc5e 100644
--- a/test/osx/CMakeLists.txt
+++ b/test/osx/CMakeLists.txt
@@ -12,6 +12,7 @@ set(osx-test_SOURCES
 
 add_executable(osx_test
 	${osx-test_SOURCES})
+set_target_properties(osx_test PROPERTIES FOLDER "tests and examples")
 target_link_libraries(osx_test
 	libobs
 	${COCOA})
diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt
index 31e26aee6..4de030ff8 100644
--- a/test/test-input/CMakeLists.txt
+++ b/test/test-input/CMakeLists.txt
@@ -24,5 +24,6 @@ add_library(test-input MODULE
 target_link_libraries(test-input
 	${test-input_PLATFORM_DEPS}
 	libobs)
+set_target_properties(test-input PROPERTIES FOLDER "tests and examples")
 
 install_obs_plugin_with_data(test-input data)
diff --git a/test/win/CMakeLists.txt b/test/win/CMakeLists.txt
index fd1ba9541..fd7f6c324 100644
--- a/test/win/CMakeLists.txt
+++ b/test/win/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(win-test WIN32
 	${win-text_SOURCES})
 target_link_libraries(win-test
 	libobs)
+set_target_properties(win-test PROPERTIES FOLDER "tests and examples")
 define_graphic_modules(win-test)