diff --git a/CMakeLists.txt b/CMakeLists.txt
index fea59cb..3c06cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,9 @@ add_executable(${CMAKE_PROJECT_NAME} ${SOURCE_FILES})
 # Perform pre-build operations.
 add_custom_target(GENERATE_UI_HEADERS
 	COMMAND ${CMAKE_SOURCE_DIR}/tools/prebuild.sh "${CMAKE_SOURCE_DIR}"
+	BYPRODUCTS
+		${CMAKE_SOURCE_DIR}/thirdparty/scintilla/bin/scintilla.a
+		${CMAKE_SOURCE_DIR}/thirdparty/lexilla/bin/liblexilla.a
 )
 add_dependencies(${CMAKE_PROJECT_NAME} GENERATE_UI_HEADERS)
 
diff --git a/buildDeps.sh b/buildDeps.sh
deleted file mode 100644
index 2a36bd1..0000000
--- a/buildDeps.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-pushd thirdparty
-
-	# Scintilla
-	[[ -d scintilla ]] && rm -rf scintilla
-	tar xzf scintilla531.tgz
-	pushd scintilla/gtk
-		GTK3=1 make
-	popd
-
-	# Lexilla
-	[[ -d lexilla ]] && rm -rf lexilla
-	tar xzf lexilla520.tgz
-	pushd lexilla/src
-		make
-	popd
-	
-popd
diff --git a/buildFlatpak.sh b/buildFlatpak.sh
index 7a2b5ab..b3d3a3b 100755
--- a/buildFlatpak.sh
+++ b/buildFlatpak.sh
@@ -1,11 +1,41 @@
 #!/bin/bash
 
+#
+#  JoeyDev
+#  Copyright (C) 2018-2023 Scott Duensing <scott@kangaroopunch.com>
+#
+#  This software is provided 'as-is', without any express or implied
+#  warranty.  In no event will the authors be held liable for any damages
+#  arising from the use of this software.
+#
+#  Permission is granted to anyone to use this software for any purpose,
+#  including commercial applications, and to alter it and redistribute it
+#  freely, subject to the following restrictions:
+#
+#  1. The origin of this software must not be misrepresented; you must not
+#     claim that you wrote the original software. If you use this software
+#     in a product, an acknowledgment in the product documentation would be
+#     appreciated but is not required.
+#  2. Altered source versions must be plainly marked as such, and must not be
+#     misrepresented as being the original software.
+#  3. This notice may not be removed or altered from any source distribution.
+#
+
+
+function clearWorkDirs() {
+  [[ -d .flatpak-builder ]] && rm -rf .flatpak-builder
+  [[ -d flatpak-build ]]    && rm -rf flatpak-build
+  [[ -d flatpak-repo ]]     && rm -rf flatpak-repo
+}
+
+
 flatpak install flathub org.freedesktop.Platform//22.08 org.freedesktop.Sdk//22.08
 
-[[ -d .flatpak-builder ]] && rm -rf .flatpak-builder
-[[ -d flatpak-build ]]    && rm -rf flatpak-build
-[[ -d flatpak-repo ]]     && rm -rf flatpak-repo
-[[ -f joeydev.flatpak ]]  && rm -f  joeydev.flatpak
+clearWorkDirs
+[[ -f joeydev.flatpak ]] && rm -f  joeydev.flatpak
 
-flatpak-builder -v --user --keep-build-dirs --gpg-sign=336B3B1987C3D17F --repo=flatpak-repo --install flatpak-build com.kangaroopunch.JoeyDev.yaml
+# -v --keep-build-dirs
+flatpak-builder --user --gpg-sign=336B3B1987C3D17F --repo=flatpak-repo --install flatpak-build com.kangaroopunch.JoeyDev.yaml
 flatpak build-bundle flatpak-repo joeydev.flatpak com.kangaroopunch.JoeyDev --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+
+[[ -f joeydev.flatpak ]] && clearWorkDirs
diff --git a/com.kangaroopunch.JoeyDev.yaml b/com.kangaroopunch.JoeyDev.yaml
index 09ef9a7..ad1d146 100644
--- a/com.kangaroopunch.JoeyDev.yaml
+++ b/com.kangaroopunch.JoeyDev.yaml
@@ -11,8 +11,7 @@ modules:
 
     buildsystem: simple
     build-commands:
-      - tools/prebuild.sh $(pwd)
-      - cmake -DDEBUG_OUTPUT=OFF -G Ninja
+      - cmake -DDEBUG_OUTPUT=OFF -G Ninja -S . -B .
       - ninja
       - install -D joeydev /app/bin/joeydev
       - install -Dm755 com.kangaroopunch.JoeyDev.desktop -t /app/share/applications
diff --git a/tools/prebuild.sh b/tools/prebuild.sh
index 23f4a8f..21d8530 100755
--- a/tools/prebuild.sh
+++ b/tools/prebuild.sh
@@ -27,7 +27,7 @@ ROOT=$1
 
 pushd "${ROOT}" || exit &> /dev/null
 
-  if [[ ! -d thirdparty/scintilla ]]; then
+  if [[ ! -f thirdparty/scintilla/bin/scintilla.a ]]; then
   	pushd thirdparty || exit &> /dev/null
       echo Building Dependency:  Scintilla...
       tar xzf scintilla531.tgz
@@ -37,7 +37,7 @@ pushd "${ROOT}" || exit &> /dev/null
     popd || true &> /dev/null
   fi
 
-  if [[ ! -d thirdparty/lexilla ]]; then
+  if [[ ! -f thirdparty/lexilla/bin/liblexilla.a ]]; then
   	pushd thirdparty || exit &> /dev/null
       echo Building Dependency:  Lexilla...
       tar xzf lexilla520.tgz