diff --git a/Brewfile b/Brewfile
index 7bdddeefa..913b0fb58 100644
--- a/Brewfile
+++ b/Brewfile
@@ -5,3 +5,4 @@ brew 'ccache'
 brew 'python3'
 brew 'imagemagick'
 brew 'p7zip'
+brew 'create-dmg'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 867248b4e..4f6346836 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,11 @@
 # vim: ts=4:sw=4:noexpandtab
 
 if(APPLE AND NOT IOS)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum osx version")
+if(OSX15)
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum osx version")
+	else()
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum osx version")
+	endif()
 endif()
 
 cmake_policy(SET CMP0071 NEW)
diff --git a/aseba/launcher/src/qml/webview_native.qml b/aseba/launcher/src/qml/webview_native.qml
index c78241247..2d1f56889 100644
--- a/aseba/launcher/src/qml/webview_native.qml
+++ b/aseba/launcher/src/qml/webview_native.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import QtWebView 1.1
+import QtWebView 1.12
 import QtQuick.Window 2.12
 Window {
     id: window
diff --git a/aseba/thymio-device-manager/CMakeLists.txt b/aseba/thymio-device-manager/CMakeLists.txt
index 107e1c238..3a7c71c04 100644
--- a/aseba/thymio-device-manager/CMakeLists.txt
+++ b/aseba/thymio-device-manager/CMakeLists.txt
@@ -1,4 +1,7 @@
 set(CMAKE_CXX_STANDARD 17)
+if(APPLE)
+	set(OPENSSL_USE_STATIC_LIBS TRUE)
+endif()
 find_package(OpenSSL REQUIRED)
 
 add_library(thymio-device-manager-lib STATIC
@@ -131,7 +134,7 @@ target_link_libraries(thymio-device-manager-lib PUBLIC
 if(APPLE)
     find_library(CoreFoundation CoreFoundation)
     find_library(IOKit IOKit)
-    target_link_libraries(thymio-device-manager-lib PUBLIC ${CoreFoundation} ${IOKit})
+    target_link_libraries(thymio-device-manager-lib PUBLIC ${CoreFoundation} ${IOKit} ${OpenSSL})
 endif()
 
 if(WIN32)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ebb035a91..17b9d9595 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -273,7 +273,7 @@ jobs:
       
 - job: BuildOnOsX
   pool:
-    vmImage: 'macOS-10.14'
+    vmImage: 'macOS-10.15'
   steps:
   - task: NodeTool@0
     inputs:
@@ -315,8 +315,8 @@ jobs:
     displayName: 'Clone submodules'
     
   - script: |
-      sudo xcode-select -s /Applications/Xcode_11.3.1.app/Contents/Developer
-      (mkdir build && cd build &&  cmake .. -GNinja -DBoost_DEBUG=OFF -DOPENSSL_LIBRARIES=/usr/local/Cellar/openssl@1.0.2t/1.0.2t/lib -DOPENSSL_INCLUDE_DIR=/usr/local/Cellar/openssl@1.0.2t/1.0.2t/include -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DQt5Core_DIR="`pwd`/../Qt/5.15.2/clang_64/lib/cmake/Qt5Core" -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/clang_64/" && ninja)
+      sudo xcode-select -s /Applications/Xcode_11.4.1.app/Contents/Developer
+      (mkdir build && cd build &&  cmake .. -GNinja -DBoost_DEBUG=OFF -DOPENSSL_ROOT_DIR=/usr/local/Cellar/openssl@1.0.2t/1.0.2t/ -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DQt5Core_DIR="`pwd`/../Qt/5.15.2/clang_64/lib/cmake/Qt5Core" -DCMAKE_PREFIX_PATH="`pwd`/../Qt/5.15.2/clang_64/" && ninja)
     displayName: 'Build with cmake'
 
   - script: |
diff --git a/osx/createbundle.sh b/osx/createbundle.sh
index 6a4a13488..a26514dae 100755
--- a/osx/createbundle.sh
+++ b/osx/createbundle.sh
@@ -168,12 +168,12 @@ sign --options=runtime $(realpath "$MAIN_DIR/thymio-launcher")
 
 if [ -n "$DMG" ]; then
     test -f "$1" && rm "$DMG"
-    "$DIR/dmg/create-dmg" \
+    create-dmg \
     --volname "Thymio Suite" \
     --volicon "$DIR/../menu/osx/launcher.icns" \
     --background "$DIR/background.png" \
     --window-pos 200 120 \
-    --window-size 620 470 \
+    --window-size 640 480 \
     --icon-size 100 \
     --icon "ThymioSuite.app" 100 300 \
     --hide-extension "ThymioSuite.app" \
diff --git a/osx/dmg/.gitignore b/osx/dmg/.gitignore
deleted file mode 100644
index e6cf196da..000000000
--- a/osx/dmg/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.svn
-
-*.dmg
-.DS_Store
diff --git a/osx/dmg/LICENSE b/osx/dmg/LICENSE
deleted file mode 100644
index 349b6d82b..000000000
--- a/osx/dmg/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2008-2014 Andrey Tarantsov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/osx/dmg/README.md b/osx/dmg/README.md
deleted file mode 100644
index fb12e3070..000000000
--- a/osx/dmg/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-create-dmg
-==========
-
-A shell script to build fancy DMGs.
-
-
-Status and contribution policy
-------------------------------
-
-This project is maintained thanks to the contributors who send pull requests, and now (Sep 2018) with the help of [@aonez](https://github.com/aonez).
-
-We will merge any pull request that adds something useful and does not break existing things, and will often grant commit access to the repository.
-
-If you're an active user and want to be a maintainer, or just want to chat, please ping us at [gitter.im/create-dmg/Lobby](https://gitter.im/create-dmg/Lobby).
-
-
-Installation
-------------
-
-- You can install this script using [Homebrew](https://brew.sh):
-
-  ```sh
-  brew install create-dmg
-  ```
-
-- You can download the [latest release](https://github.com/andreyvit/create-dmg/releases/latest)
-
-- You can also clone the entire repository:
-
-  ```sh
-  git clone https://github.com/andreyvit/create-dmg.git
-  ```
-
-Usage
------
-
-```sh
-create-dmg [options...] [output\_name.dmg] [source\_folder]
-```
-
-All contents of source\_folder will be copied into the disk image.
-
-**Options:**
-
-*   **--volname [name]:** set volume name (displayed in the Finder sidebar and window title)
-*   **--volicon [icon.icns]:** set volume icon
-*   **--background [pic.png]:** set folder background image (provide png, gif, jpg)
-*   **--window-pos [x y]:** set position the folder window
-*   **--window-size [width height]:** set size of the folder window
-*   **--text-size [text size]:** set window text size (10-16)
-*   **--icon-size [icon size]:** set window icons size (up to 128)
-*   **--icon [file name] [x y]:** set position of the file's icon
-*   **--hide-extension [file name]:** hide the extension of file
-*   **--custom-icon [file name]/[custom icon]/[sample file] [x y]:** set position and custom icon
-*   **--app-drop-link [x y]:** make a drop link to Applications, at location x, y
-*   **--ql-drop-link [x y]:** make a drop link to /Library/QuickLook, at location x, y
-*   **--eula [eula file]:** attach a license file to the dmg
-*   **--no-internet-enable:** disable automatic mount&copy
-*   **--format:** specify the final image format (default is UDZO)
-*   **--add-file [target name] [path to source file] [x y]:** add additional file (option can be used multiple times)
-*   **--add-folder [target name] [path to source folder] [x y]:** add additional folder (option can be used multiple times)
-*   **--disk-image-size [x]:** set the disk image size manually to x MB
-*   **--hdiutil-verbose:** execute hdiutil in verbose mode
-*   **--hdiutil-quiet:** execute hdiutil in quiet mode
-*   **--sandbox-safe:** execute hdiutil with sandbox compatibility and don not bless
-*   **--version:** show tool version number
-*   **-h, --help:** display the help
-
-
-Example
--------
-
-```sh
-#!/bin/sh
-test -f Application-Installer.dmg && rm Application-Installer.dmg
-create-dmg \
---volname "Application Installer" \
---volicon "application\_icon.icns" \
---background "installer\_background.png" \
---window-pos 200 120 \
---window-size 800 400 \
---icon-size 100 \
---icon "Application.app" 200 190 \
---hide-extension "Application.app" \
---app-drop-link 600 185 \
-"Application-Installer.dmg" \
-"source_folder/"
-```
-
-Alternatives
-------------
-
-* [node-appdmg](https://github.com/LinusU/node-appdmg)
-* [dmgbuild](https://pypi.python.org/pypi/dmgbuild)
-* see the [StackOverflow question](http://stackoverflow.com/questions/96882/how-do-i-create-a-nice-looking-dmg-for-mac-os-x-using-command-line-tools)
diff --git a/osx/dmg/builder/create-dmg.builder b/osx/dmg/builder/create-dmg.builder
deleted file mode 100644
index d4285280f..000000000
--- a/osx/dmg/builder/create-dmg.builder
+++ /dev/null
@@ -1,26 +0,0 @@
-SET	app_name	create-dmg
-
-VERSION	create-dmg.cur	create-dmg	heads/master
-
-NEWDIR	build.dir	temp	%-build	-
-
-NEWFILE	create-dmg.zip	featured	%.zip	%
-
-
-COPYTO	[build.dir]
-	INTO	create-dmg	[create-dmg.cur]/create-dmg
-	INTO	sample	[create-dmg.cur]/sample
-	INTO	support	[create-dmg.cur]/support
-	
-SUBSTVARS	[build.dir<alter>]/create-dmg	[[]]
-
-
-ZIP	[create-dmg.zip]
-	INTO	[build-files-prefix]	[build.dir]
-
-
-PUT	megabox-builds	create-dmg.zip
-PUT	megabox-builds	build.log
-
-PUT	s3-builds	create-dmg.zip
-PUT	s3-builds	build.log
diff --git a/osx/dmg/create-dmg b/osx/dmg/create-dmg
deleted file mode 100755
index 20ac5ea07..000000000
--- a/osx/dmg/create-dmg
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/bin/bash
-
-# Create a read-only disk image of the contents of a folder
-
-set -e;
-
-function pure_version() {
-	echo '1.0.0.5'
-}
-
-function version() {
-	echo "create-dmg $(pure_version)"
-}
-
-function usage() {
-	version
-	echo "Creates a fancy DMG file."
-	echo "Usage:  $(basename $0) [options] <output_name.dmg> <source_folder>"
-	echo "All contents of source_folder will be copied into the disk image."
-	echo "Options:"
-	echo "  --volname name"
-	echo "      set volume name (displayed in the Finder sidebar and window title)"
-	echo "  --volicon icon.icns"
-	echo "      set volume icon"
-	echo "  --background pic.png"
-	echo "      set folder background image (provide png, gif, jpg)"
-	echo "  --window-pos x y"
-	echo "      set position the folder window"
-	echo "  --window-size width height"
-	echo "      set size of the folder window"
-	echo "  --text-size text_size"
-	echo "      set window text size (10-16)"
-	echo "  --icon-size icon_size"
-	echo "      set window icons size (up to 128)"
-	echo "  --icon file_name x y"
-	echo "      set position of the file's icon"
-	echo "  --hide-extension file_name"
-	echo "      hide the extension of file"
-	echo "  --custom-icon file_name custom_icon_or_sample_file x y"
-	echo "      set position and custom icon"
-	echo "  --app-drop-link x y"
-	echo "      make a drop link to Applications, at location x,y"
-	echo "  --ql-drop-link x y"
-	echo "      make a drop link to user QuickLook install dir, at location x,y"
-	echo "  --eula eula_file"
-	echo "      attach a license file to the dmg"
-	echo "  --no-internet-enable"
-	echo "      disable automatic mount&copy"
-	echo "  --format"
-	echo "      specify the final image format (default is UDZO)"
-	echo "  --add-file target_name path_to_source_file x y"
-	echo "      add additional file (option can be used multiple times)"
-	echo "  --add-folder target_name path_to_source_folder x y"
-	echo "      add additional folder (option can be used multiple times)"
-	echo "  --disk-image-size x"
-	echo "      set the disk image size manually to x MB"
-	echo "  --hdiutil-verbose"
-	echo "      execute hdiutil in verbose mode"
-	echo "  --hdiutil-quiet"
-	echo "      execute hdiutil in quiet mode"
-	echo "  --sandbox-safe"
-	echo "      execute hdiutil with sandbox compatibility and do not bless"
-	echo "  --version         show tool version number"
-	echo "  -h, --help        display this help"
-	exit 0
-}
-
-WINX=10
-WINY=60
-WINW=500
-WINH=350
-ICON_SIZE=128
-TEXT_SIZE=16
-FORMAT="UDZO"
-ADD_FILE_SOURCES=()
-ADD_FILE_TARGETS=()
-ADD_FOLDER_SOURCES=()
-ADD_FOLDER_TARGETS=()
-IMAGEKEY=""
-HDIUTIL_VERBOSITY=""
-SANDBOX_SAFE=0
-
-while test "${1:0:1}" = "-"; do
-	case $1 in
-	--volname)
-		VOLUME_NAME="$2"
-		shift; shift;;
-	--volicon)
-		VOLUME_ICON_FILE="$2"
-		shift; shift;;
-	--background)
-		BACKGROUND_FILE="$2"
-		BACKGROUND_FILE_NAME="$(basename $BACKGROUND_FILE)"
-		BACKGROUND_CLAUSE="set background picture of opts to file \".background:$BACKGROUND_FILE_NAME\""
-		REPOSITION_HIDDEN_FILES_CLAUSE="set position of every item to {theBottomRightX + 100, 100}"
-		shift; shift;;
-	--icon-size)
-		ICON_SIZE="$2"
-		shift; shift;;
-	--text-size)
-		TEXT_SIZE="$2"
-		shift; shift;;
-	--window-pos)
-		WINX=$2; WINY=$3
-		shift; shift; shift;;
-	--window-size)
-		WINW=$2; WINH=$3
-		shift; shift; shift;;
-	--icon)
-		POSITION_CLAUSE="${POSITION_CLAUSE}set position of item \"$2\" to {$3, $4}
-		"
-		shift; shift; shift; shift;;
-	--hide-extension)
-		HIDING_CLAUSE="${HIDING_CLAUSE}set the extension hidden of item \"$2\" to true
-		"
-		shift; shift;;
-	--custom-icon)
-		shift; shift; shift; shift; shift;;
-	-h | --help)
-		usage;;
-	--version)
-		version; exit 0;;
-	--pure-version)
-		pure_version; exit 0;;
-	--ql-drop-link)
-		QL_LINK=$2
-		QL_CLAUSE="set position of item \"QuickLook\" to {$2, $3}
-		"
-		shift; shift; shift;;
-	--app-drop-link)
-		APPLICATION_LINK=$2
-		APPLICATION_CLAUSE="set position of item \"Applications\" to {$2, $3}
-		"
-		shift; shift; shift;;
-	--eula)
-		EULA_RSRC=$2
-		shift; shift;;
-	--no-internet-enable)
-		NOINTERNET=1
-		shift;;
-	--format)
-		FORMAT="$2"
-		shift; shift;;
-	--add-file)
-		ADD_FILE_TARGETS+=("$2")
-		ADD_FILE_SOURCES+=("$3")
-		POSITION_CLAUSE="${POSITION_CLAUSE}
-		set position of item \"$2\" to {$4, $5}
-		"
-		shift; shift; shift; shift; shift;;
-	--add-folder)
-		ADD_FOLDER_TARGETS+=("$2")
-		ADD_FOLDER_SOURCES+=("$3")
-		POSITION_CLAUSE="${POSITION_CLAUSE}
-		set position of item \"$2\" to {$4, $5}
-		"
-		shift; shift; shift; shift; shift;;
-	--disk-image-size)
-		DISK_IMAGE_SIZE="$2"
-		shift; shift;;
-	--hdiutil-verbose)
-		HDIUTIL_VERBOSITY='-verbose'
-		shift;;
-	--hdiutil-quiet)
-		HDIUTIL_VERBOSITY='-quiet'
-		shift;;
-	--sandbox-safe)
-		SANDBOX_SAFE=1
-		shift;;
-	-*)
-		echo "Unknown option $1. Run with --help for help."
-		exit 1;;
-	esac
-	case $FORMAT in
-	UDZO)
-		IMAGEKEY="-imagekey zlib-level=9";;
-	UDBZ)
-		IMAGEKEY="-imagekey bzip2-level=9";;
-	esac
-done
-
-test -z "$2" && {
-	echo "Not enough arguments. Invoke with --help for help."
-	exit 1
-}
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DMG_PATH="$1"
-DMG_DIRNAME="$(dirname "$DMG_PATH")"
-DMG_DIR="$(cd "$DMG_DIRNAME" > /dev/null; pwd)"
-DMG_NAME="$(basename "$DMG_PATH")"
-DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
-SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
-
-test -z "$VOLUME_NAME" && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
-
-# brew formula will set this as 1 and embed the support scripts
-BREW_INSTALL=0
-
-AUX_PATH="$SCRIPT_DIR/support"
-
-if [ $BREW_INSTALL -eq 0 ]; then
-	test -d "$AUX_PATH" || {
-		echo "Cannot find support directory: $AUX_PATH"
-		exit 1
-	}
-fi
-
-if [ -f "$SRC_FOLDER/.DS_Store" ]; then
-	echo "Deleting any .DS_Store in source folder"
-	rm "$SRC_FOLDER/.DS_Store"
-fi
-
-# Create the image
-echo "Creating disk image..."
-test -f "${DMG_TEMP_NAME}" && rm -f "${DMG_TEMP_NAME}"
-
-# Using Megabytes since hdiutil fails with very large Byte numbers
-function blocks_to_megabytes() {
-	# Add 1 extra MB, since there's no decimal retention here
-	MB_SIZE=$((($1 * 512 / 1000 / 1000) + 1))
-	echo $MB_SIZE
-}
-
-function get_size() {
-	# Get block size in disk
-	bytes_size=`du -s "$1" | sed -e 's/	.*//g'`
-	echo `blocks_to_megabytes $bytes_size`
-}
-
-# Create the DMG with the specified size or the hdiutil estimation
-CUSTOM_SIZE=''
-if ! test -z "$DISK_IMAGE_SIZE"; then
-	CUSTOM_SIZE="-size ${DISK_IMAGE_SIZE}m"
-fi
-
-if [ $SANDBOX_SAFE -eq 0 ]; then
-	hdiutil create ${HDIUTIL_VERBOSITY} -srcfolder "$SRC_FOLDER" -volname "${VOLUME_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW ${CUSTOM_SIZE} "${DMG_TEMP_NAME}"
-else
-	hdiutil makehybrid ${HDIUTIL_VERBOSITY} -default-volume-name "${VOLUME_NAME}" -hfs -o "${DMG_TEMP_NAME}" "$SRC_FOLDER"
-	hdiutil convert -format UDRW -ov -o "${DMG_TEMP_NAME}" "${DMG_TEMP_NAME}"
-	DISK_IMAGE_SIZE_CUSTOM=$DISK_IMAGE_SIZE
-fi
-
-# Get the created DMG actual size
-DISK_IMAGE_SIZE=`get_size "${DMG_TEMP_NAME}"`
-
-# Use the custom size if bigger
-if [ $SANDBOX_SAFE -eq 1 ] && [ $DISK_IMAGE_SIZE_CUSTOM -gt $DISK_IMAGE_SIZE ]; then
-	DISK_IMAGE_SIZE=$DISK_IMAGE_SIZE_CUSTOM
-fi
-
-# Estimate the additional soruces size
-if ! test -z "$ADD_FILE_SOURCES"; then
-	for i in "${!ADD_FILE_SOURCES[@]}"
-	do
-		SOURCE_SIZE=`get_size "${ADD_FILE_SOURCES[$i]}"`
-		DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + $SOURCE_SIZE)
-	done
-fi
-if ! test -z "$ADD_FOLDER_SOURCES"; then
-	for i in "${!ADD_FOLDER_SOURCES[@]}"
-	do
-		SOURCE_SIZE=`get_size "${ADD_FOLDER_SOURCES[$i]}"`
-		DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + $SOURCE_SIZE)
-	done
-fi
-
-# Add extra space for additional resources
-DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + 20)
-
-# Resize the image for the extra stuff
-#hdiutil resize ${HDIUTIL_VERBOSITY} -size ${DISK_IMAGE_SIZE}m "${DMG_TEMP_NAME}"
-
-# mount it
-echo "Mounting disk image..."
-MOUNT_DIR="/Volumes/${VOLUME_NAME}"
-
-# try unmount dmg if it was mounted previously (e.g. developer mounted dmg, installed app and forgot to unmount it)
-echo "Unmounting disk image..."
-DEV_NAME=$(hdiutil info | egrep --color=never '^/dev/' | sed 1q | awk '{print $1}')
-test -d "${MOUNT_DIR}" && hdiutil detach "${DEV_NAME}"
-
-echo "Mount directory: $MOUNT_DIR"
-DEV_NAME=$(hdiutil attach -readwrite -noverify -noautoopen "${DMG_TEMP_NAME}" | egrep --color=never '^/dev/' | sed 1q | awk '{print $1}')
-echo "Device name:     $DEV_NAME"
-
-if ! test -z "$BACKGROUND_FILE"; then
-	echo "Copying background file..."
-	test -d "$MOUNT_DIR/.background" || mkdir "$MOUNT_DIR/.background"
-	cp "$BACKGROUND_FILE" "$MOUNT_DIR/.background/$BACKGROUND_FILE_NAME"
-fi
-
-if ! test -z "$APPLICATION_LINK"; then
-	echo "making link to Applications dir"
-	echo $MOUNT_DIR
-	ln -s /Applications "$MOUNT_DIR/Applications"
-fi
-
-if ! test -z "$QL_LINK"; then
-	echo "making link to QuickLook install dir"
-	echo $MOUNT_DIR
-	ln -s "/Library/QuickLook" "$MOUNT_DIR/QuickLook"
-fi
-
-if ! test -z "$VOLUME_ICON_FILE"; then
-	echo "Copying volume icon file '$VOLUME_ICON_FILE'..."
-	cp "$VOLUME_ICON_FILE" "$MOUNT_DIR/.VolumeIcon.icns"
-	SetFile -c icnC "$MOUNT_DIR/.VolumeIcon.icns"
-fi
-
-if ! test -z "$ADD_FILE_SOURCES"; then
-	echo "Copying custom files..."
-	for i in "${!ADD_FILE_SOURCES[@]}"
-	do
-		echo "${ADD_FILE_SOURCES[$i]}"
-		cp -a "${ADD_FILE_SOURCES[$i]}" "$MOUNT_DIR/${ADD_FILE_TARGETS[$i]}"
-	done
-fi
-
-if ! test -z "$ADD_FOLDER_SOURCES"; then
-	echo "Copying custom folders..."
-	for i in "${!ADD_FOLDER_SOURCES[@]}"
-	do
-		echo "${ADD_FOLDER_SOURCES[$i]}"
-		cp -a "${ADD_FOLDER_SOURCES[$i]}" "$MOUNT_DIR/${ADD_FOLDER_TARGETS[$i]}"
-	done
-fi
-
-# run applescript
-APPLESCRIPT=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
-
-function applescript_source() {
-	if [ $BREW_INSTALL -eq 0 ]; then
-		cat "$AUX_PATH/template.applescript"
-	else
-		cat << 'EOS'
-		# BREW_INLINE_APPLESCRIPT_PLACEHOLDER
-EOS
-	fi
-}
-
-applescript_source | sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" -e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" -e "s/REPOSITION_HIDDEN_FILES_CLAUSE/$REPOSITION_HIDDEN_FILES_CLAUSE/g" -e "s/ICON_SIZE/$ICON_SIZE/g" -e "s/TEXT_SIZE/$TEXT_SIZE/g" | perl -pe  "s/POSITION_CLAUSE/$POSITION_CLAUSE/g" | perl -pe "s/QL_CLAUSE/$QL_CLAUSE/g" | perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" | perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" >"$APPLESCRIPT"
-sleep 2 # pause to workaround occasional "Can’t get disk" (-1728) issues
-echo "Running Applescript: /usr/bin/osascript \"${APPLESCRIPT}\" \"${VOLUME_NAME}\""
-"/usr/bin/osascript" "${APPLESCRIPT}" "${VOLUME_NAME}" || true
-echo "Done running the applescript..."
-sleep 4
-
-rm "$APPLESCRIPT"
-
-# make sure it's not world writeable
-echo "Fixing permissions..."
-chmod -Rf go-w "${MOUNT_DIR}" &> /dev/null || true
-echo "Done fixing permissions."
-
-# make the top window open itself on mount:
-if [ $SANDBOX_SAFE -eq 0 ]; then
-	echo "Blessing started"
-	bless --folder "${MOUNT_DIR}" --openfolder "${MOUNT_DIR}"
-	echo "Blessing finished"
-else
-	echo "Skipping blessing on sandbox"
-fi
-
-if ! test -z "$VOLUME_ICON_FILE"; then
-	# tell the volume that it has a special file attribute
-	SetFile -a C "$MOUNT_DIR"
-fi
-
-# unmount
-echo "Unmounting disk image..."
-hdiutil detach "${DEV_NAME}"
-
-# compress image
-echo "Compressing disk image..."
-hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format ${FORMAT} ${IMAGEKEY} -o "${DMG_DIR}/${DMG_NAME}"
-rm -f "${DMG_TEMP_NAME}"
-
-# adding EULA resources
-if [ ! -z "${EULA_RSRC}" -a "${EULA_RSRC}" != "-null-" ]; then
-	echo "adding EULA resources"
-
-	if [ $BREW_INSTALL -eq 0 ]; then
-		"${AUX_PATH}/dmg-license.py" "${DMG_DIR}/${DMG_NAME}" "${EULA_RSRC}"
-	else
-		python - "${DMG_DIR}/${DMG_NAME}" "${EULA_RSRC}" << 'EOS'
-		# BREW_INLINE_LICENSE_PLACEHOLDER
-EOS
-	fi
-fi
-
-if [ ! -z "${NOINTERNET}" -a "${NOINTERNET}" == 1 ]; then
-	echo "not setting 'internet-enable' on the dmg"
-else
-	hdiutil internet-enable -yes "${DMG_DIR}/${DMG_NAME}"
-fi
-
-echo "Disk image done"
-exit 0
diff --git a/osx/dmg/sample b/osx/dmg/sample
deleted file mode 100755
index 9b2e949e2..000000000
--- a/osx/dmg/sample
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Since create-dmg does not override, be sure to delete previous DMG
-test -f Application-Installer.dmg && rm Application-Installer.dmg
-
-# Create the DMG
-./create-dmg \
---volname "Application Installer" \
---volicon "application\_icon.icns" \
---background "installer\_background.png" \
---window-pos 200 120 \
---window-size 800 400 \
---icon-size 100 \
---icon "Application.app" 200 190 \
---hide-extension "Application.app" \
---app-drop-link 600 185 \
-"Application-Installer.dmg" \
-"source_folder/"
\ No newline at end of file
diff --git a/osx/dmg/support/brew-me.sh b/osx/dmg/support/brew-me.sh
deleted file mode 100755
index dfc247108..000000000
--- a/osx/dmg/support/brew-me.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Bundle support scripts to main script
-
-cd "${0%/*}"
-
-script='../create-dmg'
-script_brew='../create-dmg-brew'
-applescript='template.applescript'
-licensescript='dmg-license.py'
-
-asl=$(awk "/BREW_INLINE_APPLESCRIPT_PLACEHOLDER/{ print NR; exit }" "$script")
-sed -n 1,$(( asl - 1 ))p "$script" | sed -e 's/BREW_INSTALL=0/BREW_INSTALL=1/g' > "$script_brew"
-cat "$applescript" >> "$script_brew"
-lsl=$(awk "/BREW_INLINE_LICENSE_PLACEHOLDER/{ print NR; exit }" "$script")
-sed -n $(( asl + 1 )),$(( lsl - 1 ))p "$script" >> "$script_brew"
-cat "$licensescript" | sed '1d' >> "$script_brew"
-sed -n $(( lsl + 1 )),\$p "$script" >> "$script_brew"
-
-mv "$script_brew" "$script"
-chmod +x "$script"
diff --git a/osx/dmg/support/dmg-license.py b/osx/dmg/support/dmg-license.py
deleted file mode 100755
index edf04ee6b..000000000
--- a/osx/dmg/support/dmg-license.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env python
-"""
-This script adds a license file to a DMG. Requires Xcode and a plain ascii text
-license file.
-Obviously only runs on a Mac.
-
-Copyright (C) 2011-2013 Jared Hobbs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-"""
-from __future__ import print_function
-import os
-import sys
-import tempfile
-import optparse
-
-
-class Path(str):
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type, value, traceback):
-        os.unlink(self)
-
-
-def mktemp(dir=None, suffix=''):
-    (fd, filename) = tempfile.mkstemp(dir=dir, suffix=suffix)
-    os.close(fd)
-    return Path(filename)
-
-
-def main(options, args):
-    dmgFile, license = args
-    with mktemp('.') as tmpFile:
-        with open(tmpFile, 'w') as f:
-            f.write("""data 'TMPL' (128, "LPic") {
-        $"1344 6566 6175 6C74 204C 616E 6775 6167"
-        $"6520 4944 4457 5244 0543 6F75 6E74 4F43"
-        $"4E54 042A 2A2A 2A4C 5354 430B 7379 7320"
-        $"6C61 6E67 2049 4444 5752 441E 6C6F 6361"
-        $"6C20 7265 7320 4944 2028 6F66 6673 6574"
-        $"2066 726F 6D20 3530 3030 4457 5244 1032"
-        $"2D62 7974 6520 6C61 6E67 7561 6765 3F44"
-        $"5752 4404 2A2A 2A2A 4C53 5445"
-};
-
-data 'LPic' (5000) {
-        $"0000 0002 0000 0000 0000 0000 0004 0000"
-};
-
-data 'STR#' (5000, "English buttons") {
-        $"0006 0D45 6E67 6C69 7368 2074 6573 7431"
-        $"0541 6772 6565 0844 6973 6167 7265 6505"
-        $"5072 696E 7407 5361 7665 2E2E 2E7A 4966"
-        $"2079 6F75 2061 6772 6565 2077 6974 6820"
-        $"7468 6520 7465 726D 7320 6F66 2074 6869"
-        $"7320 6C69 6365 6E73 652C 2063 6C69 636B"
-        $"2022 4167 7265 6522 2074 6F20 6163 6365"
-        $"7373 2074 6865 2073 6F66 7477 6172 652E"
-        $"2020 4966 2079 6F75 2064 6F20 6E6F 7420"
-        $"6167 7265 652C 2070 7265 7373 2022 4469"
-        $"7361 6772 6565 2E22"
-};
-
-data 'STR#' (5002, "English") {
-        $"0006 0745 6E67 6C69 7368 0541 6772 6565"
-        $"0844 6973 6167 7265 6505 5072 696E 7407"
-        $"5361 7665 2E2E 2E7B 4966 2079 6F75 2061"
-        $"6772 6565 2077 6974 6820 7468 6520 7465"
-        $"726D 7320 6F66 2074 6869 7320 6C69 6365"
-        $"6E73 652C 2070 7265 7373 2022 4167 7265"
-        $"6522 2074 6F20 696E 7374 616C 6C20 7468"
-        $"6520 736F 6674 7761 7265 2E20 2049 6620"
-        $"796F 7520 646F 206E 6F74 2061 6772 6565"
-        $"2C20 7072 6573 7320 2244 6973 6167 7265"
-        $"6522 2E"
-};\n\n""")
-            with open(license, 'r') as l:
-                kind = 'RTF ' if license.lower().endswith('.rtf') else 'TEXT'
-                f.write('data \'%s\' (5000, "English") {\n' % kind)
-                def escape(s):
-                    return s.strip().replace('\\', '\\\\').replace('"', '\\"').replace('\0', '')
-
-                for line in l:
-                    line = escape(line)
-                    for liner in [line[i:i+1000] for i in range(0, len(line), 1000)]:
-                        f.write('    "' + liner + '"\n')
-                    f.write('    "' + '\\n"\n')
-                f.write('};\n\n')
-            f.write("""data 'styl' (5000, "English") {
-        $"0003 0000 0000 000C 0009 0014 0000 0000"
-        $"0000 0000 0000 0000 0027 000C 0009 0014"
-        $"0100 0000 0000 0000 0000 0000 002A 000C"
-        $"0009 0014 0000 0000 0000 0000 0000"
-};\n""")
-        os.system('hdiutil unflatten -quiet "%s"' % dmgFile)
-        ret = os.system('%s -a %s -o "%s"' %
-                        (options.rez, tmpFile, dmgFile))
-        os.system('hdiutil flatten -quiet "%s"' % dmgFile)
-        if options.compression is not None:
-            os.system('cp %s %s.temp.dmg' % (dmgFile, dmgFile))
-            os.remove(dmgFile)
-            if options.compression == "bz2":
-                os.system('hdiutil convert %s.temp.dmg -format UDBZ -o %s' %
-                          (dmgFile, dmgFile))
-            elif options.compression == "gz":
-                os.system('hdiutil convert %s.temp.dmg -format ' % dmgFile +
-                          'UDZO -imagekey zlib-devel=9 -o %s' % dmgFile)
-            os.remove('%s.temp.dmg' % dmgFile)
-    if ret == 0:
-        print("Successfully added license to '%s'" % dmgFile)
-    else:
-        print("Failed to add license to '%s'" % dmgFile)
-
-if __name__ == '__main__':
-    parser = optparse.OptionParser()
-    parser.set_usage("""%prog <dmgFile> <licenseFile> [OPTIONS]
-  This program adds a software license agreement to a DMG file.
-  It requires Xcode and either a plain ascii text <licenseFile>
-  or a <licenseFile.rtf> with the RTF contents.
-
-  See --help for more details.""")
-    parser.add_option(
-        '--rez',
-        '-r',
-        action='store',
-        default='/Applications/Xcode.app/Contents/Developer/Tools/Rez',
-        help='The path to the Rez tool. Defaults to %default'
-    )
-    parser.add_option(
-        '--compression',
-        '-c',
-        action='store',
-        choices=['bz2', 'gz'],
-        default=None,
-        help='Optionally compress dmg using specified compression type. '
-             'Choices are bz2 and gz.'
-    )
-    options, args = parser.parse_args()
-    cond = len(args) != 2
-    if not os.path.exists(options.rez):
-        print('Failed to find Rez at "%s"!\n' % options.rez)
-        cond = True
-    if cond:
-        parser.print_usage()
-        sys.exit(1)
-    main(options, args)
diff --git a/osx/dmg/support/template.applescript b/osx/dmg/support/template.applescript
deleted file mode 100644
index fee634d31..000000000
--- a/osx/dmg/support/template.applescript
+++ /dev/null
@@ -1,74 +0,0 @@
-on run (volumeName)
-	tell application "Finder"
-		tell disk (volumeName as string)
-			open
-
-			set theXOrigin to WINX
-			set theYOrigin to WINY
-			set theWidth to WINW
-			set theHeight to WINH
-
-			set theBottomRightX to (theXOrigin + theWidth)
-			set theBottomRightY to (theYOrigin + theHeight)
-			set dsStore to "\"" & "/Volumes/" & volumeName & "/" & ".DS_STORE\""
-
-			tell container window
-				set current view to icon view
-				set toolbar visible to false
-				set statusbar visible to false
-				set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-				set statusbar visible to false
-				REPOSITION_HIDDEN_FILES_CLAUSE
-			end tell
-
-			set opts to the icon view options of container window
-			tell opts
-				set icon size to ICON_SIZE
-				set text size to TEXT_SIZE
-				set arrangement to not arranged
-			end tell
-			BACKGROUND_CLAUSE
-
-			-- Positioning
-			POSITION_CLAUSE
-
-			-- Hiding
-			HIDING_CLAUSE
-
-			-- Application and QL Link Clauses
-			APPLICATION_CLAUSE
-			QL_CLAUSE
-			close
-			open
-			-- Force saving of the size
-			delay 1
-
-			tell container window
-				set statusbar visible to false
-				set the bounds to {theXOrigin, theYOrigin, theBottomRightX - 10, theBottomRightY - 10}
-			end tell
-		end tell
-
-		delay 1
-
-		tell disk (volumeName as string)
-			tell container window
-				set statusbar visible to false
-				set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-			end tell
-		end tell
-
-		--give the finder some time to write the .DS_Store file
-		delay 3
-
-		set waitTime to 0
-		set ejectMe to false
-		repeat while ejectMe is false
-			delay 1
-			set waitTime to waitTime + 1
-			
-			if (do shell script "[ -f " & dsStore & " ]; echo $?") = "0" then set ejectMe to true
-		end repeat
-		log "waited " & waitTime & " seconds for .DS_STORE to be created."
-	end tell
-end run