diff --git a/.gitmodules b/.gitmodules
index ca40fbd..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "Projects/ADS-B/dump1090"]
- path = Projects/ADS-B/dump1090
- url = https://github.com/flightaware/dump1090.git
diff --git a/Imager/imager_1.7.3.exe b/Imager/imager_1.7.5.exe
similarity index 67%
rename from Imager/imager_1.7.3.exe
rename to Imager/imager_1.7.5.exe
index 78d0040..ac1547b 100644
Binary files a/Imager/imager_1.7.3.exe and b/Imager/imager_1.7.5.exe differ
diff --git a/Imager/imager_1.7.5_amd64.deb b/Imager/imager_1.7.5_amd64.deb
new file mode 100644
index 0000000..6fd1c73
Binary files /dev/null and b/Imager/imager_1.7.5_amd64.deb differ
diff --git a/Projects/ADS-B/99-rtl-sdr.rules b/Projects/ADS-B/99-rtl-sdr.rules
deleted file mode 100644
index 4213454..0000000
--- a/Projects/ADS-B/99-rtl-sdr.rules
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Copyright 2012-2013 Osmocom rtl-sdr project
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-#
-
-# original RTL2832U vid/pid (hama nano, for example)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2832", MODE:="0666"
-
-# RTL2832U OEM vid/pid, e.g. ezcap EzTV668 (E4000), Newsky TV28T (E4000/R820T) etc.
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="2838", MODE:="0666"
-
-# DigitalNow Quad DVB-T PCI-E card (4x FC0012?)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6680", MODE:="0666"
-
-# Leadtek WinFast DTV Dongle mini D (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0413", ATTRS{idProduct}=="6f0f", MODE:="0666"
-
-# Genius TVGo DVB-T03 USB dongle (Ver. B)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0458", ATTRS{idProduct}=="707f", MODE:="0666"
-
-# Terratec Cinergy T Stick Black (rev 1) (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00a9", MODE:="0666"
-
-# Terratec NOXON rev 1 (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b3", MODE:="0666"
-
-# Terratec Deutschlandradio DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b4", MODE:="0666"
-
-# Terratec NOXON DAB Stick - Radio Energy (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b5", MODE:="0666"
-
-# Terratec Media Broadcast DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b7", MODE:="0666"
-
-# Terratec BR DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b8", MODE:="0666"
-
-# Terratec WDR DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00b9", MODE:="0666"
-
-# Terratec MuellerVerlag DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c0", MODE:="0666"
-
-# Terratec Fraunhofer DAB Stick (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00c6", MODE:="0666"
-
-# Terratec Cinergy T Stick RC (Rev.3) (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d3", MODE:="0666"
-
-# Terratec T Stick PLUS (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00d7", MODE:="0666"
-
-# Terratec NOXON rev 2 (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0ccd", ATTRS{idProduct}=="00e0", MODE:="0666"
-
-# PixelView PV-DT235U(RN) (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1554", ATTRS{idProduct}=="5020", MODE:="0666"
-
-# Astrometa DVB-T/DVB-T2 (R828D)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="15f4", ATTRS{idProduct}=="0131", MODE:="0666"
-
-# Compro Videomate U620F (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0620", MODE:="0666"
-
-# Compro Videomate U650F (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0650", MODE:="0666"
-
-# Compro Videomate U680F (E4000)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="185b", ATTRS{idProduct}=="0680", MODE:="0666"
-
-# GIGABYTE GT-U7300 (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d393", MODE:="0666"
-
-# DIKOM USB-DVBT HD
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d394", MODE:="0666"
-
-# Peak 102569AGPK (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d395", MODE:="0666"
-
-# KWorld KW-UB450-T USB DVB-T Pico TV (TUA9001)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d397", MODE:="0666"
-
-# Zaapa ZT-MINDVBZP (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d398", MODE:="0666"
-
-# SVEON STV20 DVB-T USB & FM (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d39d", MODE:="0666"
-
-# Twintech UT-40 (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a4", MODE:="0666"
-
-# ASUS U3100MINI_PLUS_V2 (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3a8", MODE:="0666"
-
-# SVEON STV27 DVB-T USB & FM (FC0013)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3af", MODE:="0666"
-
-# SVEON STV21 DVB-T USB & FM
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b80", ATTRS{idProduct}=="d3b0", MODE:="0666"
-
-# Dexatek DK DVB-T Dongle (Logilink VG0002A) (FC2580)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1101", MODE:="0666"
-
-# Dexatek DK DVB-T Dongle (MSI DigiVox mini II V3.0)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1102", MODE:="0666"
-
-# Dexatek DK 5217 DVB-T Dongle (FC2580)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1103", MODE:="0666"
-
-# MSI DigiVox Micro HD (FC2580)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d19", ATTRS{idProduct}=="1104", MODE:="0666"
-
-# Sweex DVB-T USB (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="a803", MODE:="0666"
-
-# GTek T803 (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="b803", MODE:="0666"
-
-# Lifeview LV5TDeluxe (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="c803", MODE:="0666"
-
-# MyGica TD312 (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d286", MODE:="0666"
-
-# PROlectrix DV107669 (FC0012)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1f4d", ATTRS{idProduct}=="d803", MODE:="0666"
diff --git a/Projects/ADS-B/ads-b.sh b/Projects/ADS-B/ads-b.sh
deleted file mode 100755
index 27a3369..0000000
--- a/Projects/ADS-B/ads-b.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-ADSB=$HOME/ProbeStar/pi_tools/Projects/ADS-B/
-
-if [ -d $ADSB ]; then
- cd $ADSB
- if [ ! -d /run/dump1090-fa ]; then
- sudo mkdir -p /run/dump1090-fa
- sudo chmod a+rwx /run/dump1090-fa
- fi
- ./dump1090/dump1090 --interactive --net --write-json /run/dump1090-fa/
-fi
diff --git a/Projects/ADS-B/config.js b/Projects/ADS-B/config.js
deleted file mode 100644
index 04b4a15..0000000
--- a/Projects/ADS-B/config.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// --------------------------------------------------------
-//
-// This file is to configure the configurable settings.
-// Load this file before script.js file at gmap.html.
-//
-// --------------------------------------------------------
-
-// -- Title Settings --------------------------------------
-// Show number of aircraft and/or messages per second in the page title
-PlaneCountInTitle = true;
-MessageRateInTitle = false;
-
-// -- Output Settings -------------------------------------
-// The DisplayUnits setting controls whether nautical (ft, NM, knots),
-// metric (m, km, km/h) or imperial (ft, mi, mph) units are used in the
-// plane table and in the detailed plane info. Valid values are
-// "nautical", "metric", or "imperial".
-DisplayUnits = "nautical";
-
-// -- Map settings ----------------------------------------
-// These settings are overridden by any position information
-// provided by dump1090 itself. All positions are in decimal
-// degrees.
-
-// Default center of the map.
-DefaultCenterLat = 42.522230;
-DefaultCenterLon = -83.23768;
-// The google maps zoom level, 0 - 16, lower is further out
-DefaultZoomLvl = 10;
-
-// Center marker. If dump1090 provides a receiver location,
-// that location is used and these settings are ignored.
-
-SiteShow = false; // true to show a center marker
-SiteLat = 42.522230; // position of the marker
-SiteLon = -83.23768;
-SiteName = "Proberts"; // tooltip of the marker
-
-// -- Marker settings -------------------------------------
-
-// These settings control the coloring of aircraft by altitude.
-// All color values are given as Hue (0-359) / Saturation (0-100) / Lightness (0-100)
-ColorByAlt = {
- // HSL for planes with unknown altitude:
- unknown : { h: 0, s: 0, l: 40 },
-
- // HSL for planes that are on the ground:
- ground : { h: 15, s: 80, l: 20 },
-
- air : {
- // These define altitude-to-hue mappings
- // at particular altitudes; the hue
- // for intermediate altitudes that lie
- // between the provided altitudes is linearly
- // interpolated.
- //
- // Mappings must be provided in increasing
- // order of altitude.
- //
- // Altitudes below the first entry use the
- // hue of the first entry; altitudes above
- // the last entry use the hue of the last
- // entry.
- h: [ { alt: 2000, val: 20 }, // orange
- { alt: 10000, val: 140 }, // light green
- { alt: 40000, val: 300 } ], // magenta
- s: 85,
- l: 50,
- },
-
- // Changes added to the color of the currently selected plane
- selected : { h: 0, s: -10, l: +20 },
-
- // Changes added to the color of planes that have stale position info
- stale : { h: 0, s: -10, l: +30 },
-
- // Changes added to the color of planes that have positions from mlat
- mlat : { h: 0, s: -10, l: -10 }
-};
-
-// For a monochrome display try this:
-// ColorByAlt = {
-// unknown : { h: 0, s: 0, l: 40 },
-// ground : { h: 0, s: 0, l: 30 },
-// air : { h: [ { alt: 0, val: 0 } ], s: 0, l: 50 },
-// selected : { h: 0, s: 0, l: +30 },
-// stale : { h: 0, s: 0, l: +30 },
-// mlat : { h: 0, s: 0, l: -10 }
-// };
-
-// Outline color for aircraft icons with an ADS-B position
-OutlineADSBColor = '#000000';
-
-// Outline color for aircraft icons with a mlat position
-OutlineMlatColor = '#4040FF';
-
-SiteCircles = true; // true to show circles (only shown if the center marker is shown)
-// In miles, nautical miles, or km (depending settings value 'DisplayUnits')
-SiteCirclesDistances = new Array(100,150,200);
-
-// Controls page title, righthand pane when nothing is selected
-PageName = "PiAware SkyAware";
-
-// Show country flags by ICAO addresses?
-ShowFlags = true;
-
-// Path to country flags (can be a relative or absolute URL; include a trailing /)
-FlagPath = "flags-tiny/";
-
-// Set to true to enable the ChartBundle base layers (US coverage only)
-ChartBundleLayers = false;
-
-// Provide a Bing Maps API key here to enable the Bing imagery layer.
-// You can obtain a free key (with usage limits) at
-// https://www.bingmapsportal.com/ (you need a "basic key")
-//
-// Be sure to quote your key:
-// BingMapsAPIKey = "your key here";
-//
-BingMapsAPIKey = null;
-
-// Turn on display of extra Mode S EHS / ADS-B v1/v2 data
-// This is not polished yet (and so is disabled by default),
-// currently it's just a data dump of the new fields with no UX work.
-ExtendedData = false;
diff --git a/Projects/ADS-B/config/lxsesson/LXDE-pi/autostart b/Projects/ADS-B/config/lxsesson/LXDE-pi/autostart
deleted file mode 100644
index 511e919..0000000
--- a/Projects/ADS-B/config/lxsesson/LXDE-pi/autostart
+++ /dev/null
@@ -1,5 +0,0 @@
-@lxpanel --profile LXDE-pi
-@pcmanfm --desktop --profile LXDE-pi
-@xscreensaver -no-splash
-@/home/pi/start_rpi.sh
-
diff --git a/Projects/ADS-B/dump1090 b/Projects/ADS-B/dump1090
deleted file mode 160000
index f862b53..0000000
--- a/Projects/ADS-B/dump1090
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f862b530c8cea51f4bb9e72356579be67818dcaf
diff --git a/Projects/ADS-B/dump1090-fa.conf b/Projects/ADS-B/dump1090-fa.conf
deleted file mode 100644
index 8bce125..0000000
--- a/Projects/ADS-B/dump1090-fa.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#Alias /dump1090 /var/www/html/dump1090/
-#Alias ^/dump1090-fa$ /dump1090-fa/
-
-Alias /dump1090/data /tmp/dump1090-fa/
-Alias /data /tmp/dump1090-fa/
-
-
- Options All
- AllowOverride All
- SetEnvIf Request_URI “/dump1090/data/..json$" Header set “Access-Control-Allow-Origin” "”
-
-
-
- Options All
- AllowOverride All
- SetEnvIf Request_URI “/dump1090/data/..json$" Header set “Access-Control-Allow-Origin” "”
-
diff --git a/Projects/ADS-B/setup.sh b/Projects/ADS-B/setup.sh
deleted file mode 100755
index 4d89a5e..0000000
--- a/Projects/ADS-B/setup.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# install software
-sudo apt-get install apache2 rtl-sdr librtlsdr-dev libncurses-dev python-gi-cairo
-
-# script
-mkdir -p ~/bin
-cp ads-b.sh ~/bin
-cp -r config/* ~/.config
-cp start_rpi.sh ~
-
-# rules
-sudo cp *.rules /etc/udev/rules.d
-sudo service udev restart
-
-# apache setup
-sudo cp dump1090-fa.conf /etc/apache2/conf-enabled/
-sudo service apache2 restart
-
-# dump1090 build and install
-cd dump1090
-make
-sudo mkdir -p /var/www/html/dump1090-fa
-sudo cp -a public_html/* /var/www/html/dump1090-fa
-cd ..
-
-# dump1090 config
-sudo cp config.js /var/www/html/dump1090-fa
-cd /var/www/html/dump1090-fa
-sudo ln -fs /run/dump1090-fa data
diff --git a/Projects/ADS-B/start-rpi.sh b/Projects/ADS-B/start-rpi.sh
deleted file mode 100755
index 7061e5f..0000000
--- a/Projects/ADS-B/start-rpi.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-xgps &
-
-lxterminal -e "ADS-B" --command "ads-b.sh" &