Initial commit

11 years ago · 1d6bed97ea
60 changed files with 30361 additions and 0 deletions
--- a/Animation.pde
+++ b/Animation.pde
@ -0,0 +1,114 @@
+class MText extends Object {
+  float x;
+  float y;
+  int endx;
+  int endy;
+  int startx;
+  int starty;
+  int duration;
+  int step;
+  boolean animate = false;
+  boolean done = false;
+  String text;
+  
+  MText(String text, int x, int y) {
+    this.x = (float)x;
+    this.y = (float)y;
+    this.startx = x;
+    this.starty = y;
+    this.text = text;
+  }
+  
+  void animate() {
+    animate = true;
+  }
+  
+  void setDuration(int duration) {
+    this.duration = duration;
+  }
+  
+  void setDestination(int x, int y) {
+    endx = x;
+    endy = y;
+  }
+  
+  boolean isDone() {
+    return done;
+  }
+  
+  void draw() {
+    if (step < duration) {
+      x = (x + ((float)(endx-startx)/(float)duration));
+      y = (y + ((float)(endy-starty)/(float)duration));
+      step++;
+      if (step == duration) done = true;
+    }
+    if (animate) {
+      fill(#FFFFFF);
+      textFont(f40, 40);
+      textAlign(CENTER);
+      smooth();
+      text(text, (int)x, (int)y);
+    }
+  }
+  
+}
+
+class MLine extends Object {
+  float x;
+  float y;
+  int endx;
+  int endy;
+  int startx;
+  int starty;
+  int duration;
+  int step;
+  boolean animate = false;
+  boolean done = false;
+  
+  MLine(int x, int y) {
+    this.x = (float)x;
+    this.y = (float)y;
+    this.startx = x;
+    this.starty = y;
+  }
+  
+  void animate() {
+    animate = true;
+  }
+  
+  void setDuration(int duration) {
+    this.duration = duration;
+  }
+  
+  void setDestination(int x, int y) {
+    endx = x;
+    endy = y;
+  }
+  
+  boolean isDone() {
+    return done;
+  }
+  
+  void draw() {
+    if (step < duration) {
+      x = (x + ((float)(endx-startx)/(float)duration));
+      y = (y + ((float)(endy-starty)/(float)duration));
+      step++;
+      if (step == duration) done = true;
+    }
+    if (animate) {
+      stroke(#FFFFFF);
+      smooth();
+      line(startx, starty, x, y);
+    }
+  }
+  
+}
+
+void sleep(int m) {
+  float now = millis();
+  while(millis() < now + (float)m) {
+    
+  }
+}
--- a/Builds/Base/Katapult
+++ b/Builds/Base/Katapult
--- a/Builds/Base/Read
+++ b/Builds/Base/Read
@ -0,0 +1,125 @@
+Version 1.2
+
+Thank you for downloading Katapult!
+
+To get started, read the "Katapult Documentation" PDF.
+
+Important!
+You need Java installed to run Katapult. You need at least version 1.6.
+
+Very important!!
+If you are using Mac, DO NOT run Katapult in 64-bit mode. Katapult is NOT STABLE in 64-bit mode! There is an issue with java when running in 64-bit mode that messes up Katapults thread syncronization. This will most probably make Katapult crash at some point, or make it eat a lot of CPU power. If you are experiencing problems, please check whether Katapult runs in 64-bit mode. You can do this by opening up "Activity Monitor". If "Intel (64-bit)" is listed in the "Kind" column for Katapult, please change you Java settings to use the 32-bit VM instead. Open up "Java Preferences" and drag the 32-bit option to the top of the list. Also, try showing info (cmd-i) on the Katapult application, and check the "Run in 32-bit mode" checkbox.
+
+If you are using Snow Leopard, make sure you have updated to at least 10.6.2, since there was a Java bug in prior versions, that will make Katapult cry. Also, make sure you have the latest Java updates from
+Apple.
+
+If you are having trouble starting Katapult, please update your Java version. Also, if Katapult cannot detect your Launchpad, please make sure that you have the latest Launchpad USB drivers installed. These can be dawnloaded from Novations website at http://www.novationmusic.com/support/launchpad/.
+
+www.midikatapult.com
+info@midikatapult.com
+
+Important! Please see the "Known Issues" section, for notes on a bug related to Carbon based virtual MIDI drivers (seems to have been fixed
+in Apples latest Java updated as of 25th of May 2010).
+
+-----------
+Changes from 1.139 -> 1.2
+    - Ability to run Katapult in usermode 1/2
+      alongside Ableton Live's native Launchpad
+      functions
+    - Ability to map the round side-buttons
+    - Ability to invert drumrack note order
+    - Ability to customize velocity on buttons
+    - Ability to use note controls in toggle mode
+    - New control: Cross-fader
+    - New control: inverted vertical fader
+    - New control: inverted horizontal fader
+    - Fixed a bug where octaves weren't recognized
+      properly.
+    - A lot of small optimizations and fixes :)
+    - Updated documentation
+
+Changes from 1.132 -> 1.139
+    - iPad support
+    - Multi-client network support
+
+Changes from 1.13 -> 1.132
+    - Fixed a bug that caused button color
+      to get out of sync with Traktor 1.2.6
+
+Changes from 1.12 -> 1.13
+    - Added a persistence option to buttons
+    - Added new control: PC
+    - Added "headless" mode
+    - Added text-scroller demo (see config.txt)
+    - Fixed a bug with flipping pages when there was
+      gaps between the pages
    - Fixed a bug with note-off events not being sent
+      on custom channels
    - Fixed a bug where chained controls wouldnÕt send
+      updates (see docs)
    - Fixed a bug where custom channels would send on
+      the wrong channel
    - Documentation updated
+
+Changes from 1.12 -> 1.121
+    - Fixed a bug that caused drumracks to be duplicated
+
+Changes from 1.1 -> 1.12
+    - Added new control: CC
+    - Added new control: Raw note
+    - Added new control: Drumrack
+    - Added new control: Keyboard shortcut
+    - Added ability to customise send channels
+    - Added ability to reload layouts on the fly
+    - Updated documentation (+ fixed some errors)
+
+Changes from 1.052 -> 1.1
+    - Added new control: Progress bar
+    - Added new control: Meter
+    - Added new control: Note
+    - Optimised takeover implementation
+    - Various code optimisations
+    - Bugfixes
+    - Documentation updated
+
+Changes from 1.05 -> 1.052
+    - Minor bugfixes
+    - Updated user-interface explanations
+    - Minor updates to documentation
+
+Changes from 1.042 -> 1.05
+    - Updated documentation
+    - Fixed a bug that caused the Launchpad buttons
+      to lock up right after starting
+    - Fixed a bug that prevented the Launchpad buttons from when
+      Katapult was started
+      
+Changes from 1.04 -> 1.042
+    - Fixed a bug that might have made controls lock up
+      for some users.
+    - Extended documentation (takeover, added more descriptions)
+
+Changes from 1.03 -> 1.04
+	- Implemented 2D pads
+	- Implemented custom inertia/takeover on faders
+	- Implemented custom inertia/takeover on pads
+	- Added ability to save device configuration
+	- Added page naming
+	- Fixed text file formatting in Windows
+
+Changes from 1.02 -> 1.03
+
+	- Fixed a bug where bi-directional communication would
+	  only work for the first page
+	- Added indicator controls
+	- Added ability to customize colors;
+	  default & on individual controls
+	- Added configuration file
+	- Added ability to specify devices in configuration file
+	- Added silent mode (specified in configuration file)
+
+-----------
+Known issues:
+
+- [This issue has been resolved as of Apple's May 2010 Java update]
+Sometimes, Katapult won't start due to a memory access error, if other MIDI applications are already running. If this happens, try closing the other applications, start Katapult, and then start up the other applications again. Please see the documentation pdf for more info on this issue. Unfortunately, I am unable to provide a fix at this time, since the bug resides in Apples Java implementation. You can get around this issue by using IAC drivers.
+
+-----------
+
+Happy Katapulting!
--- a/Builds/Base/Samples/Katapult.tsi
+++ b/Builds/Base/Samples/Katapult.tsi
--- a/Builds/Base/Samples/Mapping.jpg
+++ b/Builds/Base/Samples/Mapping.jpg
--- a/Builds/Base/Samples/sample
+++ b/Builds/Base/Samples/sample
@ -0,0 +1,133 @@
+// <- These two slashes means "this line is a comment"
+
+// Lets start creating a layout.
+// First of all, we need at least one page, so lets create one by
+// writing:
+
+page 1
+
+// So far, so good. Now let's create some controls.
+// First some hold and toggle buttons:
+
+button 0 0 toggle
+button 1 0 toggle
+button 2 0 hold
+button 3 0 toggle
+
+button 0 1 hold
+button 1 1 hold
+button 2 1 hold
+button 3 1 hold
+
+// And then some faders:
+
+yfader 0 7 5
+yfader 1 7 5
+yfader 2 7 5
+yfader 3 7 5
+
+// That fills up the left half of the Launchpad
+// Lets just duplicate it for the other half,
+// This will serve as a good starting point
+// for controlling two decks in Traktor, for
+// example.
+
+button 4 0 toggle
+button 5 0 toggle
+button 6 0 hold
+button 7 0 toggle
+
+button 4 1 hold
+button 5 1 hold
+button 6 1 hold
+button 7 1 hold
+
+yfader 4 7 5
+yfader 5 7 5
+yfader 6 7 5
+yfader 7 7 5
+
+button 0 2 toggle
+button 1 2 toggle
+button 2 2 hold
+button 3 2 hold
+button 4 2 toggle
+button 5 2 toggle
+button 6 2 hold
+button 7 2 hold
+
+// For demonstration purposes, heres a couple more pages.
+// These are not mapped to anything in the supplied
+// Traktor layouts, so you can go ahead and assign the
+// controls yourself :) Get creative!
+
+page 2
+
+button 0 0 hold
+button 1 0 hold
+button 2 0 hold
+
+button 5 0 hold
+button 6 0 hold
+button 7 0 hold
+
+yslider 0 6 6 5
+yslider 1 6 6 5
+yslider 2 6 6 5
+
+yslider 5 6 6 5
+yslider 6 6 6 5
+yslider 7 6 6 5
+
+button 0 7 hold
+button 1 7 hold
+button 2 7 hold
+
+button 5 7 hold
+button 6 7 hold
+button 7 7 hold
+
+yslider 3 6 7 4
+yslider 4 6 7 4
+
+button 3 7 toggle
+button 4 7 toggle
+
+page 3
+
+button 0 0 hold
+button 1 0 hold
+button 2 0 hold
+button 3 0 hold
+button 4 0 hold
+button 5 0 hold
+button 6 0 hold
+button 7 0 hold
+
+button 0 1 hold
+button 1 1 hold
+button 2 1 hold
+button 3 1 hold
+button 4 1 hold
+button 5 1 hold
+button 6 1 hold
+button 7 1 hold
+
+button 0 2 hold
+button 1 2 hold
+button 2 2 hold
+button 3 2 hold
+button 4 2 hold
+button 5 2 hold
+button 6 2 hold
+button 7 2 hold
+
+button 0 3 hold
+button 1 3 hold
+button 2 3 hold
+button 3 3 hold
+button 4 3 hold
+button 5 3 hold
+button 6 3 hold
+button 7 3 hold
+
--- a/Builds/Base/config.txt
+++ b/Builds/Base/config.txt
@ -0,0 +1,91 @@
+// <- These two slashes means, that a line is a comment.
+// If you want to use any of the example configuration lines
+// in this file, remove the slashes, and the following space,
+// so the config command is the very first thing on the line.
+// For example: "in=Traktor Out".
+
+// This is Katapults config file. In this file, you can
+// define various options, such as MIDI input/output devices
+// and default colors for controls
+
+// You can set the input device with a line like this:
+
+// in=Traktor Out
+
+// You can set the output device with a line like this:
+
+// out=Traktor In
+
+// If you want to use Katapult with Ableton Live, you can
+// enable Live's Launchpad functionality like this:
+
+// abletonlive=yes
+// liveusermode=1
+
+// This will put Katapult in usermode 1.
+
+// If you want Katapult to run in silent mode, use this line:
+
+// silent=yes
+
+// In silent mode, Katapult will not display any user interface,
+// thus saving CPU and making updates faster. This is especially
+// a good idea if you want to use MIDI intensive displays on the
+// Launchpad, such as volume output meters.
+// Note that you MUST specify input and output devices in this
+// file if you want Katapult to run in silent mode.
+
+// You can also define the default colors for the controls here.
+// The following lines are an example:
+
+// holdoncolor=green
+// holdoffcolor=amber
+// toggleoncolor=green
+// toggleoffcolor=amber
+// faderoncolor=red
+// faderoffcolor=green
+// slideroncolor=greenlow
+// slideroffcolor=green
+// pagebuttononcolor=amber
+// pagebuttonoffcolor=amber
+// indicatoroncolor=green
+// indicatoroffcolor=red
+// padoncolor=yellow
+// padoffcolor=amber
+// meteroncolor=green
+// meteroffcolor=amber
+// progressoncolor=green
+// progressoffcolor=red
+// noteoncolor=green
+// noteoffcolor=yellow
+// cconcolor=yellow
+// ccoffcolor=yellow
+// kbdoncolor=greenl
+// kbdoffcolor=green
+
+// See the documentation for a list of usable colors.
+
+// Katapult can be started in headless mode by using this line:
+
+// headless=yes
+
+// You can customize the demo being shown when pressing the mixer
+// button by using the following commands:
+
+// demochoice=6
+
+// choices here are 1-6, where 6 is a text scroller. Specify the
+// text like this:
+
+// demotext=katapult
+// demotextcolor=green
+
+// Or create your own bitmap and display whatever you want
+// like this
+
+// b1=          #         #              #####             #         #
+// b2=         # #        ##            #  #  #           ##        # #
+// b3=       ##   ##      # #        # # #   # # #       # #      ##   ##
+// b4=      #       #     #  #     ##  #   #   #  ##    #  #     #       #
+// b5=    ##         ##   #   #  ##     #  #  #     ## #   #   ##         ##
+// b6= ###             ## #    ##        #####       ##    # ##             ##
--- a/Builds/Base/layout.txt
+++ b/Builds/Base/layout.txt
@ -0,0 +1,276 @@
+// <- These two slashes means "this line is a comment"
+
+// Lets start creating a layout.
+// First of all, we need at least one page, so lets create one by
+// writing:
+
+page 1 Transport & EQ
+
+// Pages can be named as well. Just write the name after the
+// page number, as above.
+
+// So far, so good. Now let's create some controls.
+// First some hold and toggle buttons:
+
+button 0 0 toggle
+button 1 0 toggle
+button 2 0 hold
+button 3 0 toggle
+
+button 0 1 hold
+button 1 1 hold
+button 2 1 hold
+button 3 1 hold
+
+// And then some faders:
+
+yfader 0 7 5 takeover=1
+yfader 1 7 5 takeover=1
+yfader 2 7 5 takeover=1
+yfader 3 7 5 takeover=1
+
+// These faders have takeover activated on them.
+// This means that they'll move smoothly from one
+// value to another. This takeover is set to the
+// fastest (1 millisecond). If you want them to
+// update slower, increase the takeover value.
+
+// That fills up the left half of the Launchpad
+// Lets just duplicate it for the other half,
+// This will serve as a good starting point
+// for controlling two decks in Traktor, for
+// example.
+
+button 4 0 toggle
+button 5 0 toggle
+button 6 0 hold
+button 7 0 toggle
+
+button 4 1 hold
+button 5 1 hold
+button 6 1 hold
+button 7 1 hold
+
+yfader 4 7 5 takeover=1
+yfader 5 7 5 takeover=1
+yfader 6 7 5 takeover=1
+yfader 7 7 5 takeover=1
+
+button 0 2 toggle
+button 1 2 toggle
+button 2 2 hold
+button 3 2 hold
+button 4 2 toggle
+button 5 2 toggle
+button 6 2 hold
+button 7 2 hold
+
+// For demonstration purposes, heres a couple more pages.
+// These are not mapped to anything in the supplied
+// Traktor layouts, so you can go ahead and assign the
+// controls yourself :) Get creative!
+
+page 2 Some sliders and buttons
+
+button 0 0 hold
+button 1 0 hold
+button 2 0 hold
+
+button 5 0 hold
+button 6 0 hold
+button 7 0 hold
+
+yslider 0 6 6 5
+yslider 1 6 6 5
+yslider 2 6 6 5
+
+yslider 5 6 6 5
+yslider 6 6 6 5
+yslider 7 6 6 5
+
+button 0 7 hold
+button 1 7 hold
+button 2 7 hold
+
+button 5 7 hold
+button 6 7 hold
+button 7 7 hold
+
+yslider 3 6 7 4
+yslider 4 6 7 4
+
+button 3 7 toggle
+button 4 7 toggle
+
+page 3 More buttons
+
+button 0 0 hold
+button 1 0 hold
+button 2 0 hold
+button 3 0 hold
+button 4 0 hold
+button 5 0 hold
+button 6 0 hold
+button 7 0 hold
+
+button 0 1 hold
+button 1 1 hold
+button 2 1 hold
+button 3 1 hold
+button 4 1 hold
+button 5 1 hold
+button 6 1 hold
+button 7 1 hold
+
+button 0 2 hold
+button 1 2 hold
+button 2 2 hold
+button 3 2 hold
+button 4 2 hold
+button 5 2 hold
+button 6 2 hold
+button 7 2 hold
+
+button 0 3 hold
+button 1 3 hold
+button 2 3 hold
+button 3 3 hold
+button 4 3 hold
+button 5 3 hold
+button 6 3 hold
+button 7 3 hold
+
+page 4 Controller chaining
+
+xfader 0 0 8 takeover=8
+yfader 0 7 6
+yfader 2 7 5
+yfader 4 7 3
+yfader 6 7 4
+
+button 4 2 toggle
+button 5 3 toggle
+button 6 2 toggle
+button 7 2 toggle
+
+chain 0 0 to 0 7
+chain 0 7 to 2 7
+chain 2 7 to 4 7
+chain 4 7 to 6 7
+
+chain 4 2 to 0 7
+chain 5 3 to 2 7
+chain 6 2 to 4 7
+chain 7 2 to 6 7
+
+page 5 Custom color examples
+
+oncolor green
+
+offcolor yellow
+button 0 0 toggle
+button 0 1 toggle
+button 0 2 toggle
+button 0 3 toggle
+button 0 4 toggle
+button 0 5 toggle
+button 0 6 toggle
+button 0 7 toggle
+
+offcolor red
+button 1 0 toggle
+button 1 1 toggle
+button 1 2 toggle
+button 1 3 toggle
+button 1 4 toggle
+button 1 5 toggle
+button 1 6 toggle
+button 1 7 toggle
+
+offcolor yellow
+button 2 0 toggle
+button 2 1 toggle
+button 2 2 toggle
+button 2 3 toggle
+button 2 4 toggle
+button 2 5 toggle
+button 2 6 toggle
+button 2 7 toggle
+
+offcolor red
+button 3 0 toggle
+button 3 1 toggle
+button 3 2 toggle
+button 3 3 toggle
+button 3 4 toggle
+button 3 5 toggle
+button 3 6 toggle
+button 3 7 toggle
+
+offcolor yellow
+button 4 0 toggle
+button 4 1 toggle
+button 4 2 toggle
+button 4 3 toggle
+button 4 4 toggle
+button 4 5 toggle
+button 4 6 toggle
+button 4 7 toggle
+
+offcolor red
+button 5 0 toggle
+button 5 1 toggle
+button 5 2 toggle
+button 5 3 toggle
+button 5 4 toggle
+button 5 5 toggle
+button 5 6 toggle
+button 5 7 toggle
+
+offcolor yellow
+button 6 0 toggle
+button 6 1 toggle
+button 6 2 toggle
+button 6 3 toggle
+button 6 4 toggle
+button 6 5 toggle
+button 6 6 toggle
+button 6 7 toggle
+
+offcolor red
+button 7 0 toggle
+button 7 1 toggle
+button 7 2 toggle
+button 7 3 toggle
+button 7 4 toggle
+button 7 5 toggle
+button 7 6 toggle
+button 7 7 toggle
+
+defaultcolors
+
+page 6 Four 2D Pads
+
+offcolor green
+oncolor red
+pad 0 0 4 4 takeover=1
+pad 4 4 4 4 takeover=1
+
+offcolor amber
+pad 4 0 4 4
+pad 0 4 4 4
+
+page 7 One big 2D Pad
+pad 0 0 8 8 takeover=4
+
+defaultcolors
+
+page 8 Drumracks
+drumrack 0 0 4 4 3 c 115
+drumrack 4 4 4 4 5 c 120
+
+page 9 Keyboard shortcuts
+kbd 0 0 command+tab
+kbd 1 0 shift+a
+kbd 2 0 b
+kbd 3 0 c
--- a/Builds/Base/license.txt
+++ b/Builds/Base/license.txt
@ -0,0 +1 @@
+Replace this line with your license key
--- a/Builds/Releases/Katapult
+++ b/Builds/Releases/Katapult
--- a/Colors.pde
+++ b/Colors.pde
@ -0,0 +1,170 @@
+// LED color definitions
+static final int BLACK = 12;
+static final int REDL = 13;
+static final int RED = 15;
+static final int AMBERL = 29;
+static final int AMBER = 63;
+static final int YELLOW = 62;
+static final int GREEN = 60;
+static final int GREENL = 28;
+static final int REDF = 11;
+static final int AMBERF = 59;
+static final int YELLOWF = 58;
+static final int GREENF = 56;
+
+static final int BLUE = 90;
+static final int BLUEL = 91;
+static final int CYAN = 92;
+static final int CYANL = 93;
+static final int MAGENTA = 94;
+static final int MAGENTAL = 95;
+static final int WHITE = 96;
+static final int WHITEL = 97;
+
+int colors[] = new int[12];
+
+static int SCROLLERCOLOR = RED;
+
+// Button color definitions
+static int BUTTONIDLECOLOR = AMBER;
+static int HOLDONCOLOR = GREEN;
+static int TOGGLEONCOLOR = GREEN;
+static int TOGGLEOFFCOLOR = AMBER;
+static int FADERIDLECOLOR = RED;
+static int FADERACTIVECOLOR = GREEN;
+static int SLIDERIDLECOLOR = GREENL;
+static int SLIDERACTIVECOLOR = GREEN;
+static int PAGEBUTTONIDLECOLOR = AMBER;
+static int PAGEBUTTONACTIVECOLOR = GREEN;
+static int INDICATOROFFCOLOR = RED;
+static int INDICATORONCOLOR = GREEN;
+static int PADOFFCOLOR = AMBER;
+static int PADONCOLOR = YELLOW;
+static int METERIDLECOLOR = AMBER;
+static int METERACTIVECOLOR = GREEN;
+static int PROGRESSIDLECOLOR = RED;
+static int PROGRESSACTIVECOLOR = GREEN;
+static int NOTEIDLECOLOR = YELLOW;
+static int NOTEACTIVECOLOR = GREEN;
+static int CCIDLECOLOR = YELLOW;
+static int CCACTIVECOLOR = GREEN;
+static int KBDIDLECOLOR = GREENL;
+static int KBDACTIVECOLOR = GREEN;
+static int PCIDLECOLOR = YELLOW;
+static int PCACTIVECOLOR = GREEN;
+int[] cdef = new int[26];
+
+void storeDefaultColors() {
+  cdef[0] = BUTTONIDLECOLOR;
+  cdef[1] = HOLDONCOLOR;
+  cdef[2] = TOGGLEONCOLOR;
+  cdef[3] = TOGGLEOFFCOLOR;
+  cdef[4] = FADERIDLECOLOR;
+  cdef[5] = FADERACTIVECOLOR;
+  cdef[6] = SLIDERIDLECOLOR;
+  cdef[7] = SLIDERACTIVECOLOR;
+  cdef[8] = PAGEBUTTONIDLECOLOR;
+  cdef[9] = PAGEBUTTONACTIVECOLOR;
+  cdef[10] = INDICATOROFFCOLOR;
+  cdef[11] = INDICATORONCOLOR;
+  cdef[12] = PADOFFCOLOR;
+  cdef[13] = PADONCOLOR;
+  cdef[14] = METERIDLECOLOR;
+  cdef[15] = METERACTIVECOLOR;
+  cdef[16] = PROGRESSIDLECOLOR;
+  cdef[17] = PROGRESSACTIVECOLOR;
+  cdef[18] = NOTEIDLECOLOR;
+  cdef[19] = NOTEACTIVECOLOR;
+  cdef[20] = CCIDLECOLOR;
+  cdef[21] = CCACTIVECOLOR;
+  cdef[22] = KBDIDLECOLOR;
+  cdef[23] = KBDACTIVECOLOR;
+  cdef[24] = PCIDLECOLOR;
+  cdef[25] = PCACTIVECOLOR;
+}
+
+void defaultColors() {
+  BUTTONIDLECOLOR = cdef[0];
+  HOLDONCOLOR = cdef[1];
+  TOGGLEONCOLOR = cdef[2];
+  TOGGLEOFFCOLOR = cdef[3];
+  FADERIDLECOLOR = cdef[4];
+  FADERACTIVECOLOR = cdef[5];
+  SLIDERIDLECOLOR = cdef[6];
+  SLIDERACTIVECOLOR = cdef[7];
+  PAGEBUTTONIDLECOLOR = cdef[8];
+  PAGEBUTTONACTIVECOLOR = cdef[9];
+  INDICATOROFFCOLOR = cdef[10];
+  INDICATORONCOLOR = cdef[11];
+  PADOFFCOLOR = cdef[12];
+  PADONCOLOR = cdef[13];
+  METERIDLECOLOR = cdef[14];
+  METERACTIVECOLOR = cdef[15];
+  PROGRESSIDLECOLOR = cdef[16];
+  PROGRESSACTIVECOLOR = cdef[17];
+  NOTEIDLECOLOR = cdef[18];
+  NOTEACTIVECOLOR = cdef[19];
+  CCIDLECOLOR = cdef[20];
+  CCACTIVECOLOR = cdef[21];
+  KBDIDLECOLOR = cdef[22];
+  KBDACTIVECOLOR = cdef[23];
+  PCIDLECOLOR = cdef[24];
+  PCACTIVECOLOR = cdef[25];
+}
+
+int parseColor(String input) {
+  int scolor = BLACK;
+  if (input.equals("black")) { scolor = BLACK; }
+  if (input.equals("redlow")) { scolor = REDL; }
+  if (input.equals("red")) { scolor = RED; }
+  if (input.equals("amberlow")) { scolor = AMBERL; }
+  if (input.equals("amber")) { scolor = AMBER; }
+  if (input.equals("yellow")) { scolor = YELLOW; }
+  if (input.equals("greenlow")) { scolor = GREENL; }
+  if (input.equals("green")) { scolor = GREEN; }
+  
+  if (input.equals("blue")) { scolor = BLUE; }
+  if (input.equals("bluelow")) { scolor = BLUEL ; }
+  if (input.equals("cyan")) { scolor = CYAN; }
+  if (input.equals("cyanlow")) { scolor = CYANL; }
+  if (input.equals("magenta")) { scolor = MAGENTA; }
+  if (input.equals("magentalow")) { scolor = MAGENTAL; }
+  if (input.equals("white")) { scolor = WHITE; }
+  if (input.equals("whitelow")) { scolor = WHITEL ; }
+  
+  if (input.equals("redflash")) { scolor = REDF; }
+  if (input.equals("amberflash")) { scolor = AMBERF; }
+  if (input.equals("yellowflash")) { scolor = YELLOWF; }
+  if (input.equals("greenflash")) { scolor = GREENF; }
+  return scolor;
+}
+
+void setOffColors(int scolor) {
+  BUTTONIDLECOLOR = scolor;
+  TOGGLEOFFCOLOR = scolor;
+  FADERIDLECOLOR = scolor;
+  SLIDERIDLECOLOR = scolor;
+  INDICATOROFFCOLOR = scolor;
+  PADOFFCOLOR = scolor;
+  METERIDLECOLOR = scolor;
+  PROGRESSIDLECOLOR = scolor;
+  NOTEIDLECOLOR = scolor;
+  CCIDLECOLOR = scolor;
+  KBDIDLECOLOR = scolor;
+  PCIDLECOLOR = scolor;
+}
+
+void setOnColors(int scolor) {
+  HOLDONCOLOR = scolor;
+  TOGGLEONCOLOR = scolor;
+  FADERACTIVECOLOR = scolor;
+  SLIDERACTIVECOLOR = scolor;
+  INDICATORONCOLOR = scolor;
+  PADONCOLOR = scolor;
+  METERACTIVECOLOR = scolor;
+  PROGRESSACTIVECOLOR = scolor;
+  NOTEACTIVECOLOR = scolor;
+  CCACTIVECOLOR = scolor;
+  KBDACTIVECOLOR = scolor;
+  PCACTIVECOLOR = scolor;
+}
--- a/Configuration.pde
+++ b/Configuration.pde
@ -0,0 +1,171 @@
+// Configuration
+static String VERSION = "1.2";
+static int FRAMERATE = 60;
+static int WINDOWSIZE = 400;
+static int FRAMEBORDER = 10;
+static String SOFTWARE = "";
+static String SOFTWAREIN = "";
+static String SOFTWARESEL = "";
+static String SOFTWAREINSEL = "";
+static boolean DEBUG = false;
+static boolean NOSEND = false;
+static boolean NETWORK = false;
+static boolean HEADLESS = false;
+static boolean LIVECONTROL = false;
+static boolean LIVEENABLED = false;
+static int USERMODE = 1;
+static int MAXCHAINS = 64;
+static boolean DEMO = false;
+static String DEMOTEXT = "katapult";
+static int DEMOCHOICE = -1;
+static boolean SILENTMODE = false;
+
+// Internal variables
+static String config[];
+static int CLINESIN = -1;
+static int CLINESOUT = -1;
+static boolean DEVICECONFIG = false;
+
+void loadConfig() {
+  config = loadStrings("config.txt");
+  for (int i = 0; i < config.length; i++) {
+    String configLine[] = split(config[i], "=");
+    if (configLine[0].equals("in")) {
+      SOFTWAREIN = configLine[1];
+      SOFTWAREINSEL = configLine[1];
+      CLINESIN = i;
+    }
+    if (configLine[0].equals("out")) {
+      SOFTWARE = configLine[1];
+      SOFTWARESEL = configLine[1];
+      CLINESOUT = i;
+    }
+    if (configLine[0].equals("abletonlive")) {
+      if (configLine[1].equals("yes")) { LIVEENABLED = true; }
+    }
+    if (configLine[0].equals("liveusermode")) {
+      if (configLine[1].equals("2")) { USERMODE = 2; }
+    }
+    if (configLine[0].equals("silent")) {
+      if (configLine[1].equals("yes")) { SILENTMODE = true; WINDOWSIZE = 150; }
+    }
+    if (configLine[0].equals("headless")) {
+      if (configLine[1].equals("yes")) { HEADLESS = true; VERSION = VERSION + " headless"; }
+    }
+    if (configLine[0].equals("holdoffcolor")) {
+       BUTTONIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("holdoncolor")) {
+       HOLDONCOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("toggleoffcolor")) {
+       TOGGLEOFFCOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("toggleoncolor")) {
+       TOGGLEONCOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("faderoffcolor")) {
+       FADERIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("faderoncolor")) {
+       FADERACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("slideroffcolor")) {
+      SLIDERIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("slideroncolor")) {
+      SLIDERACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("pagebuttononcolor")) {
+      PAGEBUTTONACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("pagebuttonoffcolor")) {
+      PAGEBUTTONIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("meteroffcolor")) {
+      METERIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("meteroncolor")) {
+      METERACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("progressoffcolor")) {
+      PROGRESSIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("progressoncolor")) {
+      PROGRESSACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("noteoffcolor")) {
+      NOTEIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("noteoncolor")) {
+      NOTEACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("cconcolor")) {
+      CCACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("ccoffcolor")) {
+      CCIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("pconcolor")) {
+      PCACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("pcoffcolor")) {
+      PCIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("kbdoncolor")) {
+      KBDACTIVECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("kbdoffcolor")) {
+      KBDIDLECOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("demotextcolor")) {
+      SCROLLERCOLOR = parseColor(configLine[1]);
+    }
+    if (configLine[0].equals("demotext")) {
+      DEMOTEXT = configLine[1];
+    }
+    if (configLine[0].equals("demochoice")) {
+      DEMOCHOICE = Integer.parseInt(configLine[1]);
+    }
+    if (configLine[0].equals("b1")) {
+      overrideBitmap(0, configLine[1]);
+    }
+    if (configLine[0].equals("b2")) {
+      overrideBitmap(1, configLine[1]);
+    }
+    if (configLine[0].equals("b3")) {
+      overrideBitmap(2, configLine[1]); 
+    }
+    if (configLine[0].equals("b4")) {
+      overrideBitmap(3, configLine[1]);
+    }
+    if (configLine[0].equals("b5")) {
+      overrideBitmap(4, configLine[1]);
+    }
+    if (configLine[0].equals("b6")) {
+      overrideBitmap(5, configLine[1]);
+    }
+    
+  }
+  if (!SOFTWAREIN.equals("") && !SOFTWARE.equals("")) DEVICECONFIG = true;
+  storeDefaultColors();
+}
+
+void saveConfig() {
+  //debug("saveConfig()");
+  int configlength = config.length;
+  //debug("Configlength "+configlength);
+  if (CLINESIN == -1) { CLINESIN = configlength; configlength++; }
+  if (CLINESOUT == -1) { CLINESOUT = configlength; configlength++; }
+  //debug("Configlength "+configlength);
+  String[] newconfig = new String[configlength];
+  for (int i = 0; i < config.length; i++) {
+    newconfig[i] = config[i];
+  }
+  //debug("linein"+CLINESIN);
+  //debug("lineout"+CLINESOUT);
+  //debug("Configlength "+newconfig.length);
+  newconfig[CLINESIN] = "in="+SOFTWAREIN;
+  newconfig[CLINESOUT] = "out="+SOFTWARE;
+  saveStrings("config.txt", newconfig);
+}
--- a/Controls.pde
+++ b/Controls.pde
--- a/Defines.pde
+++ b/Defines.pde
@ -0,0 +1,22 @@
+// Static variables
+static final int PAGESELECTOR = 64;
+static final int MFINAL = 9999;
+
+// Button type definitions
+static final int INDICATOR = 0;
+static final int HOLD = 1;
+static final int TOGGLE = 2;
+
+// Control defaults definitions
+static final int SLIDERDEFAULTVALUE = 63;
+static final int FADERDEFAULTVALUE = 0;
+
+// Control out definitions
+static final int ON = 127;
+static final int OFF = 0;
+
+// MIDI status codes
+static final int NOTEON = 0x90;
+static final int NOTEOFF = 0x80;
+static final int CTLCHG = 0xB0;
+static final int PRGCHG = 0xC0;
--- a/Demos.pde
+++ b/Demos.pde
@ -0,0 +1,266 @@
+int yline = 1;
+int ylinel = yline;
+int xline = 1;
+int xlinel = xline;
+int linedelay = 10;
+int tick = 0;
+int demo = 0;
+int sdemo = 0;
+int dtick = 0;
+int stick = 0;
+int skip = 0;
+int dtime = 450;
+boolean shuffledemos = true;
+boolean scrollerSetup = false;
+String letters[] = new String[27];
+static int totalrows;
+String msg;
+boolean msgoverride = false;
+int ml = 9999;
+
+int msgindexes[];
+static boolean bitmap[][];
+
+void setupDemos() {
+  if (DEMOCHOICE != -1) { demo = DEMOCHOICE; shuffledemos = false; }
+  msg = DEMOTEXT.toLowerCase();
+  msgindexes = new int[msg.length()+1];
+  scrollerSetup();
+  sdemo = demo;
+  demo = 0;
+}
+
+void demos() {
+  dtick++;
+  if (dtick == dtime && shuffledemos == true) {
+    dtick = 0;
+    demo = (int)random(0, 7);
+    clearDisplay();
+    //println(demo);
+  }
+  if (demo == 0) randomOnOff();
+  if (demo == 1) ylines();
+  if (demo == 2) xlines();
+  if (demo == 3) xylines(); 
+  if (demo == 4) xlinesn();
+  if (demo == 5) ylinesn();
+  if (demo == 6) scroller();
+}
+
+void overrideBitmap(int line, String data) {
+  if (!scrollerSetup) msgindexes = new int[data.length()+1];
+  msgoverride = true;
+  ml = data.length()+6;
+  msg = "";
+  for (int i = 0; i < ml; i=i+6) {
+    msg = msg+" ";
+  }
+  scrollerSetup();
+  for (int i = 0; i < data.length(); i++) {
+    if (i < ml) bitmap[i][line] = data.substring(i, 1+i).equals("#");
+  }
+  
+  /*println("Bitmap:");
+    for (int y = 0; y < 6; y++) {
+      print("\n");
+      for (int x = 0; x < totalrows; x++) {
+        if (bitmap[x][y] == true) { print("#"); } else { print(" "); }
+      }
+    }
+    println("");*/
+}
+
+void scrollerSetup() {
+  if (!scrollerSetup) {
+    if (!msgoverride) msg = DEMOTEXT.toLowerCase();
+    if (!msgoverride) msg = " "+msg;
+    letters[0] = "000000000000000000000000000000000000";
+    letters[1] = "00#0000#0#00#000#0#####0#000#0#000#0";
+    letters[2] = "####00#000#0####00#000#0#000#0#####0";
+    letters[3] = "00##000#00#0#00000#000000#00#000##00";
+    letters[4] = "###000#00#00#000#0#000#0#00#00###000";
+    letters[5] = "#####0#00000####00#00000#00000#####0";
+    letters[6] = "#####0#00000####00#00000#00000#00000";
+    letters[7] = "00##000#00#0#00000#00##00#00#000##00";
+    letters[8] = "#000#0#000#0#####0#000#0#000#0#000#0";
+    letters[9] = "0###0000#00000#00000#00000#0000###00";
+    letters[10] = "00###0000#00000#00000#00#00#000##000";
+    letters[11] = "#00#00#0#000##0000#0#000#00#00#000#0";
+    letters[12] = "#00000#00000#00000#00000#00000#####0";
+    letters[13] = "0#0#00#0#0#0#0#0#0#000#0#000#0#000#0";
+    letters[14] = "0#00#0#0#0#0#0#0#0#0#0#0#0#0#0#00#00";
+    letters[15] = "0###00#000#0#000#0#000#0#000#00###00";
+    letters[16] = "####00#000#0####00#00000#00000#00000";
+    letters[17] = "0###00#000#0#000#0#0#0#0#00#000##0#0";
+    letters[18] = "####00#000#0####00#0#000#00#00#000#0";
+    letters[19] = "0####0#000000##000000##00000#0####00";
+    letters[20] = "#####000#00000#00000#00000#00000#000";
+    letters[21] = "#000#0#000#0#000#0#000#0#000#00###00";
+    letters[22] = "#000#0#000#00#0#000#0#0000#00000#000";
+    letters[23] = "#000#0#000#0#000#0#0#0#0#0#0#00#0#00";
+    letters[24] = "#000#00#0#0000#0000#0#00#000#0#000#0";
+    letters[25] = "#000#00#0#0000#00000#00000#00000#000";
+    letters[26] = "#####00000#000##000#0000#00000#####0";
+    
+    totalrows = msg.length()*6;
+    bitmap = new boolean[totalrows+8][7];
+    for (int i = 0; i < msg.length(); i++) {
+      if (msg.charAt(i) == ' ') msgindexes[i] = 0;
+      if (msg.charAt(i) == 'a') msgindexes[i] = 1;
+      if (msg.charAt(i) == 'b') msgindexes[i] = 2;
+      if (msg.charAt(i) == 'c') msgindexes[i] = 3;
+      if (msg.charAt(i) == 'd') msgindexes[i] = 4;
+      if (msg.charAt(i) == 'e') msgindexes[i] = 5;
+      if (msg.charAt(i) == 'f') msgindexes[i] = 6;
+      if (msg.charAt(i) == 'g') msgindexes[i] = 7;
+      if (msg.charAt(i) == 'h') msgindexes[i] = 8;
+      if (msg.charAt(i) == 'i') msgindexes[i] = 9;
+      if (msg.charAt(i) == 'j') msgindexes[i] = 10;
+      if (msg.charAt(i) == 'k') msgindexes[i] = 11;
+      if (msg.charAt(i) == 'l') msgindexes[i] = 12;
+      if (msg.charAt(i) == 'm') msgindexes[i] = 13;
+      if (msg.charAt(i) == 'n') msgindexes[i] = 14;
+      if (msg.charAt(i) == 'o') msgindexes[i] = 15;
+      if (msg.charAt(i) == 'p') msgindexes[i] = 16;
+      if (msg.charAt(i) == 'q') msgindexes[i] = 17;
+      if (msg.charAt(i) == 'r') msgindexes[i] = 18;
+      if (msg.charAt(i) == 's') msgindexes[i] = 19;
+      if (msg.charAt(i) == 't') msgindexes[i] = 20;
+      if (msg.charAt(i) == 'u') msgindexes[i] = 21;
+      if (msg.charAt(i) == 'v') msgindexes[i] = 22;
+      if (msg.charAt(i) == 'w') msgindexes[i] = 23;
+      if (msg.charAt(i) == 'x') msgindexes[i] = 24;
+      if (msg.charAt(i) == 'y') msgindexes[i] = 25;
+      if (msg.charAt(i) == 'z') msgindexes[i] = 26;
+    }
+    // Construct the bitmap
+    for (int i = 0; i < msg.length(); i++) {
+      for (int x = 0; x < 6; x++) {
+        for (int y = 0; y < 6; y++) {
+          bitmap[x+i*6][y] = letters[msgindexes[i]].substring(x+y*6, 1+x+y*6).equals("#");
+        }
+      }
+    }
+    /*println("Bitmap:");
+    for (int y = 0; y < 6; y++) {
+      print("\n");
+      for (int x = 0; x < totalrows; x++) {
+        if (bitmap[x][y] == true) { print("#"); } else { print(" "); }
+      }
+    }*/
+    scrollerSetup = true;
+    println("");
+  }
+}
+
+void scroller() {
+  // Run the scroller
+  if (skip == 8) {
+    clearDisplay();
+    for (int x = 0; x < 8; x++) {
+      for (int y = 0; y < 7; y++) {
+        if (bitmap[x+(stick%totalrows)][y] == true) ledOn(x, y+1, SCROLLERCOLOR);
+      }
+    }
+    stick++;
+    skip = 0;
+  }
+  skip++;
+}
+
+void randomOnOff() {
+  ledOn((int)random(8), (int)random(8), randomColor());
+  //ledOff((int)random(8), (int)random(8));
+}
+
+void ylines() {
+  tick++;
+  if (tick == linedelay) {
+    tick = 0;
+    int colorl = BLACK;
+    while (colorl == BLACK) colorl = randomColor();
+    for (int y = 0; y < 8; y++) {
+      ledOff(ylinel, y);
+    }
+    for (int y = 0; y < 8; y++) {
+      ledOn(yline, y, colorl);
+    }
+    ylinel = yline;
+    yline++;
+    if (yline == 8) yline = 0;
+  }
+}
+
+void ylinesn() {
+  tick++;
+  if (tick == linedelay) {
+    tick = 0;
+    int colorl = BLACK;
+    while (colorl == BLACK) colorl = randomColor();
+    /*for (int y = 0; y < 8; y++) {
+      ledOff(ylinel, y);
+    }*/
+    for (int y = 0; y < 8; y++) {
+      ledOn(yline, y, colorl);
+    }
+    ylinel = yline;
+    yline++;
+    if (yline == 8) yline = 0;
+  }
+}
+
+void xlines() {
+  tick++;
+  if (tick == linedelay) {
+    tick = 0;
+    int colorl = BLACK;
+    while (colorl == BLACK) colorl = randomColor();
+    for (int x = 0; x < 8; x++) {
+      ledOff(x, xlinel);
+    }
+    for (int x = 0; x < 8; x++) {
+      ledOn(x, xline, colorl);
+    }
+    xlinel = xline;
+    xline++;
+    if (xline == 8) xline = 0;
+  }
+}
+
+void xlinesn() {
+  tick++;
+  if (tick == linedelay) {
+    tick = 0;
+    int colorl = BLACK;
+    while (colorl == BLACK) colorl = randomColor();
+    /*for (int x = 0; x < 8; x++) {
+      ledOff(x, xlinel);
+    }*/
+    for (int x = 0; x < 8; x++) {
+      ledOn(x, xline, colorl);
+    }
+    xlinel = xline;
+    xline++;
+    if (xline == 8) xline = 0;
+  }
+}
+
+void xylines() {
+  tick++;
+  if (tick == linedelay) {
+    tick = 0;
+    int colorl = BLACK;
+    while (colorl == BLACK) colorl = randomColor();
+    for (int x = 0; x < 8; x++) {
+      ledOff(x, xlinel);
+      ledOff(xlinel, x);
+    }
+    for (int x = 0; x < 8; x++) {
+      ledOn(x, xline, colorl);
+      ledOn(xline, x, colorl);
+    }
+    xlinel = xline;
+    xline++;
+    if (xline == 8) xline = 0;
+  }
+}
--- a/Display.pde
+++ b/Display.pde
@ -0,0 +1,118 @@
+int frameSize = WINDOWSIZE - FRAMEBORDER*2;
+int buttonSize = frameSize / 8;
+int offset = 1;
+boolean displaystate = false;
+boolean dlock = false;
+
+void display(int x, int y, int lcolor) {
+  if (!SILENTMODE) {
+    while (dlock);
+    dlock = true;
+    fill(64, 64, 64);
+    noStroke();
+    smooth();
+    int o = 150;
+    if (x >= 0 && x < 8 && y >= 0 && y < 8 && displaystate) rect((x*buttonSize)+FRAMEBORDER+offset, (y*buttonSize)+FRAMEBORDER+offset, buttonSize-offset, buttonSize-offset);
+    if (lcolor == RED) fill(255, 0, 0, o);
+    if (lcolor == REDL) fill(127, 0, 0, o);
+    if (lcolor == GREEN) fill(0, 255, 0, o);
+    if (lcolor == GREENL) fill(0, 127, 0, o);
+    if (lcolor == AMBER) fill(255, 127, 0, o);
+    if (lcolor == AMBERL) fill(127, 63, 0, o);
+    if (lcolor == YELLOW) fill(255, 255, 0, o);
+    
+    if (lcolor == BLUE) fill(0, 0, 255, o);
+    if (lcolor == BLUEL) fill(0, 0, 127, o);
+    if (lcolor == CYAN) fill(0, 255, 255, o);
+    if (lcolor == CYANL) fill(0, 127, 127, o);
+    if (lcolor == MAGENTA) fill(255, 0, 255, o);
+    if (lcolor == MAGENTAL) fill(127, 0, 127, o);
+    if (lcolor == WHITE) fill(230, 230, 230, o);
+    if (lcolor == WHITEL) fill(180, 180, 200, o);
+    
+    
+    if (x >= 0 && x < 8 && y >= 0 && y < 8 && displaystate) {
+      rect((x*buttonSize)+FRAMEBORDER+offset, (y*buttonSize)+FRAMEBORDER+offset, buttonSize-offset, buttonSize-offset);
+      o = 16;
+      if (lcolor == RED) fill(255, 0, 0, o);
+      if (lcolor == REDL) fill(127, 0, 0, o);
+      if (lcolor == GREEN) fill(0, 255, 0, o);
+      if (lcolor == GREENL) fill(0, 127, 0, o);
+      if (lcolor == AMBER) fill(255, 127, 0, o);
+      if (lcolor == AMBERL) fill(127, 63, 0, o);
+      if (lcolor == YELLOW) fill(255, 255, 0, o);
+      if (lcolor == BLUE) fill(0, 0, 255, o);
+      if (lcolor == BLUEL) fill(0, 0, 127, o);
+      if (lcolor == CYAN) fill(0, 255, 255, o);
+      if (lcolor == CYANL) fill(0, 127, 127, o);
+      if (lcolor == MAGENTA) fill(255, 0, 255, o);
+      if (lcolor == MAGENTAL) fill(127, 0, 127, o);
+      if (lcolor == WHITE) fill(230, 230, 230, o);
+      if (lcolor == WHITEL) fill(200, 200, 200, o);
+      
+      noStroke();
+      for(int i = 30; i > 0; i--) {
+        ellipse((x*buttonSize+(buttonSize/2))+FRAMEBORDER+offset, (y*buttonSize+(buttonSize/2))+FRAMEBORDER+offset, (buttonSize-i*2)-4, (buttonSize-i*2)-4);
+      }
+    }
+    dlock = false;
+  }
+}
+
+void ledOn(int x, int y, int lcolor) {
+  if (displaystate) {
+    int address = (y*16) + x;
+    if (!NETWORK) launchpad.sendOn(address, lcolor, 0);
+    if (online) slaveOn(x, y, lcolor);
+    display(x, y, lcolor);
+  }
+}
+
+void ledOff(int x, int y) {
+  if (displaystate) {
+    int address = (y*16) + x;
+    if (!NETWORK) launchpad.sendOn(address, 0, 0);
+  }
+}
+
+void clearDisplay() {
+  if (displaystate) {
+    if (!NETWORK) launchpad.sendCtl(0, 0, 0);
+    if (online) slaveClear();
+    fill(64, 64, 64);
+    for (int i = 0; i < 64; i++) {
+      if (!SILENTMODE) rect(((i%8)*buttonSize)+FRAMEBORDER+offset, ((int)((float)i/8)*buttonSize)+FRAMEBORDER+offset, buttonSize-offset, buttonSize-offset);
+    }
+  }
+}
+
+void pageName() {
+  pagename = pagenames[selectedPage-1];
+  //debug("pageName()"+pagename);
+  fill(#000000);
+  noStroke();
+  rect(0, WINDOWSIZE-12, 250, 12);
+  fill(#FFFFFF);
+  textFont(f11, 11);
+  smooth();
+  textAlign(LEFT);
+  if (pagename != null) text(pagename, 2, WINDOWSIZE-2);
+}
+
+int randomColor() {
+  colors[0] = BLACK;
+  colors[1] = BLUE;
+  colors[2] = RED;
+  colors[3] = CYAN;
+  colors[4] = AMBER;
+  colors[5] = YELLOW;
+  colors[6] = GREEN;
+  colors[7] = MAGENTA;
+  colors[8] = BLACK;
+  colors[9] = BLACK;
+  colors[10] = BLACK;
+  
+  int select = (int)random(11);
+  
+  return colors[select];
+}
--- a/Documentation/Control
+++ b/Documentation/Control
@ -0,0 +1,72 @@
+This is a brief description of the various control types, for use in the layout.txt file.
+
+Hold button
+	Created with	: button X Y hold
+	example		: button 3 3 hold
+
+Toggle button
+	Created with	: button X Y toggle
+	example		: button 3 3 toggle
+
+Horizontal fader
+	Created with	: xfader X Y SIZE
+	example		: xfader 0 0 8
+
+Vertical fader
+	Created with	: yfader X Y SIZE
+	example		: yfader 0 7 8
+
+Horizontal slider
+	Created with	: xslider X Y SIZE GRANULARITY
+	example		: xslider 0 0 8 5
+
+Vertical slider
+	Created with	: yslider X Y SIZE GRANULARITY
+	example		: yslider 0 7 8 5
+
+Indicator LED
+	Created with	: led X Y
+	example		: led 0 7
+
+2D Pad
+	Created with	: pad X Y XSIZE YSIZE
+	example		: pad 0 0 7 7
+
+Other entries:
+
+New page
+	Created with	: page NUMBER
+	example		: page 1
+	Description	: All controls must be mapped to a specific page
+			  Start the layouts.txt file with the line "page 1"
+			  Define controls for this page beneath it.
+			  When done, add another page entry, "page 2",
+			  define more controls and so forth.
+
+Controller chaining
+	Created with	: chain X1 Y1 to X2 Y2 [send]
+	example		: chain 0 0 to 4 0 yes
+	Description	: The above example chains the controller at 0,0
+			  in the grid to the controller at 4,0 and
+			  instructs the chained controller to also transmit
+			  midi when it is updated. The send argument is
+			  optional, and if it is not set, only the internal
+			  state of the controller will be updated, but it
+			  won't transmit any MIDI, unless physically
+			  activated. Chaining is very useful when you want
+			  several different controls to influence the same
+			  parameter in a piece of software for example.
+			  This will ensure that all the controls on the
+			  Launchpad are in sync, so you wont get any
+			  erratic "jumps".
+
+Bi-directional communication
+	Katapult can handle bi-directional communication, meaning that, as
+	an example, when you change a virtual fader in a piece of software,
+	the corresponding fader on the Launchpad surface is also updated.
+	To use this feature, you must assign MIDI output from your software
+	using the following format: "MIDI channel=Page, CC=(Y*8+X)".
+	So, the MIDI channel your software outputs to determines what page
+	the control is located on, and the CC number corresponds to the
+	position in the grid, where the control is located.
+
--- a/Documentation/Katapult
+++ b/Documentation/Katapult
--- a/Documentation/Libraries.zip
+++ b/Documentation/Libraries.zip
--- a/Documentation/PD
+++ b/Documentation/PD
--- a/Documentation/Required
+++ b/Documentation/Required
@ -0,0 +1,6 @@
+These libraries are required for Katapult to work:
+
+	- oscP5
+	- proMIDI
+
+Also, on OS X at least the "libmmj" java extension is required for Katapult to be able to receive MIDI input.
--- a/Editor.pde
+++ b/Editor.pde
--- a/background.ai
+++ b/background.ai
--- a/Graphics/Katapult.png
+++ b/Graphics/Katapult.png
--- a/Graphics/bg.jpg
+++ b/Graphics/bg.jpg
--- a/Graphics/bg.pxm
+++ b/Graphics/bg.pxm
--- a/Graphics/black.png
+++ b/Graphics/black.png
--- a/Graphics/folder
+++ b/Graphics/folder
--- a/Graphics/folder
+++ b/Graphics/folder
--- a/Graphics/icon.ai
+++ b/Graphics/icon.ai
--- a/Graphics/icon.icns
+++ b/Graphics/icon.icns
--- a/Graphics/icon.png
+++ b/Graphics/icon.png
--- a/Graphics/icon16.png
+++ b/Graphics/icon16.png
--- a/Graphics/icon32.png
+++ b/Graphics/icon32.png
--- a/Layouts.pde
+++ b/Layouts.pde
@ -0,0 +1,324 @@
+static String layout[];
+String pagenames[] = new String[16];
+String pagename = "";
+Control[] grid = new Control[72];
+Control[] shortcuts = new Control[7];
+Control[][] grids = new Control[64][72];
+Control[] takeoverPool = new Control[512];
+int selectedPage = 1;
+int currentPage = selectedPage;
+int numberOfPages = 0;
+int[] pageNumbers = new int[16];
+int customInit = 0;
+
+void loadLayouts() {
+  layout = loadStrings("layout.txt");
+  for (int i = 0; i < layout.length; i++) {
+    String[] entry = split(layout[i], " ");
+    String type = entry[0];
+    if (type.equals("page")) {
+      //if (Integer.parseInt(entry[1]) > numberOfPages) {
+        pageNumbers[numberOfPages] = Integer.parseInt(entry[1]);
+        //println("number "+numberOfPages+" is "+pageNumbers[numberOfPages]);
+        numberOfPages++;
+      //}
+    }
+  }
+}
+
+void reloadLayouts() {
+  for (int igrid = 0; igrid < 64; igrid++) {
+    if (grid[igrid] != null) grid[igrid] = null;
+    for (int icontrol = 0; icontrol < grid.length; icontrol++) {
+      if (grids[igrid][icontrol] != null) grids[igrid][icontrol] = null;
+    }
+  }
+  
+  defaultColors();
+      
+  grid = new Control[72];
+  grids = new Control[64][72];
+  numberOfPages = 0;
+  pageNumbers = new int[16];
+  pagenames = new String[16];
+  pagename = "";
+  takeoverPool = new Control[512];
+  
+  displaystate = true;
+  clearDisplay();
+  displaystate = false;
+  loadLayouts();
+  for (int i = 0; i < numberOfPages; i++) {
+    loadLayout(pageNumbers[i]);
+    loadLayout(PAGESELECTOR);
+  }
+  displaystate = true;
+  loadLayout(1);
+}
+
+void loadLayout(int targetPage) {
+  selectedPage = targetPage;
+  //debug("Current page is " + currentPage);
+  //debug("Selected page is " + selectedPage);
+  if (targetPage == PAGESELECTOR) {
+    // Push active grid to buffer
+    //debug("Pushing to buffer ");
+    for (int i = 0; i < grid.length; i++) {
+      grids[currentPage][i] = grid[i];
+    }
+    
+    // Destroy active grid
+    //debug("Destroying active grid ");
+    for (int i = 0; i < grid.length; i++) {
+      if (grid[i] != null) {
+        grid[i] = null;
+      }
+    }
+    clearDisplay();
+    
+    for (int i = 0; i < numberOfPages; i++) {
+      new PageButton(pageNumbers[i]-1);
+    }
+  } else {
+    // Destroy active grid
+    for (int i = 0; i < grid.length; i++) {
+      if (grid[i] != null) {
+        grid[i] = null;
+      }
+    }
+    clearDisplay();
+    
+    if (grids[selectedPage][64] != null) {
+      // If chosen grid is in buffer, restore it
+      //debug("Restoring from buffer ");
+      for (int i = 0; i < grid.length; i++) {
+        grid[i] = grids[selectedPage][i];
+      }
+      for (int i = 0; i < grid.length; i++) {
+        if (grid[i] != null) {
+          grid[i].update();
+        }
+      }
+      pagename = pagenames[selectedPage-1];
+      pageName();
+    } else {
+      // If not, build it from layout data
+      //debug("Building from data");
+      int page;
+      boolean loadPage = false;
+      for (int i = 0; i < layout.length; i++) {
+        try {
+        String[] entry = split(layout[i], " ");
+        String type = entry[0];
+        
+/*        if (type.equals("global")) {
+          int global = Integer.parseInt(entry[1]);
+          i++;
+          entry = split(layout[i], " ");
+          
+        }*/
+        
+        if (type.equals("page")) { 
+          page = Integer.parseInt(entry[1]);
+          if (page == 1) customChannel = 0;
+          if (page == 16) customChannel = 16;
+          if (entry.length > 2 && page == targetPage) {
+            String pname = "";
+            for (int ii = 2; ii < entry.length; ii++) {
+              pname += entry[ii] + " ";
+            }
+            pagenames[page-1] = pname;
+            pagename = pname;
+            //debug("Building page "+page+", named "+pagename);
+            //debug("Entry was: "+layout[i]);
+          }
+          if (page == targetPage) { loadPage = true; } else { loadPage = false; }
+        }
+        
+        if (loadPage == true) {
+          Control lastControl = null;
+          
+          if (type.equals("oncolor")) {
+            int scolor = parseColor(entry[1]);
+            setOnColors(scolor);
+          }
+          if (type.equals("offcolor")) {
+            int scolor = parseColor(entry[1]);
+            setOffColors(scolor);
+          }
+          if (type.equals("defaultcolors")) {
+            defaultColors();
+          }
+          if (type.equals("button")) {
+            int btype = HOLD;
+            if (entry[3].equals("hold")) { btype = HOLD; }
+            if (entry[3].equals("toggle")) { btype = TOGGLE; }
+            Button button = new Button(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), btype);
+            if (entry.length >= 5) {
+              if (entry[4].equals("persistent")) { button.persistence = true; }
+              
+              String[] velArg = split(entry[4], "=");
+              debug("Entry: "+entry[4]);
+              if (velArg[0].equals("velocity")) {
+                debug("Setting velocity to "+Integer.parseInt(velArg[1])+" on "+button);
+                button.setVelocity(Integer.parseInt(velArg[1]));
+              }
+            }
+            if (entry.length >= 6) {
+              String[] velArg = split(entry[5], "=");
+              debug("Entry: "+entry[5]);
+              if (velArg[0].equals("velocity")) {
+                debug("Setting velocity to "+Integer.parseInt(velArg[1])+" on "+button);
+                button.setVelocity(Integer.parseInt(velArg[1]));
+              }
+            }
+            lastControl = button;
+          }
+          if (type.equals("note")) {
+            Note note = new Note(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), entry[4], Integer.parseInt(entry[5]));
+            if (entry.length > 6) {
+              if (entry[6].equals("toggle")) note.toggle = true;
+            }
+            //lastControl = note;
+          }
+          if (type.equals("rawnote")) {
+            Note note = new Note(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]));
+            if (entry.length > 5) {
+              if (entry[6].equals("toggle")) note.toggle = true;
+            }
+            //lastControl = note;
+          }
+          if (type.equals("cc")) {
+            CC cc = new CC(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]));
+          }
+          if (type.equals("pc")) {
+            PC pc = new PC(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+          }
+          if (type.equals("kbd")) {
+            Kbd kbd = new Kbd(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), entry[3]);
+          }
+          if (type.equals("xfader")) {
+            XFader xfader = new XFader(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            //debug("L"+entry.length);
+            for (int ii = 0; ii < entry.length-4; ii++) {
+              //debug(entry[ii+4]);
+              if (split(entry[ii+4], "=")[0].equals("takeover")) xfader.setTakeover(Integer.parseInt(split(entry[ii+4], "=")[1]));
+            }
+            lastControl = xfader;
+          }
+          if (type.equals("ixfader")) {
+            IXFader ixfader = new IXFader(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            //debug("L"+entry.length);
+            for (int ii = 0; ii < entry.length-4; ii++) {
+              //debug(entry[ii+4]);
+              if (split(entry[ii+4], "=")[0].equals("takeover")) ixfader.setTakeover(Integer.parseInt(split(entry[ii+4], "=")[1]));
+            }
+            lastControl = ixfader;
+          }
+          if (type.equals("yfader")) {
+            YFader yfader = new YFader(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            for (int ii = 0; ii < entry.length-4; ii++) {
+              //debug(entry[ii+4]);
+              if (split(entry[ii+4], "=")[0].equals("takeover")) yfader.setTakeover(Integer.parseInt(split(entry[ii+4], "=")[1]));
+            }
+            lastControl = yfader;
+          }
+          if (type.equals("iyfader")) {
+            IYFader iyfader = new IYFader(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            for (int ii = 0; ii < entry.length-4; ii++) {
+              //debug(entry[ii+4]);
+              if (split(entry[ii+4], "=")[0].equals("takeover")) iyfader.setTakeover(Integer.parseInt(split(entry[ii+4], "=")[1]));
+            }
+            lastControl = iyfader;
+          }
+          if (type.equals("xslider")) {
+            XSlider xslider = new XSlider(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]));
+            lastControl = xslider;
+          }
+          if (type.equals("yslider")) {
+            YSlider yslider = new YSlider(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]));
+            lastControl = yslider;
+          }
+          if (type.equals("xmeter")) {
+            XMeter xmeter = new XMeter(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            lastControl = xmeter;
+          }
+          if (type.equals("ymeter")) {
+            YMeter ymeter = new YMeter(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            lastControl = ymeter;
+          }
+          if (type.equals("crsfader")) {
+            CrsFader crsfader = new CrsFader(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            lastControl = crsfader;
+          }
+          if (type.equals("xprogress")) {
+            XProgress xprogress = new XProgress(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            lastControl = xprogress;
+          }
+          if (type.equals("yprogress")) {
+            YProgress yprogress = new YProgress(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]));
+            lastControl = yprogress;
+          }
+          if (type.equals("chain")) {
+            boolean send = false;
+            if (entry.length >= 7 && entry[6].equals("send")) send = true;
+            int mx = Integer.parseInt(entry[1]);
+            int my = Integer.parseInt(entry[2]);
+            int cx = Integer.parseInt(entry[4]);
+            int cy = Integer.parseInt(entry[5]);
+            grid[my*8+mx].chainTo(grid[cy*8+cx], send);
+          }
+          if (type.equals("channel")) {
+            customChannel = Integer.parseInt(entry[1]);
+          }
+          if (type.equals("init")) {
+            customInit = Integer.parseInt(entry[1]);
+          }
+          if (type.equals("defaultchannels")) {
+            customChannel = 0;
+          }
+          if (type.equals("led")) {
+            new LED(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]));
+          }
+          if (type.equals("drumrack")) {
+            boolean invert = false;
+            debug("LENGTH: "+entry.length);
+            if (entry.length > 8) {
+              if (entry[8].equals("invert")) invert = true;
+            }
+            new Drumrack(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]), Integer.parseInt(entry[5]), entry[6], Integer.parseInt(entry[7]), invert);
+          }
+          if (type.equals("pad")) {
+            Pad pad = new Pad(Integer.parseInt(entry[1]), Integer.parseInt(entry[2]), Integer.parseInt(entry[3]), Integer.parseInt(entry[4]));
+            for (int ii = 0; ii < entry.length-4; ii++) {
+              //debug(entry[ii+4]);
+              if (split(entry[ii+4], "=")[0].equals("takeover")) pad.setTakeover(Integer.parseInt(split(entry[ii+4], "=")[1]));
+              if (split(entry[ii+4], "=")[0].equals("invertx") && split(entry[ii+4], "=")[1].equals("yes") ) pad.invertx();
+              if (split(entry[ii+4], "=")[0].equals("inverty") && split(entry[ii+4], "=")[1].equals("yes") ) pad.inverty();
+            }
+          }
+          
+          if (lastControl != null && customInit != 0) {
+            lastControl.nakedSetValue(customInit);
+          }
+          /* // Universal arguments
+          for (int ii = 0; ii < entry.length; ii++) {
+            String arg = split(entry[ii], "=");
+            if (arg.equals("channel"))
+          }*/
+          }
+        } catch (Exception e) {
+            println("Layout syntax error at: "+layout[i]+"\n"+e);
+        }
+      }
+      
+      new PageButton(64);
+      
+      for (int i = 0; i < 64; i++) {
+        if (grid[i] != null) grid[i].page = selectedPage;
+      }
+    }
+  currentPage = selectedPage;
+  outputChannel = currentPage-1;
+  }
+}
--- a/License.pde
+++ b/License.pde
@ -0,0 +1,58 @@
+import java.security.MessageDigest;
+String dpr;
+
+static String UNLICENSED = "Unlicensed";
+
+class License extends Object {
+  int demotime = 1800;
+  long sessionT;
+  String[] licenseKey;
+  protected boolean valid = false;
+  MessageDigest md;
+  
+  public License() {
+    sessionT = (new Date()).getTime();
+    dpr = "";
+    if (DEBUG) dpr = "/Users/markqvist/Documents/Processing/midikatapult/";
+    licenseKey = loadStrings(dpr+"license.txt");
+    try {
+      //println("License test running...");
+      md = MessageDigest.getInstance("MD5");
+      
+      String[] components = split(licenseKey[0], "-");
+      String id = licenseKey[0].substring(0, 6);
+      String checksum = components[1];
+      //println("id: "+id);
+      //println("checksum: "+checksum);
+      md.reset();
+      md.update(id.getBytes("UTF-8"));
+      byte[] digest = md.digest();
+      String gens = "";
+      for (int i = 0; i < digest.length; i++) {
+        gens += digest[i];
+        //print(" "+(int)digest[i]+" ");
+      }
+      gens = id + gens;
+      //println();
+      //println("F:"+licenseKey[0]);
+      //println("G:"+gens);        // REMOVE!!!
+      if (licenseKey[0].equals(gens)) {
+        valid = true;
+        UNLICENSED = "";
+      }
+    } catch (Exception e) { };
+  }
+  
+  public boolean isValid() {
+    return valid;
+  }
+}
+
+boolean demoIsValid() {
+  long now = (new Date()).getTime();
+  if (now - license.sessionT < license.demotime*1000) {
+    return true;
+  } else {
+    return false;
+  }
+}
--- a/MIDI.pde
+++ b/MIDI.pde
@ -0,0 +1,380 @@
+import javax.sound.midi.*;
+import javax.sound.midi.MidiUnavailableException;
+
+MIDI launchpad;
+MIDI software;
+MIDIListener receiverA;
+MIDIListener receiverB;
+MIDIinput launchpadIn;
+MIDIinput softwareIn;
+
+int outputChannel;
+int customChannel;
+
+///////////////
+
+class MidiMsg extends MidiMessage {
+  MidiMsg(byte[] data) {
+    super(data); 
+  }
+  
+  MidiMsg clone() {
+    return this;
+  }
+}
+
+class MIDI extends Object {
+  MidiDevice device;
+  int deviceNumber = 256;
+  long midiTS = 0;
+  boolean initialised = false;
+  Receiver out = null;
+  Transmitter in = null;
+  public MidiDevice.Info[] infos;
+  
+  public MIDI(String target) {
+    try {
+      //debug("1a");
+      infos = MidiSystem.getMidiDeviceInfo();
+      //debug("1b");
+      //debug("Looking for device: "+target);
+      for (int i = 0; i < infos.length; i++) {
+        //debug(i+": "+infos[i].getName()+", "+infos[i].getDescription()+", "+MidiSystem.getMidiDevice(infos[i]).getMaxReceivers());
+
+        if (target.equals(infos[i].getName()) && (MidiSystem.getMidiDevice(infos[i]).getMaxReceivers() > 0 || MidiSystem.getMidiDevice(infos[i]).getMaxReceivers() == -1)) {
+          deviceNumber = i;
+        }
+      }
+      
+      //debug("Device is number "+deviceNumber);
+      
+      if (deviceNumber != 256) {
+        MidiDevice device = MidiSystem.getMidiDevice(infos[deviceNumber]);
+        device.open();
+        out = device.getReceiver();
+
+        this.initialised = true;
+      } else {
+        this.initialised = false;
+      }
+    } catch (MidiUnavailableException e) {
+      println("Error obtaining device:" + e);
+      this.initialised = false;
+    }
+  }
+    
+  void sendOff(int note, int vel, int channel) {
+    ShortMessage msg = new ShortMessage();
+    try {
+      msg.setMessage(NOTEOFF, channel, note, vel);
+    } catch (InvalidMidiDataException e) {
+      println("Error in "+this+": "+e);
+    }
+    out.send(msg, midiTS);
+    midiTS++;
+  }
+  
+  void sendOn(int note, int vel, int channel) {
+    //debug("sendOn() note="+note+" vel="+vel+" channel="+channel);
+    ShortMessage msg = new ShortMessage();
+    try {
+      msg.setMessage(NOTEON, channel, note, vel);
+    } catch (InvalidMidiDataException e) {
+      println("Error in "+this+": "+e);
+    }
+    if (!NOSEND) out.send(msg, midiTS);
+    midiTS++;
+  }
+  
+  void sendCtl(int note, int vel, int channel) { 
+    ShortMessage msg = new ShortMessage();
+    try {
+      msg.setMessage(CTLCHG, channel, note, vel);
+    } catch (InvalidMidiDataException e) {
+      println("Error in "+this+": "+e);
+    }
+    if (!NOSEND) out.send(msg, midiTS);
+    midiTS++;
+  }
+  
+  void sendPgr(int program, int channel) { 
+    ShortMessage msg = new ShortMessage();
+    try {
+      msg.setMessage(PRGCHG, channel, program, 0);
+    } catch (InvalidMidiDataException e) {
+      println("Error in "+this+": "+e);
+    }
+    if (!NOSEND) out.send(msg, midiTS);
+    midiTS++;
+  }
+  
+  
+  void close() {
+    if (device != null) { 
+      //debug("Closing "+this+" ("+infos[deviceNumber].getName()+")");
+      device.close();
+    }
+  }
+  
+  void reset() {
+    if (device != null) {
+      try {
+        device.close();
+        device.open();
+      } catch (Exception e) {
+        //debug("Exception: "+e);
+      }
+    }
+  }
+}
+
+class MIDIinput extends Object {
+  MidiDevice device;
+  int deviceNumber = 256;
+  boolean initialised = false;
+  Transmitter in = null;
+  MidiDevice.Info[] infos;
+  
+  public MIDIinput(String target, Receiver listener) {
+    try {
+      infos = MidiSystem.getMidiDeviceInfo();
+      //debug("Looking for device: "+target);
+      for (int i = 0; i < infos.length; i++) {
+        //debug(i+": "+infos[i].getName()+", "+infos[i].getDescription()+", "+MidiSystem.getMidiDevice(infos[i]).getMaxTransmitters());
+
+        if (target.equals(infos[i].getName()) && (MidiSystem.getMidiDevice(infos[i]).getMaxTransmitters() > 0 || MidiSystem.getMidiDevice(infos[i]).getMaxTransmitters() == -1)) {
+          deviceNumber = i;
+        }
+      }
+      
+      //debug("Device is number "+deviceNumber);
+      
+      if (deviceNumber != 256) {
+        MidiDevice device = MidiSystem.getMidiDevice(infos[deviceNumber]);
+        device.open();
+        in = device.getTransmitter();
+        in.setReceiver(listener);
+        this.initialised = true;
+      } else {
+        this.initialised = false;
+      }
+    } catch (MidiUnavailableException e) {
+      println("Error obtaining device:" + e);
+      this.initialised = false;
+    }
+  }
+  
+  void close() {
+    if (device != null) { 
+      //debug("Closing "+this+" ("+infos[deviceNumber].getName()+")");
+      device.close();
+    }
+  }
+  
+  void reset() {
+    if (device != null) {
+      try {
+        device.close();
+        device.open();
+      } catch (Exception e) {
+        //debug("Exception: "+e);
+      }
+    }
+  }
+}
+
+class MIDIListener implements Receiver {
+  String context;
+  
+  public MIDIListener(String context) {
+    this.context = context;
+//    super.init();
+  }
+  
+  void close() {
+    
+  }
+  
+  void send(MidiMessage msg, long ts) {
+    ShortMessage smsg = (ShortMessage) msg;
+    int channel = smsg.getChannel();
+    byte[] data = msg.getMessage();
+    debug("Control MIDI: "+data[1]);
+    debug("USERMODE: "+USERMODE);
+    
+    if ((data[0] & 0xFF) == NOTEON) {
+      if (context.equals("Launchpad")) {
+        launchpadAction(data[1], data[2]);
+      }
+      if (context.equals("Software")) {
+        softwareNoteAction(data[1], data[2], channel);
+      }
+    }
+    
+    if ((data[0] & 0xFF) == CTLCHG+channel ) {
+      if (context.equals("Software")) {
+        softwareCtlAction(data[1], data[2], channel);
+      }
+      
+      if (context.equals("Launchpad")) {
+        if (LIVECONTROL == false) {
+          if (data[1] == 107 && data[2] == 127 && currentPage < pageNumbers[numberOfPages-1]) { 
+            selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)+1]; loadLayout(selectedPage);
+          }
+          
+          if (data[1] == 106 && data[2] == 127 && currentPage > 1) {
+            selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)-1]; loadLayout(selectedPage);
+          }
+        }
+        
+        if (data[1] == 111 && data[2] == 127) {
+          if (LIVECONTROL == false) {
+            DEMO = !(DEMO);
+            //debug("Demo " + DEMO);
+            if (DEMO == false) {
+              clearDisplay();
+              loadLayout(currentPage);
+            }
+          }
+        }
+        
+        if (data[1] == 108 && data[2] == 127) {
+          if (LIVEENABLED) {
+            clearDisplay();
+            LIVECONTROL = true;
+            NOSEND = true;
+          } else {
+            reloadLayouts();
+          }
+        }
+        
+        if (data[1] == 109 && data[2] == 127 && USERMODE == 1) {
+          if (USERMODE == 1) {
+            LIVECONTROL = false;
+            NOSEND = false;
+            sleep(500);
+            loadLayout(selectedPage);
+          } else {
+            clearDisplay();
+            LIVECONTROL = true;
+            NOSEND = true;
+          }
+        }
+        
+        if (data[1] == 110 && data[2] == 127 && USERMODE == 2) {
+          if (USERMODE == 2) {
+            LIVECONTROL = false;
+            NOSEND = false;
+            sleep(500);
+            loadLayout(selectedPage);
+          } else {
+            clearDisplay();
+            LIVECONTROL = true;
+            NOSEND = true;
+          }
+        }
+      }
+    }
+    
+    //debug(context+" "+(data[0] & 0xFF)+" "+data[1]+" "+data[2]);
+  }
+}
+
+int lpacount = 0;
+int lpacountmax = 400;
+
+void controlOut(int x, int y, int value) {
+  if (x == 8) {
+    software.sendCtl(65+y, value, outputChannel);
+  } else {
+    software.sendCtl(y*8 + x, value, outputChannel);
+  }
+  outputChannel = currentPage - 1;
+}
+
+void controlOut(int cc, int value) {
+  software.sendCtl(cc, value, outputChannel);
+  outputChannel = currentPage - 1;
+}
+
+void programOut(int program) {
+  software.sendPgr(program, outputChannel);
+  outputChannel = currentPage - 1;
+}
+
+void noteOut(int note, int vel) {
+  software.sendOn(note, vel, outputChannel);
+  outputChannel = currentPage - 1;
+}
+
+void launchpadAction(int segment, int value){
+  if (LIVECONTROL == false) {
+  if (license.isValid() || demoIsValid()) {
+    debug("MIDI from X" + segment + " " + value);
+    if (segment == 8 || segment == 24 || segment == 40 || segment == 56 || segment == 72 || segment == 88 || segment == 104 ) {
+      if (segment == 8) segment = 65;
+      if (segment == 24) segment = 66;
+      if (segment == 40) segment = 67;
+      if (segment == 56) segment = 68;
+      if (segment == 72) segment = 69;
+      if (segment == 88) segment = 70;
+      if (segment == 104) segment = 71;
+    } else {
+      if (segment >= 112) { segment -= 8; }
+      if (segment >= 96) { segment -= 8; }
+      if (segment >= 80) { segment -= 8; }
+      if (segment >= 64) { segment -= 8; }
+      if (segment >= 48) { segment -= 8; }
+      if (segment >= 32) { segment -= 8; }
+      if (segment >= 16) { segment -= 8; }
+    }
+    
+    debug("Translated segment: "+segment);
+    
+    if (segment >= 0 && segment <= 71 && segment != 64) {
+      if (grid[segment] != null) {
+        if (value == 127) { grid[segment].down(); }
+        if (value == 0) { grid[segment].up(); }
+      }
+    } else {
+      if (segment == PAGESELECTOR && value == 127 && !LIVECONTROL) {
+        loadLayout(PAGESELECTOR);
+      }
+    }
+    lpacount++;
+  } else {
+    clearDisplay();
+    background(0);
+    fill(#FFFFFF);
+    textFont(f20, 20);
+    textAlign(CENTER);
+    smooth();
+    text("Demo period expired\nRelaunch or get a license :)", WINDOWSIZE/2, WINDOWSIZE/2);
+    mousestate = "quit";
+  }
+  }
+}
+
+void softwareNoteAction(int segment, int value, int channel) {
+  debug("softwareAction(): " + channel + " " + segment + " " + value);
+  if (channel+1 == currentPage) {
+    if (grid[segment] != null) {
+      grid[segment].nakedSetValue(value);
+      grid[segment].update();
+    }
+  } else {
+    if (grids[channel+1][segment] != null) grids[channel+1][segment].nakedSetValue(value);
+  }
+}
+
+void softwareCtlAction(int segment, int value, int channel) {
+  debug("softwareAction(): " + channel + " " + segment + " " + value);
+    if (channel+1 == currentPage) {
+      if (grid[segment] != null) {
+        grid[segment].nakedSetValue(value);
+        grid[segment].update();
+      }
+    } else {
+      if (grids[channel+1][segment] != null) grids[channel+1][segment].nakedSetValue(value);
+    }
+}
--- a/Menus.pde
+++ b/Menus.pde
@ -0,0 +1,175 @@
+PFont f10;
+PFont f11;
+PFont f14;
+PFont f18;
+PFont f20;
+PFont f40;
+MText katapult;
+MLine mline;
+String state = "nothing";
+String mousestate = "nothing";
+String menustate = "nothing";
+String device = "Launchpad";
+int mselection = 0;
+int mselout = 0;
+int mselmax = 0;
+int menuAnswer = 0;
+
+void menus() {
+  //if (NETWORK) lpdetect = true;
+  if (HEADLESS) { lpdetect = true; NOSEND = true; }
+  if (state.equals("splash")) {
+    background(#000000);
+    if (katapult != null) katapult.draw();
+    if (mline != null) mline.draw();
+    if (mline.isDone() && katapult.isDone() && katapult.y > 35) {
+      katapult.y -= 3;
+      mline.y -= 3;
+      mline.starty -= 3;
+    }
+    if (mline.isDone() && katapult.isDone() && katapult.y <= 35) {
+      if (delay > 0) {
+          delay--;
+      } else {
+        if (lpdetect && menustate.equals("midiout")) {
+          if (mselection != MFINAL && !DEVICECONFIG) {
+            fill(#FFFFFF);
+            textFont(f18, 18);
+            textAlign(CENTER);
+            smooth();
+            text(device+" connected", WINDOWSIZE/2, 65);
+            textFont(f14, 14);
+            textAlign(LEFT);
+            int ii = 0;
+            int[] midilist = new int[256];
+            String midiliststr = "What MIDI port should Katapult send MIDI data to?\n\n";
+            for (int i = 0; i < launchpad.infos.length; i++) {
+              try {
+                if ((MidiSystem.getMidiDevice(launchpad.infos[i]).getMaxReceivers() > 0 || MidiSystem.getMidiDevice(launchpad.infos[i]).getMaxReceivers() == -1) && !(launchpad.infos[i].getName().equals("Launchpad"))) {
+                  midilist[ii] = i;
+                  ii++;
+                }
+              } catch (MidiUnavailableException e) {
+                println("MIDI error while enumerating devices");
+              }
+            }
+            for (int i = 0; i < ii; i++) {
+              midiliststr = midiliststr + "     " + (i+1) + ": " + launchpad.infos[midilist[i]].getName() + "\n";
+            }
+            midiliststr = midiliststr+"\nThis should be set to your software's input port.\nUse the arrow keys and enter to select.";
+            mselmax = ii;
+            text(midiliststr, 5, 105);
+            ellipse(15, 134+(17.5*mselection), 5, 5);
+            SOFTWARESEL = launchpad.infos[midilist[mselection]].getName();
+          } else {
+            SOFTWARE = SOFTWARESEL;
+            menustate = "midiin";
+            mselection = 0;
+          }
+        } else if (lpdetect && menustate.equals("midiin")) {
+          if (mselection != MFINAL && !DEVICECONFIG) {
+            fill(#FFFFFF);
+            textFont(f18, 18);
+            textAlign(CENTER);
+            smooth();
+            text("Launchpad connected", WINDOWSIZE/2, 65);
+            textFont(f14, 14);
+            textAlign(LEFT);
+            int ii = 0;
+            int[] midilist = new int[256];
+            String midiliststr = "What device should Katapult listen for MIDI data on?\n\n";
+            for (int i = 0; i < launchpad.infos.length; i++) {
+              try {
+                if ((MidiSystem.getMidiDevice(launchpad.infos[i]).getMaxTransmitters() > 0 || MidiSystem.getMidiDevice(launchpad.infos[i]).getMaxReceivers() == -1) && !(launchpad.infos[i].getName().equals("Launchpad"))) {
+                  midilist[ii] = i;
+                  ii++;
+                }
+              } catch (MidiUnavailableException e) {
+                println("MIDI error while enumerating devices");
+              }
+            }
+            for (int i = 0; i < ii; i++) {
+              midiliststr = midiliststr + "     " + (i+1) + ": " + launchpad.infos[midilist[i]].getName() + "\n";
+            }
+            midiliststr = midiliststr+"\nThis should be set to your software's output port.\nUse the arrow keys and enter to select.";
+            mselmax = ii;
+            text(midiliststr, 5, 105);
+            ellipse(15, 134+(17.5*mselection), 5, 5);
+            SOFTWAREINSEL = launchpad.infos[midilist[mselection]].getName();
+          } else {
+            SOFTWAREIN = SOFTWAREINSEL;
+            menustate = "saveconfig";
+            mselection = 0;
+          }
+          
+          } else if (lpdetect && menustate.equals("saveconfig")) {
+          if (mselection != MFINAL && !DEVICECONFIG) {
+            fill(#FFFFFF);
+            textFont(f18, 18);
+            textAlign(CENTER);
+            smooth();
+            text("Launchpad connected", WINDOWSIZE/2, 65);
+            textFont(f14, 14);
+            textAlign(LEFT);
+            int ii = 0;
+            int[] midilist = new int[256];
+            String midiliststr = "Save devices choices?\n\n     Yes\n     No\n\n";
+            midiliststr += "If you choose 'yes', your choices will be written\nto the configuration file, and this menu\nwill not be displayed at startup.\n\n";
+            midiliststr += "If you want to edit your devices at a later point\nyou must remove the in/out lines from the\nconfiguration file.";
+            mselmax = 2;
+            text(midiliststr, 5, 105);
+            ellipse(15, 134+(17.5*mselection), 5, 5);
+            menuAnswer = mselection;
+          } else {
+            if (menuAnswer == 0) { saveConfig(); }
+            menustate = "nothing";
+            mselection = 0;
+            DEMO = false;
+            state = "run";
+            noStroke();
+            noFill();
+            background(0);
+            initMidiSystem();
+          }
+          
+        } else if (!lpdetect) {
+          fill(#FFFFFF);
+          textFont(f18, 18);
+          textAlign(CENTER);
+          smooth();
+          text("No Launchpad detected via USB\nWaiting for network connection...", WINDOWSIZE/2, WINDOWSIZE/2);
+          if (!online) {
+            initServer();
+            NETWORK = true;
+            NOSEND = true;
+          }
+          if (slaveConnected) {
+            mousestate = "hold";
+            menustate = "nothing";
+            mselection = 0;
+            device = "iPad";
+            DEMO = false;
+            //HEADLESS = true;
+            NOSEND = false;
+            state = "run";
+            noStroke();
+            noFill();
+            background(0);
+            //initMidiSystem();
+            splash(true);
+          }
+          if (mousestate.equals("hold")) {
+            mousestate = "nothing";
+          } else {
+            mousestate = "quit";
+          }
+        }
+      }
+    }
+    fill(#FFFFFF);
+    textFont(f11, 11);
+    textAlign(RIGHT);
+    smooth();
+    text(UNLICENSED+" v:"+VERSION, WINDOWSIZE-2, WINDOWSIZE-2);
+  }
+}
--- a/Server.pde
+++ b/Server.pde
@ -0,0 +1,133 @@
+import processing.net.*;
+Server slaveServer;
+boolean online;
+boolean slaveConnected;
+boolean wasConnected;
+long lastping;
+int serverPort = 6969;
+
+void initServer() {
+  locatePort();
+  debug("Starting server on port " + serverPort);
+  slaveServer = new Server(this, serverPort);
+  //Server tsrv = new Server(this, serverPort);
+  
+  if (slaveServer != null) {
+    online = true;
+    debug("Server started");
+  } else {
+    debug("Could not initialize server");
+  }
+}
+
+void locatePort() {
+  debug("Locating available port...");
+  boolean foundPort = false;
+  while (!foundPort) {
+    Client probe = new Client(this, "127.0.0.1", serverPort);
+    try {
+      String s = probe.ip();
+      serverPort++;
+    } catch (Exception e) {
+      foundPort = true;
+      
+    }
+  }
+}
+
+void sendToSlave(String message) {
+  if (online) {
+    slaveServer.write(message);
+  }
+}
+
+void readServer() {
+  Client slave;
+  boolean run = true;
+  while (run) {
+    slave = getSlave();
+    if (slave != null) {
+      String message = slave.readString();
+
+      if (message != null && message.equals("CONNECT")) {
+        if (slaveConnected) {
+          debug("Other client tried connection, redirecting");
+          slave.write("meta+trynextTT");
+          message = null;
+        }
+      } 
+      
+      if (message != null) interpretMessage(message);
+    } else {
+      long now = (new Date()).getTime();
+      if (now - lastping >= 2500) {
+        //debug("Last ping: "+(now - lastping));
+        slaveConnected = false;
+      }
+      run = false;
+    }
+  }
+}
+
+void interpretMessage(String message) {
+  debug("---"+message+"---");
+  if (message.equals("CONNECT") && !slaveConnected) {
+      slaveConnected = true;
+      wasConnected = true;
+      lastping = (new Date()).getTime();
+      if (displaystate) loadLayout(selectedPage);
+  }
+  //if (message.equals("DISCONNECT")) slaveConnected = false;
+  String[] messages = split(message, "+T");
+
+  for (int i = 0; i < messages.length-1; i++) {
+    //debug("MSG:"+messages[i]);
+    String[] components = split(messages[i], "+");
+    if (components.length == 2) {
+      if (!components[0].equals("") && !components[1].equals("")) {
+        if (components[0].equals("meta")) {
+          if (allgood) {
+          if (components[1].equals("prev") && currentPage > 1) {
+            selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)-1]; loadLayout(selectedPage);
+          }
+          if (components[1].equals("next") && currentPage < pageNumbers[numberOfPages-1]) {
+            selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)+1]; loadLayout(selectedPage);
+          }
+          }
+          if (components[1].equals("ping")) {
+            lastping = (new Date()).getTime();
+            if (wasConnected) slaveConnected = true;
+          }
+        }
+      }
+    }
+    
+    if (components.length == 3) {
+      if (!components[0].equals("") && !components[1].equals("") && !components[2].equals("")) {
+        int x = Integer.parseInt(components[0]);
+        int y = Integer.parseInt(components[1]);
+        int v = Integer.parseInt(components[2]);
+        launchpadAction(16*y+x,v);
+      }
+    }
+  }
+}
+
+Client getSlave() {
+  Client slave = slaveServer.available();
+  if (slave == null) {
+    return null;
+  } else {
+    return slave;
+  }
+}
+
+void slaveOn(int x, int y, int lcolor) {
+  String message = ""+x+"+"+y+"+"+lcolor+"TT";
+  //debug(message);
+  slaveServer.write(message);
+}
+
+void slaveClear() {
+  slaveServer.write("meta+wipeTT");
+}
--- a/Threads.pde
+++ b/Threads.pde
@ -0,0 +1,279 @@
+static long tcount = 0;
+static long tcount2d = 0;
+
+class Scheduler implements Runnable {
+  Thread thread;
+  Fader target;
+  
+  public Scheduler(Fader target) {
+    this.target = target;
+    tcount++;
+    thread = new Thread(this, "Katapult"+tcount);
+    thread.start();
+  }
+  
+  public void run() {
+    while (!target.canUpdate()) {
+      try {
+        thread.sleep(40);
+      } catch (Exception e) {
+        print(e);
+      }
+    }
+    target.update();
+    target.cancelSchedule();
+  }
+}
+
+class CrsUpdater implements Runnable {
+  Thread thread;
+  CrsFader target;
+  
+  public CrsUpdater(CrsFader target) {
+    this.target = target;
+    tcount++;
+    thread = new Thread(this, "Katapult"+tcount);
+    thread.start();
+  }
+  
+  public void run() {
+    target.running = true;
+    try {
+      debug("Updater thread spawned: "+this);
+      while (target.factor != 0) {
+        target.updateValue();
+        thread.sleep(25);
+      }
+    } catch (Exception e) {
+      
+    }
+    target.running = false;
+    debug("Updater thread died: "+this);
+  } 
+}
+
+class TakeOver implements Runnable {
+  Thread thread;
+  Control target;
+  int targetValue;
+  int initialTargetValue;
+  int mvalue;
+  int initialmvalue;
+  int takeover;
+  long threadnumber;
+  boolean exits = false;
+  
+  public TakeOver(Fader target, int targetValue, int takeover) {
+    tcount++;
+    thread = new Thread(this, "Katapult"+tcount);
+    threadnumber = target.threadsSpawned;
+    this.target = target;
+    this.targetValue = targetValue;
+    this.mvalue = target.value;
+    this.initialmvalue = mvalue;
+    this.takeover = takeover;
+    thread.start();
+  }
+  
+  void cleanUpThreads() {
+    //debug("CLEANUP METHOD CALLED______________________________");
+    target.threadsFinished++;
+    exits = true;   
+  }
+    
+  public void run() {
+    boolean wait = false;
+    long started = (new Date()).getTime();
+    long waitTime = 0;
+    int[] probeValues = new int[4];
+    int probeCount = 3;
+    probeValues[0] = -1;
+    
+    try {
+      //debug("\n\nThread "+target+" running.\ntn="+threadnumber+"\ntf="+target.threadsFinished);
+      if (target.threadsFinished >= target.threadsSpawned) target.threadsFinished = threadnumber - 1;
+      
+      if (!(target.threadsFinished == threadnumber - 1)) wait = true;
+      while (wait) {
+
+          thread.sleep((int)(1000/FRAMERATE));
+          waitTime = (new Date()).getTime() - started;
+          probeValues[probeCount] = target.value;
+          probeCount--; if (probeCount == -1) probeCount = 3;
+          if (waitTime > 45 && probeValues[0] == probeValues[1] && probeValues[1] == probeValues[2] && probeValues[2] == probeValues[3]) cleanUpThreads();
+      
+          //debug(target+" sleeping. tn "+threadnumber+" tf "+target.threadsFinished);
+          if (!(target.threadsFinished == threadnumber - 1)) { wait = true; } else { wait = false; }
+          if (exits) wait = false;
+      }
+      
+      //debug(target+" got past que wait");
+      
+      thread.sleep(25);
+      
+      this.mvalue = target.value;
+      this.initialmvalue = mvalue;
+      target.TLOCK = true;
+      target.TAKEOVER = true;
+      
+      if (!(exits)) {
+        //debug(target+" starting takeover. targetValue="+targetValue+" mvalue="+mvalue);
+        
+        if (initialmvalue < targetValue) {
+          for (int i = 0; i < targetValue-initialmvalue; i++) {
+          //while (mvalue < targetValue && target.page == selectedPage) {
+            //debug(target+" in takeover. mvalue="+mvalue);
+            mvalue += 1;
+            //debug(target+" waiting for "+takeover+" mills");
+            //try {
+              thread.sleep(takeover);
+            //} catch (Exception e) {
+            //  debug("Exception while sleeping "+target+":\n"+e);
+            //}
+            target.takeoverSetValue(mvalue);
+          //}
+          }
+        }
+        
+        if (initialmvalue > targetValue && target.page == selectedPage) {
+          for (int i = 0; i < initialmvalue-targetValue; i++) {
+          //while (mvalue > targetValue) {
+            //debug(target+" in takeover. mvalue="+mvalue);
+            mvalue -= 1;
+            //debug(target+" waiting for "+takeover+" mills");
+            //try {
+              thread.sleep(takeover);
+            //} catch (Exception e) {
+            //  debug("Exception while sleeping "+target+":\n"+e);
+            //}
+            target.takeoverSetValue(mvalue);
+          //}
+          }
+        }
+        //debug(target+" takeover finished");
+      } else {
+        //debug("Closing hanging thread "+thread);
+      }
+      target.threadsFinished++;
+      //debug(target+" sleeping for cleanup");
+      //try {
+        thread.sleep(1000);
+      //} catch (Exception e) {
+      //  debug("Exception while sleeping "+target+":\n"+e);
+      //}
+      if (target.threadsFinished == target.threadsSpawned) target.TAKEOVER = false;
+      //debug(target+" terminating");
+    } catch (Exception e) {
+      target.threadsFinished++;
+      if (target.threadsFinished == target.threadsSpawned) target.TAKEOVER = false;
+      //debug("Exception in takeover thread "+tcount+"\n"+e);
+    }
+   }
+}
+
+class TakeOver2d implements Runnable {
+  Thread thread;
+  Pad target;
+  float targetXValue;
+  float targetYValue;
+  float initialTargetXValue;
+  float initialTargetYValue;
+  float mxvalue;
+  float myvalue;
+  float initialmxvalue;
+  float initialmyvalue;
+  float xstep;
+  float ystep;
+  float xdiff;
+  float ydiff;
+  float xdir;
+  float ydir;
+  float steps;
+  int takeover;
+  long threadnumber;
+  
+  public TakeOver2d(Pad target, int targetXValue, int targetYValue, int takeover) {
+    tcount2d++;
+    thread = new Thread(this, "Katapult2d"+tcount2d);
+    threadnumber = target.threadsSpawned;
+    this.target = target;
+    this.targetXValue = targetXValue;
+    this.targetYValue = targetYValue;
+    this.takeover = takeover;
+    thread.start();
+  }
+    
+  public void run() {
+    
+    while (!(target.threadsFinished == threadnumber - 1)) {
+      try {
+        thread.sleep((int)(1000/FRAMERATE));
+      } catch (Exception e) {
+        //debug("Exception while sleeping "+this+":\n"+e);
+      }
+    }
+    
+    target.TAKEOVER = true;
+    
+    mxvalue = target.xvalue;
+    myvalue = target.yvalue;
+    initialmxvalue = mxvalue;
+    initialmyvalue = myvalue;
+    xdiff = targetXValue - mxvalue;
+    ydiff = targetYValue - myvalue;
+    
+    if (xdiff < 0) xdir = -1;
+    if (xdiff > 0) xdir = 1;
+    if (ydiff < 0) ydir = -1;
+    if (ydiff > 0) ydir = 1;
+    
+    if (abs(xdiff) > abs(ydiff)) {
+      steps = abs(xdiff);
+      xstep = 1;
+      ystep = abs(ydiff) / abs(xdiff);
+    }
+    
+    if (abs(ydiff) > abs(xdiff)) {
+      steps = abs(ydiff);
+      ystep = 1;
+      xstep = abs(xdiff) / abs(ydiff);
+    }
+    
+    if (abs(xdiff) == abs(ydiff)) {
+      xstep = 1;
+      ystep = 1;
+      steps = abs(xdiff);
+    }
+    
+    //debug("Starting takeover");
+    //debug("Target x value="+targetXValue);
+    //debug("Target y value="+targetYValue);
+    //debug("xdiff="+xdiff);
+    //debug("ydiff="+ydiff);
+    //debug("initialmxvalue="+mxvalue);
+    //debug("initialmyvalue="+myvalue);
+    //debug("xdir="+xdir);
+    //debug("ydir="+ydir);
+    //debug("xstep="+xstep);
+    //debug("ystep="+ystep);
+    //debug("steps="+steps);
+    
+    for (int i = 0; i < steps; i++) {
+      mxvalue += xstep*xdir;
+      myvalue += ystep*ydir;
+      //debug(target+" in takeover. mxvalue="+mxvalue+" myvalue="+myvalue);
+      target.takeoverSetValue((int)round(mxvalue), (int)round(myvalue));
+      //debug("Waiting for "+takeover+" mills");
+      sleep(takeover);
+    }
+    
+    target.threadsFinished++;
+    try {
+      thread.sleep(1000);
+    } catch (Exception e) {
+      //debug("Exception while sleeping "+this+":\n"+e);
+    }
+    if (target.threadsFinished == target.threadsSpawned) target.TAKEOVER = false;
+  }
+}
+
--- a/XNotes.pde
+++ b/XNotes.pde
@ -0,0 +1,33 @@
+/*
+
+----
+to do
+
+Page shortcuts on side buttons
+Visual feedback on side buttons
+
+Initial value -- add to docs -- done
+0-value mid somehow
+
+
+Live support -- add to docs -- done
+side buttons -- add to docs -- done
+switch control (xswitch x y size cc value,value,value,value)
+drumrack inverty -- add to docs -- done
+fader invert -- add to docs -- done
+button velocity -- add to docs -- done
+xfader control -- add to docs -- done
+note hold -- add to docs -- done
+fix octaves -- done
+
+side controls:
+button - good
+note - good
+rawnote - good
+cc - good
+pc - good
+kbd - good
+input routing!! -- seems good, test more (channels)
+
+save state
+*/
--- a/config.txt
+++ b/config.txt
@ -0,0 +1,82 @@
+abletonlive=yes
+liveusermode=1
+//headless=yes
+
+// <- These two slashes means, that a line is a comment.
+// If you want to use any of the example configuration lines
+// in this file, remove the slashes, and the following space,
+// so the config command is the very first thing on the line.
+// For example: "in=Traktor Out".
+
+// This is Katapults config file. In this file, you can
+// define various options, such as MIDI input/output devices
+// and default colors for controls
+
+// You can set the input device with a line like this:
+
+// in=Traktor Out
+
+// You can set the output device with a line like this:
+
+// out=Traktor In
+
+// If you want Katapult to run in silent mode, use this line:
+
+// silent=yes
+
+// In silent mode, Katapult will not display any user interface,
+// thus saving CPU and making updates faster. This is especially
+// a good idea if you want to use MIDI intensive displays on the
+// Launchpad, such as volume output meters.
+// Note that you MUST specify input and output devices in this
+// file if you want Katapult to run in silent mode.
+
+// You can also define the default colors for the controls here.
+// The following lines are an example:
+
+// holdoncolor=green
+// holdoffcolor=amber
+// toggleoncolor=green
+// toggleoffcolor=amber
+// faderoncolor=red
+// faderoffcolor=green
+// slideroncolor=greenlow
+// slideroffcolor=green
+// pagebuttononcolor=amber
+// pagebuttonoffcolor=amber
+// indicatoroncolor=green
+// indicatoroffcolor=red
+// padoncolor=yellow
+// padoffcolor=amber
+// meteroncolor=green
+// meteroffcolor=amber
+// progressoncolor=green
+// progressoffcolor=red
+// noteoncolor=green
+// noteoffcolor=yellow
+// cconcolor=yellow
+// ccoffcolor=yellow
+// kbdoncolor=greenl
+// kbdoffcolor=green
+
+// See the documentation for a list of usable colors.
+
+// Katapult can be started in headless mode by using this line:
+
+// headless=yes
+
+// You can customize the demo being shown when pressing the mixer
+// button by using the following commands:
+
+demochoice=6
+
+// choices here are 1-6, where 6 is a text scroller. Specify the
+// text like this:
+
+demotext=sarah
+demotextcolor=red
+
+// Or create your own bitmap and display whatever you want
+// like this
+in=Out
+out=In
--- a/data/10.vlw
+++ b/data/10.vlw
--- a/data/11.vlw
+++ b/data/11.vlw
--- a/data/14.vlw
+++ b/data/14.vlw
--- a/data/18.vlw
+++ b/data/18.vlw
--- a/data/20.vlw
+++ b/data/20.vlw
--- a/data/40.vlw
+++ b/data/40.vlw
--- a/genlicense.php
+++ b/genlicense.php
@ -0,0 +1,14 @@
+<?php
+function genlic($input) {
+    $md5string = md5($input);
+    $license = $input;
+    for ($i = 0; $i < strlen($md5string)/2; $i++) {
+        $dec = hexdec((substr($md5string, $i*2, 2)));
+        if ($dec > 128) {
+            $dec = -(256 - $dec);
+        }
+        $license .= $dec;
+    }
+    return $license;
+}
+?>
--- a/layout.txt
+++ b/layout.txt
@ -0,0 +1,234 @@
+// <- These two slashes means "this line is a comment"
+
+// Lets start creating a layout.
+// First of all, we need at least one page, so lets create one by
+// writing:
+
+page 1 Transport & EQ
+
+// Pages can be named as well. Just write the name after the
+// page number, as above.
+
+// So far, so good. Now let's create some controls.
+// First some hold and toggle buttons:
+
+crsfader 0 6 8
+
+note 0 4 3 c 120
+note 1 4 3 d 120 toggle
+note 2 4 3 e 120
+note 3 4 3 f 120
+
+button 0 0 toggle velocity=89
+button 1 0 toggle
+button 2 0 hold
+button 3 0 toggle
+
+button 0 1 hold
+button 1 1 hold
+button 2 1 hold
+button 3 1 hold
+
+// And then some faders:
+
+//yfader 0 7 5 takeover=1
+//yfader 1 7 5 takeover=1
+//yfader 2 7 5 takeover=1
+//yfader 3 7 5 takeover=1
+
+// These faders have takeover activated on them.
+// This means that they'll move smoothly from one
+// value to another. This takeover is set to the
+// fastest (1 millisecond). If you want them to
+// update slower, increase the takeover value.
+
+// That fills up the left half of the Launchpad
+// Lets just duplicate it for the other half,
+// This will serve as a good starting point
+// for controlling two decks in Traktor, for
+// example.
+
+button 4 0 toggle
+button 5 0 toggle
+button 6 0 hold
+button 7 0 toggle
+
+button 4 1 hold
+button 5 1 hold
+button 6 1 hold
+button 7 1 hold
+
+//yfader 4 7 5 takeover=1
+//yfader 5 7 5 takeover=1
+//yfader 6 7 5 takeover=1
+//yfader 7 7 5 takeover=1
+
+button 0 2 toggle
+button 1 2 toggle
+button 2 2 hold
+button 3 2 hold
+button 4 2 toggle
+button 5 2 toggle
+button 6 2 hold
+button 7 2 hold
+
+// For demonstration purposes, heres a couple more pages.
+// These are not mapped to anything in the supplied
+// Traktor layouts, so you can go ahead and assign the
+// controls yourself :) Get creative!
+
+page 2 FX Pad 1
+
+oncolor red
+pad 0 0 7 7 takeover=1
+oncolor green
+button 0 7 toggle
+yfader 7 7 8 takeover=1
+
+page 3 FX Pad 2
+oncolor red
+pad 0 0 8 8 takeover=1
+
+page 4 Controller chaining
+
+xfader 0 0 8 takeover=8
+yfader 0 7 6
+yfader 2 7 5
+yfader 4 7 3
+yfader 6 7 4
+
+button 4 2 toggle
+button 5 3 toggle
+button 6 2 toggle
+button 7 2 toggle
+
+chain 0 0 to 0 7
+chain 0 7 to 2 7
+chain 2 7 to 4 7
+chain 4 7 to 6 7
+
+chain 4 2 to 0 7
+chain 5 3 to 2 7
+chain 6 2 to 4 7
+chain 7 2 to 6 7
+
+page 5 Custom color examples
+
+oncolor green
+
+offcolor yellow
+button 0 0 toggle
+button 0 1 toggle
+button 0 2 toggle
+button 0 3 toggle
+button 0 4 toggle
+button 0 5 toggle
+button 0 6 toggle
+button 0 7 toggle
+
+offcolor red
+button 1 0 toggle
+button 1 1 toggle
+button 1 2 toggle
+button 1 3 toggle
+button 1 4 toggle
+button 1 5 toggle
+button 1 6 toggle
+button 1 7 toggle
+
+offcolor yellow
+button 2 0 toggle
+button 2 1 toggle
+button 2 2 toggle
+button 2 3 toggle
+button 2 4 toggle
+button 2 5 toggle
+button 2 6 toggle
+button 2 7 toggle
+
+offcolor red
+button 3 0 toggle
+button 3 1 toggle
+button 3 2 toggle
+button 3 3 toggle
+button 3 4 toggle
+button 3 5 toggle
+button 3 6 toggle
+button 3 7 toggle
+
+offcolor yellow
+button 4 0 toggle
+button 4 1 toggle
+button 4 2 toggle
+button 4 3 toggle
+button 4 4 toggle
+button 4 5 toggle
+button 4 6 toggle
+button 4 7 toggle
+
+offcolor red
+button 5 0 toggle
+button 5 1 toggle
+button 5 2 toggle
+button 5 3 toggle
+button 5 4 toggle
+button 5 5 toggle
+button 5 6 toggle
+button 5 7 toggle
+
+offcolor yellow
+button 6 0 toggle
+button 6 1 toggle
+button 6 2 toggle
+button 6 3 toggle
+button 6 4 toggle
+button 6 5 toggle
+button 6 6 toggle
+button 6 7 toggle
+
+offcolor red
+button 7 0 toggle
+button 7 1 toggle
+button 7 2 toggle
+button 7 3 toggle
+button 7 4 toggle
+button 7 5 toggle
+button 7 6 toggle
+button 7 7 toggle
+
+defaultcolors
+
+page 6 Four 2D Pads
+
+offcolor green
+oncolor red
+pad 0 0 4 4 takeover=1
+pad 4 4 4 4 takeover=1
+
+offcolor amber
+pad 4 0 4 4
+pad 0 4 4 4
+
+page 7 One big 2D Pad
+pad 0 0 8 8 takeover=4
+
+defaultcolors
+
+page 8 Drumracks
+drumrack 0 0 4 4 3 c 115
+drumrack 4 4 4 4 5 c 120
+
+page 9 Keyboard shortcuts
+kbd 0 0 command+tab
+kbd 1 0 shift+a
+kbd 2 0 b
+kbd 3 0 c
+
+page 10
+oncolor green
+offcolor red
+xslider 0 3 8 4
+
+note 0 0 3 c 120
+button 1 0 toggle
+chain 1 0 to 0 0
--- a/license.txt
+++ b/license.txt
@ -0,0 +1 @@
+49868712848-28-38-65521081-9666-171083-13
--- a/midikatapult.app/Contents/Info.plist
+++ b/midikatapult.app/Contents/Info.plist
@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleName</key>
+	<string>midikatapult</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<string>true</string>
+	<key>CFBundleExecutable</key>
+	<string>JavaApplicationStub</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleIconFile</key>
+	<string>sketch.icns</string>
+	<key>CFBundleIdentifier</key> 
+	<string>midikatapult</string>
+<!-- http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/PListKeys.html#//apple_ref/doc/uid/20001431-113616 -->
+        <key>LSUIPresentationMode</key>
+        <integer>0</integer>
+	<key>Java</key>
+	<dict>
+		<key>VMOptions</key>
+		<string></string>
+		<key>MainClass</key>
+		<string>midikatapult</string>
+		<key>JVMVersion</key>
+		<string>1.5*</string>
+                <key>JVMArchs</key>
+		<array>
+		  <string>i386</string>
+		  <string>ppc</string>
+		</array> 
+		<key>ClassPath</key>
+		<string>$JAVAROOT/midikatapult.jar:$JAVAROOT/core.jar:$JAVAROOT/net.jar</string>
+
+		<key>Properties</key>
+		<!-- http://developer.apple.com/releasenotes/Java/java141/system_properties/chapter_4_section_1.html#//apple_ref/doc/uid/TP30000285 -->
+		<dict>
+			<key>apple.laf.useScreenMenuBar</key>
+			<string>true</string>
+			<key>apple.awt.showGrowBox</key>
+			<string>false</string>
+			<key>com.apple.smallTabs</key>
+			<string>true</string>
+			<key>apple.awt.Antialiasing</key>
+			<string>false</string>
+			<key>apple.awt.TextAntialiasing</key>
+			<string>true</string>
+			<key>com.apple.hwaccel</key>
+			<string>true</string>
+			<key>apple.awt.use-file-dialog-packages</key>
+			<string>false</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
--- a/midikatapult.app/Contents/MacOS/JavaApplicationStub
+++ b/midikatapult.app/Contents/MacOS/JavaApplicationStub
--- a/midikatapult.app/Contents/MacOS/JavaApplicationStub64
+++ b/midikatapult.app/Contents/MacOS/JavaApplicationStub64
--- a/midikatapult.app/Contents/PkgInfo
+++ b/midikatapult.app/Contents/PkgInfo
@ -0,0 +1 @@
+APPL????
--- a/midikatapult.app/Contents/Resources/Java/core.jar
+++ b/midikatapult.app/Contents/Resources/Java/core.jar
--- a/midikatapult.app/Contents/Resources/Java/midikatapult.jar
+++ b/midikatapult.app/Contents/Resources/Java/midikatapult.jar
--- a/midikatapult.app/Contents/Resources/Java/net.jar
+++ b/midikatapult.app/Contents/Resources/Java/net.jar
--- a/midikatapult.app/Contents/Resources/sketch.icns
+++ b/midikatapult.app/Contents/Resources/sketch.icns
--- a/midikatapult.pde
+++ b/midikatapult.pde
@ -0,0 +1,143 @@
+License license = new License();
+boolean lpdetect = false;
+boolean allgood = false;
+int delay;
+
+void setup(){
+  loadConfig();
+  setupDemos();
+  f10 = loadFont("10.vlw");
+  f11 = loadFont("11.vlw");
+  f14 = loadFont("14.vlw");
+  f18 = loadFont("18.vlw");
+  f20 = loadFont("20.vlw");
+  f40 = loadFont("40.vlw");
+  size(WINDOWSIZE, WINDOWSIZE);
+  background(0);
+  frameRate(FRAMERATE);
+  launchpad = new MIDI("Launchpad");
+  if (launchpad.initialised) launchpad.sendCtl(0, 0, 0);
+  sleep(500);
+  if (launchpad.initialised) launchpad.sendCtl(0, 0, 0);
+  
+  if (launchpad.initialised) {
+    //debug("Launchpad detected, huzzah!");
+    launchpad.reset();
+    splash(true);
+  } else {
+    //debug("Oh sorrow... No Launchpad was detected...");
+    splash(false);
+  }
+}
+
+void splash(boolean success) {
+  if (SILENTMODE) {
+    if (!SOFTWARE.equals("") && !SOFTWAREIN.equals("")) {
+      fill(#FFFFFF);
+      textFont(f10, 10);
+      textAlign(LEFT);
+      smooth();
+      text("Out: "+SOFTWARE+"\nIn: "+SOFTWAREIN, 2, 12);
+      initMidiSystem();
+    } else {
+      SILENTMODE = false;
+    }
+  }
+  if (!SILENTMODE) {
+    if (success) { launchpad.reset(); DEMO = true; displaystate = true; }
+    lpdetect = success;
+    delay = 15;
+    state = "splash";
+    menustate = "midiout";
+    katapult = new MText("Katapult", 0, WINDOWSIZE/2);
+    mline = new MLine(WINDOWSIZE, WINDOWSIZE/2+3);
+    katapult.setDestination(WINDOWSIZE/2, WINDOWSIZE/2);
+    katapult.setDuration(16);
+    mline.setDestination(0, WINDOWSIZE/2+3);
+    mline.setDuration(20);
+    mline.animate();
+    katapult.animate();
+  }
+}
+
+void initMidiSystem() {
+  //debug("Initiaing MIDI system...");
+  //debug("SOFTWARE: " + SOFTWARE);
+  //debug("SOFTWAREIN: " + SOFTWAREIN);
+  receiverA = new MIDIListener("Launchpad");
+  receiverB = new MIDIListener("Software");
+  software = new MIDI(SOFTWARE);
+  softwareIn = new MIDIinput(SOFTWAREIN, receiverB);
+  launchpadIn = new MIDIinput("Launchpad", receiverA);
+  software.reset();
+  softwareIn.reset();
+  launchpadIn.reset();
+  
+  displaystate = true;
+  clearDisplay();
+  displaystate = false;
+  loadLayouts();
+  for (int i = 0; i < numberOfPages; i++) {
+    loadLayout(pageNumbers[i]);
+    loadLayout(PAGESELECTOR);
+  }
+  displaystate = true;
+  loadLayout(1);
+  demo = sdemo;
+  allgood = true;
+}
+
+void draw() {
+  if (online) readServer();
+  if (DEMO) demos();
+  menus();
+}
+
+void cleanup() {
+  clearDisplay();
+  if (launchpad != null) launchpad.close();
+  if (software != null) software.close();
+  if (launchpadIn != null) launchpadIn.close();
+  if (softwareIn != null) softwareIn.close();
+}
+
+public void stop() {
+  //debug("Cleaning up...");
+  cleanup();
+  //debug("Cleanup done");
+  println("Coding monkey and sewing monkey are the supreme rulers of the world");
+  clearDisplay();
+  super.stop();
+} 
+
+void mousePressed() {
+  if (mousestate.equals("quit")) {
+    displaystate = false;
+    clearDisplay();
+    exit();
+  }
+}
+
+void keyPressed() {
+  if ((int)keyCode == 40 && mselection < mselmax - 1) mselection = (mselection + 1)%mselmax;
+  if ((int)keyCode == 38 && mselection > 0) mselection = (mselection - 1)%mselmax;
+  if ((int)keyCode == 10) { mselout = mselection; mselection = MFINAL; }
+  if ((int)keyCode == 37 && (HEADLESS == true || NETWORK == true) && currentPage > 1) {  selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)-1]; loadLayout(selectedPage); }
+  if ((int)keyCode == 39 && (HEADLESS == true || NETWORK == true) && currentPage < pageNumbers[numberOfPages-1]) { selectedPage = pageNumbers[indexForKey(pageNumbers, selectedPage)+1]; loadLayout(selectedPage); }
+  if ((int)keyCode == 80 && (HEADLESS == true || NETWORK == true || LIVEENABLED == true)) { reloadLayouts(); }
+  //if ((int)keyCode == 80 && (HEADLESS == true || NETWORK == true)) { DEMO = !(DEMO); }
+//  if ((int)keyCode == 27) cleanup();
+}
+
+// Testing functions
+
+void debug(String msg) {
+  if (DEBUG) println(msg);
+}
+
+int indexForKey(int[] a, int target) {
+  for (int i = 0; i < a.length; i++) {
+    if (a[i] == target) return i;
+  }
+  return 0;
+}