Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam

author: Oli <olivier.beloanger@umontreal.ca> 2007-07-30 05:04:35 (GMT)
committer: Oli <olivier.beloanger@umontreal.ca> 2007-07-30 05:04:35 (GMT)
commit: 143f535abcf66b6bb16ac3ae2be33f53233411c9 (patch)
tree: 9a36cae458890789ae4cc1c52c027b4678b05c0b
parent: a422f5df140f489ff34c4d0e78d2f51831035f9e (diff)
parent: 8d2150a51306c0fc95cbadb4e9aae6be47f9b064 (diff)
46 files changed, 1844 insertions, 451 deletions
diff --git a/.gitignore b/.gitignore
index d024028..1d01f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *pyc
 *~
 *.kpf
+*.xo
+\ No newline at end of file
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py
new file mode 100644
index 0000000..67bf1ce
--- /dev/null
+++ b/Edit/EditToolbars.py
@@ -0,0 +1,221 @@
+#!/usr/bin/env python
+
+import gtk
+import Config
+
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.toggletoolbutton import ToggleToolButton
+from sugar.graphics.palette import Palette
+from sugar.graphics.icon import Icon
+from Util.ThemeWidgets import *
+from gettext import gettext as _
+
+class mainToolbar(gtk.Toolbar):
+    def __init__(self,toolbox, edit):
+        gtk.Toolbar.__init__(self)
+
+        def _insertSeparator(x = 1):
+            for i in range(x):
+                self.separator = gtk.SeparatorToolItem()
+                self.separator.set_draw(True)
+                self.insert(self.separator,-1)
+                self.separator.show()   
+
+        self.toolbox = toolbox
+        self.edit = edit
+
+        self.tooltips = gtk.Tooltips()
+
+        #Play button
+        self._playPalette = playPalette(_('Play / Stop'), self.edit)
+        self.playButton = ToggleToolButton('play')
+        self.playButton.set_palette(self._playPalette)
+        #self.playButton.connect(None)
+        self.insert(self.playButton, -1)
+        self.playButton.show()
+        
+        #Rewind button
+        self.rewindButton = ToggleToolButton('rewind')
+        #self.rewindButton.connect(None)
+        self.insert(self.rewindButton, -1)
+        self.rewindButton.show()
+        
+        #Record button
+        self._generationPalette = generationPalette(_('Generation'), self.edit)
+        self.recordButton = ToggleToolButton('record')
+        #self.recordButton.connect(None)
+        self.recordButton.set_palette(self._generationPalette)
+        self.insert(self.recordButton, -1)
+        self.recordButton.show()
+        
+        _insertSeparator(2)
+        
+        #Pencil button
+        self._pencilPalette = pencilPalette(_('Draw Tool'), self.edit)
+        self.pencilButton = ToggleToolButton('pencil')
+        self.pencilButton.set_palette(self._pencilPalette)
+        #self.pencilButton.connect(None)
+        self.insert(self.pencilButton, -1)
+        self.pencilButton.show()
+        
+        _insertSeparator(4)
+        
+        #Volume / Tempo button
+        self._volumeTempoPalette = volumeTempoPalette(_('Volume / Tempo'), self.edit)
+        self.volumeTempoButton = ToggleToolButton('voltemp')
+        self.volumeTempoButton.set_palette(self._volumeTempoPalette)
+        #self.volumeTempoButton.connect(None)
+        self.insert(self.volumeTempoButton, -1)
+        self.volumeTempoButton.show()
+        
+        #Properties button
+        self._propsPalette = propsPalette(_('Properties'), self.edit)
+        self.propsButton = ToggleToolButton('props')
+        self.propsButton.set_palette(self._propsPalette)
+        #self.propsButton.connect(None)
+        self.insert(self.propsButton, -1)
+        self.propsButton.show()   
+        
+class playPalette(Palette):
+    def __init__(self, label, edit):
+        Palette.__init__(self, label)
+        
+        self.edit = edit
+        
+class pencilPalette(Palette):
+    def __init__(self, label, edit):
+        Palette.__init__(self, label)
+        
+        self.edit = edit
+        
+        self.pencilBox = gtk.VBox()
+        
+        self.checkbox = gtk.CheckButton(label = _('Non-continuous'))
+        
+        self.timeSigHBox = gtk.HBox()
+        self.timeSigImage = gtk.Image()
+        self.timeSigImage.set_from_file(Config.TAM_TAM_ROOT + '/icons/notedur.svg')
+        self.timeSigBox = gtk.combo_box_new_text()
+        self.timeSigBox.append_text(_('1/2'))
+        self.timeSigBox.append_text(_('1/4'))
+        self.timeSigBox.append_text(_('1/8'))
+        self.timeSigBox.append_text(_('1/16'))
+        self.timeSigBox.append_text(_('1/32'))
+        self.timeSigBox.set_active(0)
+        self.timeSigHBox.pack_start(self.timeSigImage, False, False, padding = 5)
+        self.timeSigHBox.pack_start(self.timeSigBox, False, False, padding = 5)
+        
+        self.pencilBox.pack_start(self.checkbox, False, False, padding = 5)
+        self.pencilBox.pack_start(self.timeSigHBox, False, False, padding = 5)
+        self.pencilBox.show_all()
+        
+        self.set_content(self.pencilBox)
+            
+    
+class volumeTempoPalette(Palette):
+    def __init__(self, label, edit):
+        Palette.__init__(self, label)
+        
+        self.edit = edit
+        
+        self.volumeTempoBox = gtk.VBox()
+        
+        self.volumeSliderBox = gtk.HBox()
+        self.volumeSliderLabel = gtk.Label(_('Volume'))
+        self.volumeSliderAdj = gtk  .Adjustment(value=0, lower=0, upper=1, step_incr=0.1, page_incr=0, page_size=0)
+        self.volumeSlider =  gtk.HScale(adjustment = self.volumeSliderAdj)
+        self.volumeSlider.set_size_request(250,15)
+        self.volumeSlider.set_inverted(False)
+        self.volumeSlider.set_draw_value(False)
+        self.volumeSliderBox.pack_start(self.volumeSliderLabel, False, False, padding = 5)
+        self.volumeSliderBox.pack_end(self.volumeSlider, False, False, padding = 5)
+        
+        self.tempoSliderBox = gtk.HBox()
+        self.tempoSliderLabel = gtk.Label(_('Tempo'))
+        self.tempoSliderAdj = gtk.Adjustment(value=0, lower=0, upper=1, step_incr=0.1, page_incr=0, page_size=0)
+        self.tempoSlider =  gtk.HScale(adjustment = self.tempoSliderAdj)
+        self.tempoSlider.set_size_request(250,15)
+        self.tempoSlider.set_inverted(False)
+        self.tempoSlider.set_draw_value(False)
+        self.tempoSliderBox.pack_start(self.tempoSliderLabel, False, False, padding = 5)
+        self.tempoSliderBox.pack_end(self.tempoSlider, False, False, padding = 5)
+        
+        self.volumeTempoBox.pack_start(self.volumeSliderBox, padding = 5)
+        self.volumeTempoBox.pack_start(self.tempoSliderBox, padding = 5)
+        self.volumeTempoBox.show_all()
+        
+        self.set_content(self.volumeTempoBox)
+        
+class propsPalette(Palette):
+    def __init__(self, label, edit):
+        Palette.__init__(self, label)
+        
+        self.edit = edit
+        
+class generationPalette(Palette):
+    def __init__(self, label, edit):
+        Palette.__init__(self, label)
+        
+        self.edit = edit
+        
+        self.mainBox = gtk.VBox()
+        self.slidersBox = gtk.HBox()
+        self.scaleModeBox = gtk.HBox()
+        self.decisionBox = gtk.HBox()
+        
+        self.XYSliderBox1 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
+        self.XYSliderBox1.set_size_request(200,200)
+        self.XYButton1 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XAdjustment1 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.YAdjustment1 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.XYSlider1 = XYSlider( self.XYSliderBox1, self.XYButton1, self.XAdjustment1, self.YAdjustment1, False, True )
+        
+        self.XYSliderBox2 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
+        self.XYSliderBox2.set_size_request(200,200)
+        self.XYButton2 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XAdjustment2 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.YAdjustment2 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.XYSlider2 = XYSlider( self.XYSliderBox2, self.XYButton2, self.XAdjustment2, self.YAdjustment2, False, True )
+        
+        self.XYSliderBox3 = RoundFixed(fillcolor = '#CCCCCC', bordercolor = '#000000')
+        self.XYSliderBox3.set_size_request(200,200)
+        self.XYButton3 = ImageToggleButton( Config.TAM_TAM_ROOT + '/icons/XYBut.svg', Config.TAM_TAM_ROOT + '/icons/XYButDown.svg')
+        self.XAdjustment3 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.YAdjustment3 = gtk.Adjustment( 1, 0, 100, 1, 1, 1 )
+        self.XYSlider3 = XYSlider( self.XYSliderBox3, self.XYButton3, self.XAdjustment3, self.YAdjustment3, False, True )
+        
+        self.slidersBox.pack_start(self.XYSlider1, False, False, padding = 5)
+        self.slidersBox.pack_start(self.XYSlider2, False, False, padding = 5)
+        self.slidersBox.pack_start(self.XYSlider3, False, False, padding = 5)
+        
+        self.scaleBoxLabel = gtk.Label(_('Scale: '))
+        self.scaleBox = gtk.combo_box_new_text()
+        for scale in [_('Major scale'), _('Harmonic minor scale'), _('Natural minor scale'), _('Phrygian scale'), _('Dorian scale'), _('Lydian scale'), _('Myxolidian scale')]:
+            self.scaleBox.append_text(scale)
+        self.scaleBox.set_active(0)
+        
+        self.modeBoxLabel = gtk.Label(_('Mode: '))
+        self.modeBox = gtk.combo_box_new_text()
+        for mode in [_('Drunk'), _('Drone and Jump'), _('Repeater'), _('Loop segments')]:
+            self.modeBox.append_text(mode)
+        self.modeBox.set_active(0)
+        
+        self.scaleModeBox.pack_start(self.scaleBoxLabel, False, False, padding = 10)
+        self.scaleModeBox.pack_start(self.scaleBox, False, False, padding = 10)
+        self.scaleModeBox.pack_start(self.modeBoxLabel, False, False, padding = 10)
+        self.scaleModeBox.pack_start(self.modeBox, False, False, padding = 10)
+        
+        self.acceptButton = Icon('stock-accept')
+        self.cancelButton = Icon('activity-stop')
+        self.decisionBox.pack_start(self.cancelButton, False, False, padding = 5)
+        self.decisionBox.pack_start(self.acceptButton, False, False, padding = 5)
+        
+        self.mainBox.pack_start(self.slidersBox, False, False, padding = 5)
+        self.mainBox.pack_start(self.scaleModeBox, False, False, padding = 5)
+        self.mainBox.pack_start(self.decisionBox, False, False, padding = 5)
+        self.mainBox.show_all()
+ 
+        
+        self.set_content(self.mainBox)
+
+
diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index efb1ebc..9c268de 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -13,6 +13,8 @@ from Util.CSoundClient import new_csound_client
 from Util.InstrumentPanel import InstrumentPanel
 from Util.InstrumentPanel import DrumPanel
 from Util.CSoundNote import CSoundNote
+from EditToolbars import mainToolbar
+from gettext import gettext as _
 from subprocess import Popen
 import time
 import os
@@ -43,12 +45,20 @@ KEY_MAP_PIANO = Config.KEY_MAP_PIANO
 #-----------------------------------
 class MainWindow( SubActivity ):
 
-    def __init__( self, set_mode ):
+    def __init__( self, activity, set_mode ):
         self.csnd = new_csound_client()
         self.tooltips = gtk.Tooltips()
+        self.activity = activity
         for i in [6,7,8,9,10]:
             self.csnd.setTrackVolume(100, i)
         self.trackCount = 6
+        
+        # Toolbar
+        self.activity.activity_toolbar.keep.show()
+        self._mainToolbar = mainToolbar(self.activity.toolbox, self)
+        self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar)
+        self.activity.toolbox.set_current_toolbar(1)
+        self._mainToolbar.show()
 
         def init_data( ):
             TP.ProfileBegin("init_data")
@@ -977,8 +987,8 @@ class MainWindow( SubActivity ):
         self.displayPage( id )
 
     def handleClose(self,widget):
-        self.set_mode('quit')
-
+        self.activity.close()
+        
     def onTimeout(self):
         self.updateFPS()
 
@@ -1064,7 +1074,7 @@ class MainWindow( SubActivity ):
             self.csnd.setTrackVolume(self._data["track_volume"][i], i)
 
     def handleTrackVolume( self, widget, track ):
-    	self._data["track_volume"][track] = round( widget.get_value() )
+        self._data["track_volume"][track] = round( widget.get_value() )
         self.csnd.setTrackVolume(self._data["track_volume"][track], track)
 
     def getTrackInstrument( self, track ):
diff --git a/Resources/tooltips_en.py b/Resources/tooltips_en.py
index 8fe201f..d974a76 100644
--- a/Resources/tooltips_en.py
+++ b/Resources/tooltips_en.py
@@ -1,172 +1,174 @@
+from gettext import gettext as _
+
 class Tooltips:
     def __init__(self):
         # Edit
         self.Edit = {}
         # tools
-        self.Edit["2toolPointerButton"] = 'Select tool'
-        self.Edit["2toolPencilButton"] = 'Draw tool'
-        self.Edit["2toolBrushButton"] = 'Paint tool'
+        self.Edit["2toolPointerButton"] = _('Select tool')
+        self.Edit["2toolPencilButton"] = _('Draw tool')
+        self.Edit["2toolBrushButton"] = _('Paint tool')
         # create tune
-        self.Edit["2generateBtn"] = 'Generate new tune'
+        self.Edit["2generateBtn"] = _('Generate new tune')
         # page
-        self.Edit["2pageGenerateButton"] = 'Generate page'
-        self.Edit["2pagePropertiesButton"] = 'Page properties'
-        self.Edit["2pageDeleteButton"] = 'Delete page(s)'
-        self.Edit["2pageDuplicateButton"] = 'Duplicate page(s)'
-        self.Edit["2pageNewButton"] = 'Add page'
-        self.Edit["2pageBeatsButton"] = 'Beats per page'
-        self.Edit["2saveButton"] = 'Save tune'
-        self.Edit["2loadButton"] = 'Load tune'
+        self.Edit["2pageGenerateButton"] = _('Generate page')
+        self.Edit["2pagePropertiesButton"] = _('Page properties')
+        self.Edit["2pageDeleteButton"] = _('Delete page(s)')
+        self.Edit["2pageDuplicateButton"] = _('Duplicate page(s)')
+        self.Edit["2pageNewButton"] = _('Add page')
+        self.Edit["2pageBeatsButton"] = _('Beats per page')
+        self.Edit["2saveButton"] = _('Save tune')
+        self.Edit["2loadButton"] = _('Load tune')
         # track
-        self.Edit["2trackGenerateButton"] = 'Generate track'
-        self.Edit["2trackPropertiesButton"] = 'Track properties'
-        self.Edit["2trackDeleteButton"] = 'Clear track'
-        self.Edit["2trackDuplicateButton"] = 'Duplicate track'
+        self.Edit["2trackGenerateButton"] = _('Generate track')
+        self.Edit["2trackPropertiesButton"] = _('Track properties')
+        self.Edit["2trackDeleteButton"] = _('Clear track')
+        self.Edit["2trackDuplicateButton"] = _('Duplicate track')
         # note
-        self.Edit["2notePropertiesButton"] = 'Note(s) properties'
-        self.Edit["2noteDeleteButton"] = 'Delete note(s)'
-        self.Edit["2noteDuplicateButton"] = 'Duplicate note(s)'
-        self.Edit["2noteOnsetMinusButton"] = 'Move note in time'
-        self.Edit["2noteOnsetPlusButton"] = 'Move note in time'
-        self.Edit["2notePitchMinusButton"] = 'Lower pitch'
-        self.Edit["2notePitchPlusButton"] = 'Raise pitch'
-        self.Edit["2noteDurationMinusButton"] = 'Modify duration'
-        self.Edit["2noteDurationPlusButton"] = 'Modify duration'
-        self.Edit["2noteVolumeMinusButton"] = 'Lower volume'
-        self.Edit["2noteVolumePlusButton"] = 'Raise volume'
+        self.Edit["2notePropertiesButton"] = _('Note(s) properties')
+        self.Edit["2noteDeleteButton"] = _('Delete note(s)')
+        self.Edit["2noteDuplicateButton"] = _('Duplicate note(s)')
+        self.Edit["2noteOnsetMinusButton"] = _('Move note in time')
+        self.Edit["2noteOnsetPlusButton"] = _('Move note in time')
+        self.Edit["2notePitchMinusButton"] = _('Lower pitch')
+        self.Edit["2notePitchPlusButton"] = _('Raise pitch')
+        self.Edit["2noteDurationMinusButton"] = _('Modify duration')
+        self.Edit["2noteDurationPlusButton"] = _('Modify duration')
+        self.Edit["2noteVolumeMinusButton"] = _('Lower volume')
+        self.Edit["2noteVolumePlusButton"] = _('Raise volume')
         # transport
-        self.Edit["2playButton"] = 'Play'
-        self.Edit["2pauseButton"] = 'Pause'
-        self.Edit["2stopButton"] = 'Stop'
-        self.Edit["2keyRecordButton"] = 'Keyboard recording'
-        self.Edit["2recordButton"] = 'Save as .ogg'
-        self.Edit["2rewindButton"] = 'Rewind'
-        self.Edit["2closeButton"] = 'Save to journal and quit'
+        self.Edit["2playButton"] = _('Play')
+        self.Edit["2pauseButton"] = _('Pause')
+        self.Edit["2stopButton"] = _('Stop')
+        self.Edit["2keyRecordButton"] = _('Keyboard recording')
+        self.Edit["2recordButton"] = _('Save as .ogg')
+        self.Edit["2rewindButton"] = _('Rewind')
+        self.Edit["2closeButton"] = _('Save to journal and quit')
         # volume and tempo
-        self.Edit["2volumeSlider"] = 'Master volume'
-        self.Edit["2tempoSlider"] = 'Tempo'
+        self.Edit["2volumeSlider"] = _('Master volume')
+        self.Edit["2tempoSlider"] = _('Tempo')
         #InstrumentBox
-        self.Edit["2instrument1muteButton"] = "Left click to mute, right click to solo"
-        self.Edit["2instrument2muteButton"] = "Left click to mute, right click to solo"
-        self.Edit["2instrument3muteButton"] = "Left click to mute, right click to solo"
-        self.Edit["2instrument4muteButton"] = "Left click to mute, right click to solo"
-        self.Edit["2drumMuteButton"] = "Left click to mute, right click to solo"
+        self.Edit["2instrument1muteButton"] = _("Left click to mute, right click to solo")
+        self.Edit["2instrument2muteButton"] = _("Left click to mute, right click to solo")
+        self.Edit["2instrument3muteButton"] = _("Left click to mute, right click to solo")
+        self.Edit["2instrument4muteButton"] = _("Left click to mute, right click to solo")
+        self.Edit["2drumMuteButton"] = _("Left click to mute, right click to solo")
         
         self.ALGO = {}
-        self.ALGO["XYButton1"] = '-- Rythm density, |  Rythm regularity' 
-        self.ALGO["XYButton2"] = '-- Pitch regularity, | Pitch maximum step' 
-        self.ALGO["XYButton3"] = '-- Average duration, | Silence probability'
-        self.ALGO["drunk"] = 'Drunk'
-        self.ALGO["droneJump"] = 'Drone and Jump'
-        self.ALGO["repeat"] = 'Repeater'
-        self.ALGO["loopSeg"] = 'Loop segments'
-        self.ALGO["majorKey"] = 'Major scale'
-        self.ALGO["minorHarmKey"] = 'Harmonic minor scale'
-        self.ALGO["minorKey"] = 'Natural minor scale'
-        self.ALGO["phrygienKey"] = 'Phrygian scale'
-        self.ALGO["dorienKey"] = 'Dorian scale'
-        self.ALGO["lydienKey"] = 'Lydian scale'
-        self.ALGO["myxoKey"] = 'Myxolydian scale'
-        self.ALGO["saveButton"] = 'Save preset'
-        self.ALGO["loadButton"] = 'Load preset'
-        self.ALGO["checkButton"] = 'Generate'
-        self.ALGO["cancelButton"] = 'Close'
+        self.ALGO["XYButton1"] = _('-- Rythm density, |  Rythm regularity' )
+        self.ALGO["XYButton2"] = _('-- Pitch regularity, | Pitch maximum step' )
+        self.ALGO["XYButton3"] = _('-- Average duration, | Silence probability')
+        self.ALGO["drunk"] = _('Drunk')
+        self.ALGO["droneJump"] = _('Drone and Jump')
+        self.ALGO["repeat"] = _('Repeater')
+        self.ALGO["loopSeg"] = _('Loop segments')
+        self.ALGO["majorKey"] = _('Major scale')
+        self.ALGO["minorHarmKey"] = _('Harmonic minor scale')
+        self.ALGO["minorKey"] = _('Natural minor scale')
+        self.ALGO["phrygienKey"] = _('Phrygian scale')
+        self.ALGO["dorienKey"] = _('Dorian scale')
+        self.ALGO["lydienKey"] = _('Lydian scale')
+        self.ALGO["myxoKey"] = _('Myxolydian scale')
+        self.ALGO["saveButton"] = _('Save preset')
+        self.ALGO["loadButton"] = _('Load preset')
+        self.ALGO["checkButton"] = _('Generate')
+        self.ALGO["cancelButton"] = _('Close')
  
         self.PROP = {}
-        self.PROP['pitchUp'] = 'Transpose up'
-        self.PROP['pitchDown'] = 'Transpose down'
-        self.PROP['volumeUp'] = 'Volume up'
-        self.PROP['volumeDown'] = 'Volume down'
-        self.PROP['panSlider'] = 'Panoramisation'
-        self.PROP['reverbSlider'] = 'Reverb'
-        self.PROP['attackSlider'] = 'Attack duration'
-        self.PROP['decaySlider'] = 'Decay duration'
-        self.PROP['filterTypeLowButton'] = 'Lowpass filter'
-        self.PROP['filterTypeHighButton'] = 'Highpass filter'
-        self.PROP['filterTypeBandButton'] = 'Bandpass filter'
-        self.PROP['cutoffSlider'] = 'Filter cutoff'
-        self.PROP['pitchGen'] = 'Open algorithmic generator'
-        self.PROP['volumeGen'] = 'Open algorithmic generator'
-        self.PROP['panGen'] = 'Open algorithmic generator'
-        self.PROP['reverbGen'] = 'Open algorithmic generator'
-        self.PROP['attackGen'] = 'Open algorithmic generator'
-        self.PROP['decayGen'] = 'Open algorithmic generator'
-        self.PROP['cutoffGen'] = 'Open algorithmic generator'
-        self.PROP['line'] = 'Line'
-        self.PROP['drunk'] = 'Drunk'
-        self.PROP['droneJump'] = 'Drone and jump'
-        self.PROP['repeater'] = 'Repeater'
-        self.PROP['loopseg'] = 'Loop segments'
-        self.PROP['minSlider'] = 'Minimum value'
-        self.PROP['maxSlider'] = 'Maximum value'
-        self.PROP['paraSlider'] = 'Specific parameter'
-        self.PROP['checkButton'] = 'Apply generator'
-        self.PROP['cancelButton'] = 'Cancel'
+        self.PROP['pitchUp'] = _('Transpose up')
+        self.PROP['pitchDown'] = _('Transpose down')
+        self.PROP['volumeUp'] = _('Volume up')
+        self.PROP['volumeDown'] = _('Volume down')
+        self.PROP['panSlider'] = _('Panoramisation')
+        self.PROP['reverbSlider'] = _('Reverb')
+        self.PROP['attackSlider'] = _('Attack duration')
+        self.PROP['decaySlider'] = _('Decay duration')
+        self.PROP['filterTypeLowButton'] = _('Lowpass filter')
+        self.PROP['filterTypeHighButton'] = _('Highpass filter')
+        self.PROP['filterTypeBandButton'] = _('Bandpass filter')
+        self.PROP['cutoffSlider'] = _('Filter cutoff')
+        self.PROP['pitchGen'] = _('Open algorithmic generator')
+        self.PROP['volumeGen'] = _('Open algorithmic generator')
+        self.PROP['panGen'] = _('Open algorithmic generator')
+        self.PROP['reverbGen'] = _('Open algorithmic generator')
+        self.PROP['attackGen'] = _('Open algorithmic generator')
+        self.PROP['decayGen'] = _('Open algorithmic generator')
+        self.PROP['cutoffGen'] = _('Open algorithmic generator')
+        self.PROP['line'] = _('Line')
+        self.PROP['drunk'] = _('Drunk')
+        self.PROP['droneJump'] = _('Drone and jump')
+        self.PROP['repeater'] = _('Repeater')
+        self.PROP['loopseg'] = _('Loop segments')
+        self.PROP['minSlider'] = _('Minimum value')
+        self.PROP['maxSlider'] = _('Maximum value')
+        self.PROP['paraSlider'] = _('Specific parameter')
+        self.PROP['checkButton'] = _('Apply generator')
+        self.PROP['cancelButton'] = _('Cancel')
     
 
 
     #miniTamTam
-    VOL = 'Volume'
-    BAL = 'Balance'
-    REV = 'Reverb'
-    PLAY = 'Play / Stop'
-    STOP = 'Stop'
-    SEQ = 'Left click to record, right click to record on top'
-    GEN = 'Generate'
-    COMPL = 'Complexity of beat'
-    BEAT = 'Beats per bar'
-    TEMPO = 'Tempo'
-    JAZZ = 'Jazz / Rock Kit'
-    AFRI = 'African Kit'
-    ARAB = 'Arabic Kit'
-    BRES = 'South American Kit'
-    ELEC = 'Electronic Kit'
-    RECMIC = 'Record with the microphone'
-    RECLAB = 'Open SynthLab to create noise'
-    MT_RECORDBUTTONS = ['Record mic into slot 1', 'Record mic into slot 2', 'Record mic into slot 3', 'Record mic into slot 4']
+    VOL = _('Volume')
+    BAL = _('Balance')
+    REV = _('Reverb')
+    PLAY = _('Play / Stop')
+    STOP = _('Stop')
+    SEQ = _('Left click to record, right click to record on top')
+    GEN = _('Generate')
+    COMPL = _('Complexity of beat')
+    BEAT = _('Beats per bar')
+    TEMPO = _('Tempo')
+    JAZZ = _('Jazz / Rock Kit')
+    AFRI = _('African Kit')
+    ARAB = _('Arabic Kit')
+    BRES = _('South American Kit')
+    ELEC = _('Electronic Kit')
+    RECMIC = _('Record with the microphone')
+    RECLAB = _('Open SynthLab to create noise')
+    MT_RECORDBUTTONS = [_('Record mic into slot 1'), _('Record mic into slot 2'), _('Record mic into slot 3'), _('Record mic into slot 4')]
 
     
     #Synthlab
-    SOURCE = 'Source'
-    EFFECT = 'Effect'
-    CONTROL = 'Control'
-    SOUNDOUT = 'Sound Output'
-    SOUNDDUR = 'Sound Duration'
-    SL_RECORDBUTTONS = ['Record into slot 1', 'Record into slot 2', 'Record into slot 3', 'Record into slot 4', 'Record into slot 5', 'Record into slot 6']
-    SAVE = 'Save'
-    LOAD = 'Load'
-    SAVEMINI = 'Save to miniTamTam'
-    CLOSE = 'Save to journal and quit'
-    RESET = 'Reset'
+    SOURCE = _('Source')
+    EFFECT = _('Effect')
+    CONTROL = _('Control')
+    SOUNDOUT = _('Sound Output')
+    SOUNDDUR = _('Sound Duration')
+    SL_RECORDBUTTONS = [_('Record into slot 1'), _('Record into slot 2'), _('Record into slot 3'), _('Record into slot 4'), _('Record into slot 5'), _('Record into slot 6')]
+    SAVE = _('Save')
+    LOAD = _('Load')
+    SAVEMINI = _('Save to miniTamTam')
+    CLOSE = _('Save to journal and quit')
+    RESET = _('Reset')
     
     #Controls
-    LFO = 'LFO'
-    AMP = 'Amplitude'
-    FREQ = 'Frequency'
-    WAVEFORM = 'Waveform'
-    LFO_WAVEFORMS = ['Sine', 'Triangle', 'Bi-Square', 'Uni-Square', 'Sawtooth', 'Sawtooth-down']
-    OFFSET = 'Offset'
+    LFO = _('LFO')
+    AMP = _('Amplitude')
+    FREQ = _('Frequency')
+    WAVEFORM = _('Waveform')
+    LFO_WAVEFORMS = [_('Sine'), _('Triangle'), _('Bi-Square'), _('Uni-Square'), _('Sawtooth'), _('Sawtooth-down')]
+    OFFSET = _('Offset')
     
-    RANDOM = 'Random'
-    MIN = 'Minimum'
-    MAX = 'Maximum'
+    RANDOM = _('Random')
+    MIN = _('Minimum')
+    MAX = _('Maximum')
     FREQ = FREQ
-    SEED = 'Seed'
+    SEED = _('Seed')
     
-    ADSR = 'Envelope'
-    ATTACK = 'Attack'
-    DECAY = 'Decay'
-    SUSTAIN = 'Sustain'
-    RELEASE = 'Release'
+    ADSR = _('Envelope')
+    ATTACK = _('Attack')
+    DECAY = _('Decay')
+    SUSTAIN = _('Sustain')
+    RELEASE = _('Release')
 
-    TRACKPADX = 'Trackpad X'
+    TRACKPADX = _('Trackpad X')
     MIN = MIN
     MAX = MAX
-    SCALING =   'Scaling'
-    SCALING_TYPES =    ['Lin', 'Log'] 
-    POLL = 'Poll time'
+    SCALING = _('Scaling')
+    SCALING_TYPES =    [_('Lin'), _('Log')] 
+    POLL = _('Poll time')
     
-    TRACKPADY = 'Trackpad Y'
+    TRACKPADY = _('Trackpad Y')
     MIN = MIN
     MAX = MAX
     SCALING = SCALING
@@ -174,136 +176,136 @@ class Tooltips:
     POLL = POLL
     
     #Source
-    FM = 'FM'
-    CAR = 'Carrier Frequency'
-    MOD = 'Modulator Frequency'
-    INDEX = 'Index'
-    GAIN = 'Gain'
+    FM = _('FM')
+    CAR = _('Carrier Frequency')
+    MOD = _('Modulator Frequency')
+    INDEX = _('Index')
+    GAIN = _('Gain')
     
-    BUZZ = 'Buzz'
+    BUZZ = _('Buzz')
     FREQ = FREQ
-    NHARM = 'Number of harmonics'
-    FSLOPE = 'Filter Slope'
+    NHARM = _('Number of harmonics')
+    FSLOPE = _('Filter Slope')
     GAIN = GAIN
     
-    VCO = 'VCO'
+    VCO = _('VCO')
     FREQ = FREQ
     WAVEFORM = WAVEFORM
-    VCO_WAVEFORMS = ['Sawtooth', 'Square', 'Triangle']
+    VCO_WAVEFORMS = [_('Sawtooth'), _('Square'), _('Triangle')]
     FSLOPE = FSLOPE
     GAIN = GAIN
     
-    PLUCK = 'Pluck'
+    PLUCK = _('Pluck')
     FREQ = FREQ
-    LFILTER = 'Lowpass Filter'
-    VIBRATO = 'Vibrato'
+    LFILTER = _('Lowpass Filter')
+    VIBRATO = _('Vibrato')
     GAIN = GAIN
     
-    NOISE = 'Noise'
-    NOISETYPE = 'Type'
-    NOISE_TYPES = ['White', 'Pink', 'Gauss']
+    NOISE = _('Noise')
+    NOISETYPE = _('Type')
+    NOISE_TYPES = [_('White'), _('Pink'), _('Gauss')]
     FREQ = FREQ
-    BANDWITH = 'Bandwith'
+    BANDWITH = _('Bandwith')
     GAIN = GAIN
     
-    SAMPLE = 'Sound Sample'
+    SAMPLE = _('Sound Sample')
     FREQ = FREQ
-    SAMPLEN = 'Sample Number'
-    SAMPLE_NAMES = 'Sample name'
+    SAMPLEN = _('Sample Number')
+    SAMPLE_NAMES = _('Sample name')
     LFILTER = LFILTER
     GAIN = GAIN
     
-    VOICE = 'Voice'
+    VOICE = _('Voice')
     FREQ = FREQ
-    VOWEL = 'Vowel'
+    VOWEL = _('Vowel')
     VOWEL_TYPES = ['i', 'e', 'ee', 'a', 'u', 'o1', 'o2', 'oa', 'oe']
     VIBRATO = VIBRATO
     GAIN = GAIN
 
-    GRAIN = 'grain'
+    GRAIN = _('grain')
     FREQ = FREQ
     SAMPLEN = SAMPLEN
-    INDEX = 'index'
+    INDEX = _('index')
     GAIN = GAIN
 
-    ADDSYNTH = 'addSynth'
+    ADDSYNTH = _('addSynth')
     FREQ = FREQ
-    SPREAD = 'spread'
-    WAVE = 'waveform'
+    SPREAD = _('spread')
+    WAVE = _('waveform')
     GAIN = GAIN
     
     #Effects
-    DELAY = 'Delay'
+    DELAY = _('Delay')
     FREQ = FREQ
     LFILTER = LFILTER
-    FEEDBACK = 'Feedback'
+    FEEDBACK = _('Feedback')
     GAIN = GAIN
     
-    DIST = 'Distortion'
+    DIST = _('Distortion')
     FREQ = FREQ
-    RESON = 'Resonance'
-    DISTL = 'Distotion Level'
+    RESON = _('Resonance')
+    DISTL = _('Distotion Level')
     GAIN = GAIN
     
-    FILTER = 'Filter'
+    FILTER = _('Filter')
     FREQ = FREQ
     FSLOPE = FSLOPE
-    FTYPE = 'Type'
-    FILTER_TYPES = ['Lowpass', 'Highpass', 'Bandpass']
+    FTYPE = _('Type')
+    FILTER_TYPES = [_('Lowpass'), _('Highpass'), _('Bandpass')]
     GAIN = GAIN
     
-    RINGMOD = 'Ring Modulator'
+    RINGMOD = _('Ring Modulator')
     FREQ = FREQ
-    MIX = 'Mix'
+    MIX = _('Mix')
     WAVEFORM = WAVEFORM
     LFO_WAVEFORMS = LFO_WAVEFORMS
     GAIN = GAIN
     
-    REVERB = 'Reverb'
-    REVERBD = 'Length'
-    REVERBF = 'Lowpass Filter'
-    REVERBL = 'Reverb Level'
+    REVERB = _('Reverb')
+    REVERBD = _('Length')
+    REVERBF = _('Lowpass Filter')
+    REVERBL = _('Reverb Level')
     GAIN = GAIN
     
-    HARMON = 'Harmonizer'
+    HARMON = _('Harmonizer')
     FREQ = FREQ
-    DRYDELAY = 'Dry delay'
+    DRYDELAY = _('Dry delay')
     MIX = MIX
     GAIN = GAIN
 
-    EQ4BAND = 'Equalizer 4 bands'
-    FREQ1 = 'Band one gain'
-    FREQ2 = 'Band two gain'
-    FREQ3 = 'Band three gain'
-    FREQ4 = 'Band four gain'
+    EQ4BAND = _('Equalizer 4 bands')
+    FREQ1 = _('Band one gain')
+    FREQ2 = _('Band two gain')
+    FREQ3 = _('Band three gain')
+    FREQ4 = _('Band four gain')
 
-    CHORUS = 'Chorus'
-    LFODEPTH = 'LFO Depth'
-    LFOFREQ = 'LFO Frequency'
-    DELAY = 'Delay'
+    CHORUS = _('Chorus')
+    LFODEPTH = _('LFO Depth')
+    LFOFREQ = _('LFO Frequency')
+    DELAY = _('Delay')
     FEEDBACK = FEEDBACK
 
     SYNTHTYPES = [[LFO, RANDOM, ADSR, TRACKPADX, TRACKPADY], [FM, BUZZ, VCO, PLUCK, NOISE, SAMPLE, VOICE, GRAIN, ADDSYNTH], [DELAY, DIST, FILTER, RINGMOD, REVERB, HARMON, EQ4BAND, CHORUS], [ADSR]]
-    SYNTHPARA = {	'lfo': [AMP, FREQ, WAVEFORM, OFFSET],
-                        'rand': [MIN, MAX, FREQ, SEED],
-                        'adsr': [ATTACK, DECAY, SUSTAIN, RELEASE],
-                        'trackpadX': [MIN, MAX, SCALING, POLL],
-                        'trackpadY': [MIN, MAX, SCALING, POLL],
-                        'fm': [CAR, MOD, INDEX, GAIN],
-                        'buzz': [FREQ, NHARM, FSLOPE, GAIN],
-                        'vco': [FREQ, WAVEFORM, FSLOPE, GAIN],
-                        'pluck': [FREQ, LFILTER, VIBRATO, GAIN],
-                        'noise': [NOISETYPE, FREQ, BANDWITH, GAIN],
-                        'sample': [FREQ, SAMPLEN, LFILTER, GAIN],
-                        'voice': [FREQ, VOWEL, VIBRATO, GAIN],
-                        'grain': [FREQ, SAMPLEN, INDEX, GAIN],
-                        'addSynth': [FREQ, SPREAD, WAVE, GAIN],
-                        'wguide': [FREQ, LFILTER, FEEDBACK, GAIN],
-                        'distort': [FREQ, RESON, DISTL, GAIN],
-                        'filter': [FREQ, FSLOPE, FTYPE, GAIN],
-                        'ring': [FREQ, MIX, WAVEFORM, GAIN],
-                        'reverb': [REVERBD, REVERBF, REVERBL, GAIN],
-                        'harmon': [FREQ, DRYDELAY, MIX, GAIN],
-                        'eq4band': [FREQ1, FREQ2, FREQ3, FREQ4], 
-                        'chorus': [LFODEPTH, LFOFREQ, DELAY, FEEDBACK]} 
+    SYNTHPARA = {	_('lfo'): [AMP, FREQ, WAVEFORM, OFFSET],
+                        _('rand'): [MIN, MAX, FREQ, SEED],
+                        _('adsr'): [ATTACK, DECAY, SUSTAIN, RELEASE],
+                        _('trackpadX'): [MIN, MAX, SCALING, POLL],
+                        _('trackpadY'): [MIN, MAX, SCALING, POLL],
+                        _('fm'): [CAR, MOD, INDEX, GAIN],
+                        _('buzz'): [FREQ, NHARM, FSLOPE, GAIN],
+                        _('vco'): [FREQ, WAVEFORM, FSLOPE, GAIN],
+                        _('pluck'): [FREQ, LFILTER, VIBRATO, GAIN],
+                        _('noise'): [NOISETYPE, FREQ, BANDWITH, GAIN],
+                        _('sample'): [FREQ, SAMPLEN, LFILTER, GAIN],
+                        _('voice'): [FREQ, VOWEL, VIBRATO, GAIN],
+                        _('grain'): [FREQ, SAMPLEN, INDEX, GAIN],
+                        _('addSynth'): [FREQ, SPREAD, WAVE, GAIN],
+                        _('wguide'): [FREQ, LFILTER, FEEDBACK, GAIN],
+                        _('distort'): [FREQ, RESON, DISTL, GAIN],
+                        _('filter'): [FREQ, FSLOPE, FTYPE, GAIN],
+                        _('ring'): [FREQ, MIX, WAVEFORM, GAIN],
+                        _('reverb'): [REVERBD, REVERBF, REVERBL, GAIN],
+                        _('harmon'): [FREQ, DRYDELAY, MIX, GAIN],
+                        _('eq4band'): [FREQ1, FREQ2, FREQ3, FREQ4], 
+                        _('chorus'): [LFODEPTH, LFOFREQ, DELAY, FEEDBACK]} 
 
diff --git a/SynthLab/SynthLabWindow.py b/SynthLab/SynthLabWindow.py
index e8e8dfc..a3435c3 100644
--- a/SynthLab/SynthLabWindow.py
+++ b/SynthLab/SynthLabWindow.py
@@ -471,7 +471,7 @@ class SynthLabWindow(SubActivity):
 
     def handleClose( self, widget, data ):
         if self.journalCalled:
-            self.set_mode('quit')
+            self.activity.close()
             return
         self.set_mode('welcome')
         if as_window:
diff --git a/TamTam.py b/TamTam.py
index 4984b42..10bd33f 100755
--- a/TamTam.py
+++ b/TamTam.py
@@ -109,13 +109,10 @@ class TamTam(Activity):
 
     def doNothing(): #a callback function to appease SynthLab
         pass
+    
     def set_mode(self, mode, arg = None):
         if Config.DEBUG: print 'DEBUG: TamTam::set_mode from', self.mode, 'to', mode
 
-        if mode == 'quit':
-            self.close() # Save and cleanup
-            self.destroy()
-
         if self.mode != None:
             self.modeList[ self.mode ].onDeactivate()
             if FAKE_ACTIVITY:
@@ -154,7 +151,7 @@ class TamTam(Activity):
             self.toolbox.hide()
             if not (mode in self.modeList):
                 self.metadata['title'] = 'TamTam Edit'
-                self.modeList[mode] = MainWindow(self.set_mode)
+                self.modeList[mode] = MainWindow(self, self.set_mode)
             if self.instrumentPanel in self.preloadList:
                 self.instrumentPanel.load() # finish loading
             self.modeList[mode].setInstrumentPanel( self.instrumentPanel )
@@ -202,13 +199,14 @@ class TamTam(Activity):
                 return
             elif key == 49:#39:  s
                 #self.set_mode('synth')
-                self.keyboardWindow.hide_all()
-                l = os.spawnlp(os.P_NOWAIT,'/usr/share/activities/TamTam.activity/cnee','/usr/share/activities/TamTam.activity/cnee', '--record', '--keyboard', '--mouse', '--stop-key', 'h', '--out-file', '/home/olpc/test.xnl')
+                #self.keyboardWindow.hide_all()
+                #l = os.spawnlp(os.P_NOWAIT,'/usr/share/activities/TamTam.activity/cnee','/usr/share/activities/TamTam.activity/cnee', '--record', '--keyboard', '--mouse', '--stop-key', 'h', '--out-file', '/home/olpc/test.xnl')
                 return
-            elif key == 10:#25:  w
+            elif key == 25:  #w
+                self.toolbox.show()
                 #self.set_mode('welcome')
-                self.keyboardWindow.show_all()
-                l = os.spawnlp(os.P_NOWAIT,'/usr/share/activities/TamTam.activity/cnee','/usr/share/activities/TamTam.activity/cnee', '--replay', '--keyboard', '--mouse', '--file', '/home/olpc/test.xnl')
+                #self.keyboardWindow.show_all()
+                #l = os.spawnlp(os.P_NOWAIT,'/usr/share/activities/TamTam.activity/cnee','/usr/share/activities/TamTam.activity/cnee', '--replay', '--keyboard', '--mouse', '--file', '/home/olpc/test.xnl')
                 return
             elif key == 53:  #x
                 self.destroy()
diff --git a/icons/XYBut.svg b/icons/XYBut.svg
new file mode 100644
index 0000000..ca4cb2d
--- /dev/null
+++ b/icons/XYBut.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 75 75" enable-background="new 0 0 75 75" xml:space="preserve">
+<g>
+	<circle fill="#808284" cx="38" cy="38" r="10.818"/>
+	<g>
+		<path fill="#FFFFFF" stroke="#808284" stroke-width="2.25" d="M45.5,37.997c0,4.137-3.363,7.503-7.499,7.503
+			S30.5,42.134,30.5,37.997c0-4.135,3.365-7.497,7.501-7.497S45.5,33.862,45.5,37.997z M38.003,23C29.729,23,23,29.728,23,37.997
+			C23,46.268,29.729,53,38.003,53C46.271,53,53,46.268,53,37.997C53,29.728,46.271,23,38.003,23z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/XYButDown.svg b/icons/XYButDown.svg
new file mode 100644
index 0000000..64bae75
--- /dev/null
+++ b/icons/XYButDown.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 75 75" enable-background="new 0 0 75 75" xml:space="preserve">
+<g>
+	<circle cx="38" cy="38" r="8"/>
+	<g>
+		<path fill="none" stroke="#808284" stroke-width="2.25" d="M45.5,37.997c0,4.137-3.363,7.503-7.499,7.503S30.5,42.134,30.5,37.997
+			c0-4.135,3.365-7.497,7.501-7.497S45.5,33.862,45.5,37.997z M38.003,23C29.729,23,23,29.728,23,37.997
+			C23,46.268,29.729,53,38.003,53C46.271,53,53,46.268,53,37.997C53,29.728,46.271,23,38.003,23z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/keyrec.svg b/icons/keyrec.svg
index b904387..90d9fe8 100644
--- a/icons/keyrec.svg
+++ b/icons/keyrec.svg
@@ -2,12 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.297" cy="23.037" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.295" cy="23.129" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="28.1" cy="27.84" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="28.098" cy="27.932" r="21.572"/>
 <g>
-	<path fill="#FFFFFF" d="M18.319,16.993h2.718v5.366h0.055c0.27-0.468,0.558-0.9,0.828-1.333l2.755-4.033h3.367l-4.016,5.167
-		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.717V16.993z"/>
+	<path fill="#FFFFFF" d="M24.121,21.796h2.719v5.365h0.055c0.27-0.468,0.558-0.899,0.828-1.333l2.755-4.032h3.367l-4.017,5.167
+		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961H24.12L24.121,21.796L24.121,21.796z"/>
 </g>
-<circle fill="none" stroke="#4C4D4F" cx="22.628" cy="22.89" r="17.085"/>
+<circle fill="none" stroke="#4C4D4F" cx="28.431" cy="27.692" r="17.085"/>
 </svg>
diff --git a/icons/loop.svg b/icons/loop.svg
index f790bac..c085ee6 100644
--- a/icons/loop.svg
+++ b/icons/loop.svg
@@ -2,11 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.297" cy="23.037" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.295" cy="23.129" r="21.572"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="0.75" cx="22.628" cy="22.89" r="18.793"/>
-<line fill="none" stroke="#FFFFFF" stroke-width="2" x1="19.198" y1="17.698" x2="24.698" y2="14.198"/>
-<ellipse fill="none" stroke="#FFFFFF" stroke-width="2" cx="22.823" cy="23.448" rx="15.375" ry="6.25"/>
-<line fill="none" stroke="#FFFFFF" stroke-width="2" x1="19.948" y1="17.948" x2="24.698" y2="20.198"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="28.1" cy="27.84" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="28.098" cy="27.932" r="21.572"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="0.75" cx="28.431" cy="27.692" r="18.793"/>
+<line fill="none" stroke="#FFFFFF" stroke-width="2" x1="25.001" y1="22.501" x2="30.501" y2="19.001"/>
+<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M28.626,22.001c8.491,0,15.325-0.156,15.375,6.25
+	c0.043,5.498-6.884,6.25-15.375,6.25c-8.492,0-15.179-0.318-15.375-6.25C13.221,22.015,20.134,22.001,28.626,22.001z"/>
+<line fill="none" stroke="#FFFFFF" stroke-width="2" x1="25.751" y1="22.751" x2="30.501" y2="25.001"/>
 </svg>
diff --git a/icons/micrec1.svg b/icons/micrec1.svg
new file mode 100644
index 0000000..38f1b2b
--- /dev/null
+++ b/icons/micrec1.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g enable-background="new    ">
+	<path fill="#FFFFFF" d="M26.582,24.229h-0.035l-2.233,1.062l-0.45-2.052l3.098-1.439h2.269v11.704h-2.647V24.229z"/>
+</g>
+</svg>
diff --git a/icons/micrec2.svg b/icons/micrec2.svg
new file mode 100644
index 0000000..505347e
--- /dev/null
+++ b/icons/micrec2.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g enable-background="new    ">
+	<path fill="#FFFFFF" d="M23.09,33.501v-1.656l1.512-1.369c2.557-2.286,3.8-3.602,3.835-4.969c0-0.954-0.576-1.711-1.926-1.711
+		c-1.008,0-1.892,0.504-2.503,0.973l-0.774-1.963c0.882-0.666,2.25-1.206,3.835-1.206c2.647,0,4.105,1.548,4.105,3.673
+		c0,1.963-1.423,3.529-3.115,5.042l-1.08,0.899v0.035h4.411v2.252H23.09z"/>
+</g>
+</svg>
diff --git a/icons/micrec3.svg b/icons/micrec3.svg
new file mode 100644
index 0000000..d203fdf
--- /dev/null
+++ b/icons/micrec3.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g enable-background="new    ">
+	<path fill="#FFFFFF" d="M23.575,30.818c0.486,0.252,1.604,0.72,2.72,0.72c1.423,0,2.143-0.684,2.143-1.565
+		c0-1.152-1.152-1.674-2.358-1.674h-1.116v-1.963h1.062c0.918-0.02,2.088-0.36,2.088-1.352c0-0.702-0.576-1.224-1.728-1.224
+		c-0.955,0-1.962,0.414-2.449,0.702l-0.558-1.981c0.701-0.45,2.105-0.882,3.618-0.882c2.502,0,3.89,1.313,3.89,2.917
+		c0,1.242-0.702,2.215-2.144,2.719v0.036c1.404,0.252,2.539,1.314,2.539,2.845c0,2.07-1.818,3.583-4.79,3.583
+		c-1.512,0-2.791-0.396-3.475-0.828L23.575,30.818z"/>
+</g>
+</svg>
diff --git a/icons/micrec4.svg b/icons/micrec4.svg
new file mode 100644
index 0000000..1e63c67
--- /dev/null
+++ b/icons/micrec4.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g enable-background="new    ">
+	<path fill="#FFFFFF" d="M27.934,33.501V30.71h-5.187v-1.782l4.43-7.13h3.349v6.859h1.404v2.054h-1.404v2.791L27.934,33.501
+		L27.934,33.501z M27.934,28.657v-2.593c0-0.702,0.036-1.422,0.09-2.178h-0.072c-0.378,0.756-0.684,1.439-1.081,2.178l-1.565,2.557
+		v0.036H27.934z"/>
+</g>
+</svg>
diff --git a/icons/micrec5.svg b/icons/micrec5.svg
new file mode 100644
index 0000000..b5c7b21
--- /dev/null
+++ b/icons/micrec5.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g>
+	<path fill="#FFFFFF" d="M31.522,23.832H26.48l-0.279,2c0.279-0.039,0.521-0.039,0.841-0.039c1.239,0,2.501,0.279,3.421,0.939
+		c0.979,0.66,1.58,1.74,1.58,3.261c0,2.42-2.08,4.562-5.581,4.562c-1.58,0-2.9-0.359-3.621-0.74l0.54-2.281
+		c0.58,0.281,1.761,0.642,2.94,0.642c1.26,0,2.602-0.601,2.602-1.98c0-1.34-1.062-2.16-3.661-2.16c-0.72,0-1.222,0.04-1.761,0.12
+		l0.859-6.822h7.162V23.832z"/>
+</g>
+</svg>
diff --git a/icons/micrec6.svg b/icons/micrec6.svg
new file mode 100644
index 0000000..6b0ccc0
--- /dev/null
+++ b/icons/micrec6.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
+<g>
+	<path fill="#FFFFFF" d="M30.809,23.825c-0.34,0-0.7,0-1.18,0.04c-2.701,0.221-3.901,1.601-4.241,3.121h0.061
+		c0.641-0.66,1.54-1.04,2.761-1.04c2.181,0,4.021,1.54,4.021,4.241c0,2.58-1.98,4.7-4.801,4.7c-3.461,0-5.161-2.58-5.161-5.682
+		c0-2.44,0.899-4.48,2.3-5.78c1.301-1.182,2.98-1.821,5.021-1.92c0.56-0.04,0.92-0.04,1.22-0.021V23.825z M27.408,32.647
+		c1.062,0,1.74-0.979,1.74-2.3c0-1.201-0.64-2.241-1.939-2.241c-0.82,0-1.5,0.5-1.801,1.16c-0.08,0.16-0.12,0.4-0.12,0.761
+		c0.061,1.38,0.721,2.62,2.102,2.62H27.408z"/>
+</g>
+</svg>
diff --git a/icons/minusrec.svg b/icons/minusrec.svg
index 242cfa2..fb6463c 100644
--- a/icons/minusrec.svg
+++ b/icons/minusrec.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.297" cy="23.037" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.295" cy="23.129" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="28.1" cy="27.84" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="28.098" cy="27.932" r="21.572"/>
 <g>
-	<path fill="#FFFFFF" d="M13.319,16.993h2.72v5.364h0.055c0.27-0.468,0.558-0.898,0.828-1.333l2.755-4.031h3.367l-4.018,5.167
-		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.719L13.319,16.993L13.319,16.993z"/>
+	<path fill="#FFFFFF" d="M19.121,21.796h2.721v5.363h0.055c0.271-0.468,0.558-0.897,0.828-1.333l2.755-4.03h3.367l-4.019,5.167
+		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.72L19.121,21.796L19.121,21.796z"/>
 </g>
-<circle fill="none" cx="22.628" cy="22.89" r="17.085"/>
-<text transform="matrix(1 0 0 1 25.1145 23.8645)" fill="#FFFFFF" font-family="'MyriadPro-Bold'" font-size="16">-</text>
-<circle fill="none" stroke="#4C4D4F" cx="22.628" cy="22.89" r="17.085"/>
+<circle fill="none" cx="28.431" cy="27.692" r="17.085"/>
+<text transform="matrix(1 0 0 1 30.917 28.667)" fill="#FFFFFF" font-family="'MyriadPro-Bold'" font-size="16">-</text>
+<circle fill="none" stroke="#4C4D4F" cx="28.431" cy="27.692" r="17.085"/>
 </svg>
diff --git a/icons/notedur.svg b/icons/notedur.svg
new file mode 100644
index 0000000..cd11aae
--- /dev/null
+++ b/icons/notedur.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="75px" height="30px" viewBox="0 0 75 30" enable-background="new 0 0 75 30" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#808284" d="M15,9.36c0-1.38,1.12-2.5,2.5-2.5h40c1.38,0,2.5,1.12,2.5,2.5c0,1.37-1.12,2.5-2.5,2.5h-40
+			C16.12,11.86,15,10.73,15,9.36z"/>
+		<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M15,9.36
+			c0-1.38,1.12-2.5,2.5-2.5h40c1.38,0,2.5,1.12,2.5,2.5c0,1.37-1.12,2.5-2.5,2.5h-40C16.12,11.86,15,10.73,15,9.36z"/>
+	</g>
+	<g>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="60" y1="17.939" x2="60" y2="25"/>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="15.51" y1="25" x2="15.51" y2="17.939"/>
+		
+			<line fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x1="59.66" y1="21.63" x2="15" y2="21.63"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/overrec.svg b/icons/overrec.svg
index d3b95f2..bf11488 100644
--- a/icons/overrec.svg
+++ b/icons/overrec.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.297" cy="23.037" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.295" cy="23.129" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="28.1" cy="27.84" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="28.098" cy="27.932" r="21.572"/>
 <g>
-	<path fill="#FFFFFF" d="M13.319,16.993h2.719v5.365h0.055c0.27-0.468,0.558-0.899,0.828-1.333l2.755-4.032h3.367l-4.017,5.167
-		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.718L13.319,16.993L13.319,16.993z"/>
+	<path fill="#FFFFFF" d="M19.121,21.796h2.72v5.364h0.055c0.27-0.468,0.558-0.898,0.828-1.333l2.755-4.031h3.367l-4.018,5.167
+		l4.23,6.968h-3.205l-2.971-5.239l-1.045,1.278v3.961h-2.719L19.121,21.796L19.121,21.796z"/>
 </g>
-<circle fill="none" cx="22.628" cy="22.89" r="17.085"/>
-<text transform="matrix(1 0 0 1 23.8645 23.8645)" fill="#FFFFFF" font-family="'MyriadPro-Bold'" font-size="16">+</text>
-<circle fill="none" stroke="#4C4D4F" cx="22.628" cy="22.89" r="17.085"/>
+<circle fill="none" cx="28.431" cy="27.692" r="17.085"/>
+<text transform="matrix(1 0 0 1 29.667 28.667)" fill="#FFFFFF" font-family="'MyriadPro-Bold'" font-size="16">+</text>
+<circle fill="none" stroke="#4C4D4F" cx="28.431" cy="27.692" r="17.085"/>
 </svg>
diff --git a/icons/pencil.svg b/icons/pencil.svg
new file mode 100644
index 0000000..cb17e04
--- /dev/null
+++ b/icons/pencil.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M51,11.978l-0.018-0.203c-0.097-0.838-0.794-1.862-1.817-2.665
+	c-1.024-0.812-2.18-1.245-3.018-1.156c-0.362,0.044-0.662,0.203-0.856,0.432l-0.026-0.008l-14.779,19.57l-0.07,0.062l-0.009,0.018
+	l-0.035,0.079l-1.925,2.365l0.221,0.185h-0.009l-0.221-0.159l-0.034,0.036c-0.08,0.114-0.142,0.238-0.178,0.379l-0.061,0.044
+	l-1.191,2.859l3.608,2.886l2.833-1.818l0.025-0.045l0.212-0.176l0.045-0.053l1.977-2.461l0.026-0.036l0.018-0.035v0.009
+	l14.947-19.279l0.089-0.062l0.069-0.132l0.01-0.018C50.938,12.41,51,12.216,51,11.978z M24.317,40.116
+	c-0.044,0.124-0.017,0.247,0.08,0.336c0.097,0.079,0.229,0.088,0.344,0.018l4.085-2.63l-2.656-2.127L24.317,40.116z"/>
+<path fill="#808284" d="M6,44.229c0-1.218,0.988-2.206,2.206-2.206h18.75c1.209,0,2.206,0.988,2.206,2.206
+	c0,1.217-0.997,2.205-2.206,2.205H8.206C6.988,46.434,6,45.445,6,44.229z"/>
+<path fill="none" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="M6,44.229
+	c0-1.218,0.988-2.206,2.206-2.206h18.75c1.209,0,2.206,0.988,2.206,2.206c0,1.217-0.997,2.205-2.206,2.205H8.206
+	C6.988,46.434,6,45.445,6,44.229z"/>
+</svg>
diff --git a/icons/play.svg b/icons/play.svg
index 5d38855..0b52488 100644
--- a/icons/play.svg
+++ b/icons/play.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45px" height="45px" viewBox="0 0 45 45" enable-background="new 0 0 45 45" xml:space="preserve">
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
 <g>
 	<g>
 		<g>
-			<circle fill="#808284" cx="22.5" cy="22.5" r="22.5"/>
-			<polygon fill="#FFFFFF" points="31.842,22.75 17.873,30.648 17.873,14.852 			"/>
+			<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>
+			<polygon fill="#FFFFFF" points="36.842,27.75 22.873,35.648 22.873,19.852 			"/>
 		</g>
 	</g>
-	<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.499" cy="22.592" r="18.677"/>
+	<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>
 </g>
 </svg>
diff --git a/icons/preset1.svg b/icons/preset1.svg
index a7b61fe..90caf4b 100644
--- a/icons/preset1.svg
+++ b/icons/preset1.svg
@@ -3,10 +3,11 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.105,-0.168 4.105,44.832 39.086,44.832 39.207,8.969 
+	30.071,0.072 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.948,0.12 29.948,9.293 39.249,9.293 "/>
 <g>
-	<path fill="#FFFFFF" d="M20.114,19.759h-0.036l-2.233,1.062l-0.45-2.053l3.097-1.44h2.269v11.704h-2.646V19.759z"/>
+	<path fill="#FFFFFF" d="M20.031,19.622h-0.038l-2.352,1.118l-0.474-2.162l3.262-1.516h2.389v12.325h-2.786L20.031,19.622
+		L20.031,19.622z"/>
 </g>
 </svg>
diff --git a/icons/preset10.svg b/icons/preset10.svg
index 85c0250..28e7082 100644
--- a/icons/preset10.svg
+++ b/icons/preset10.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M14.916,20.592H14.88l-2.232,1.062l-0.45-2.053l3.097-1.44h2.27v11.704h-2.647V20.592z"/>
-	<path fill="#FFFFFF" d="M30.056,23.959c0,3.619-1.458,6.104-4.447,6.104c-3.024,0-4.357-2.719-4.375-6.032
-		c0-3.385,1.44-6.067,4.466-6.067C28.832,17.963,30.056,20.754,30.056,23.959z M23.989,24.031c-0.018,2.683,0.63,3.962,1.692,3.962
-		s1.639-1.333,1.639-3.998c0-2.592-0.559-3.961-1.656-3.961C24.655,20.033,23.971,21.312,23.989,24.031z"/>
+	<path fill="#FFFFFF" d="M20.719,26.395h-0.036l-2.232,1.062l-0.449-2.053l3.097-1.439h2.27v11.704h-2.646v-9.273H20.719z"/>
+	<path fill="#FFFFFF" d="M35.858,29.762c0,3.619-1.458,6.104-4.447,6.104c-3.023,0-4.356-2.719-4.375-6.031
+		c0-3.386,1.44-6.067,4.467-6.067C34.635,23.766,35.858,26.557,35.858,29.762z M29.791,29.834c-0.018,2.683,0.631,3.962,1.692,3.962
+		c1.062,0,1.639-1.333,1.639-3.998c0-2.593-0.559-3.961-1.655-3.961C30.457,25.836,29.773,27.114,29.791,29.834z"/>
 </g>
 </svg>
diff --git a/icons/preset2.svg b/icons/preset2.svg
index 8b31394..f376c67 100644
--- a/icons/preset2.svg
+++ b/icons/preset2.svg
@@ -2,13 +2,13 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M17.119,29.365v-1.656l1.513-1.368c2.557-2.287,3.799-3.602,3.835-4.97c0-0.955-0.576-1.711-1.927-1.711
-		c-1.008,0-1.89,0.504-2.502,0.973l-0.774-1.963c0.882-0.666,2.251-1.206,3.835-1.206c2.646,0,4.105,1.548,4.105,3.673
-		c0,1.963-1.423,3.529-3.115,5.042l-1.08,0.9v0.035h4.411v2.251H17.119z"/>
+	<path fill="#FFFFFF" d="M22.922,35.168v-1.656l1.513-1.368c2.557-2.287,3.799-3.602,3.835-4.97c0-0.955-0.576-1.711-1.927-1.711
+		c-1.008,0-1.891,0.504-2.502,0.973l-0.774-1.963c0.882-0.666,2.251-1.206,3.835-1.206c2.646,0,4.105,1.548,4.105,3.673
+		c0,1.963-1.423,3.529-3.115,5.042l-1.08,0.9v0.035h4.411v2.251H22.922z"/>
 </g>
 </svg>
diff --git a/icons/preset3.svg b/icons/preset3.svg
index 55b923a..a22bb3c 100644
--- a/icons/preset3.svg
+++ b/icons/preset3.svg
@@ -2,15 +2,15 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M18.107,26.848c0.486,0.252,1.603,0.72,2.719,0.72c1.423,0,2.143-0.684,2.143-1.566
-		c0-1.152-1.152-1.674-2.358-1.674h-1.116v-1.963h1.062c0.918-0.018,2.088-0.36,2.088-1.351c0-0.702-0.576-1.224-1.729-1.224
-		c-0.954,0-1.962,0.414-2.448,0.702l-0.559-1.981c0.702-0.45,2.107-0.882,3.619-0.882c2.503,0,3.89,1.314,3.89,2.917
-		c0,1.243-0.702,2.215-2.143,2.719V23.3c1.404,0.253,2.538,1.314,2.538,2.846c0,2.07-1.818,3.583-4.789,3.583
-		c-1.513,0-2.791-0.396-3.475-0.828L18.107,26.848z"/>
+	<path fill="#FFFFFF" d="M23.909,32.65c0.486,0.252,1.604,0.72,2.72,0.72c1.423,0,2.143-0.684,2.143-1.565
+		c0-1.152-1.152-1.674-2.358-1.674h-1.115v-1.963h1.062c0.918-0.019,2.088-0.36,2.088-1.352c0-0.702-0.576-1.224-1.729-1.224
+		c-0.954,0-1.962,0.414-2.448,0.702l-0.559-1.981c0.701-0.45,2.106-0.882,3.618-0.882c2.504,0,3.891,1.313,3.891,2.917
+		c0,1.243-0.702,2.215-2.144,2.719v0.035c1.404,0.253,2.538,1.314,2.538,2.846c0,2.07-1.817,3.583-4.789,3.583
+		c-1.513,0-2.791-0.396-3.475-0.828L23.909,32.65z"/>
 </g>
 </svg>
diff --git a/icons/preset4.svg b/icons/preset4.svg
index d56061f..e6cf5e9 100644
--- a/icons/preset4.svg
+++ b/icons/preset4.svg
@@ -2,12 +2,13 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M21.297,30.032v-2.791h-5.185v-1.782l4.43-7.13h3.349v6.86h1.404v2.053h-1.404v2.791H21.297z
-		 M21.297,25.189v-2.592c0-0.703,0.037-1.422,0.09-2.179h-0.07c-0.379,0.756-0.685,1.44-1.082,2.179l-1.566,2.557v0.035H21.297z"/>
+	<path fill="#FFFFFF" d="M27.1,35.835v-2.791h-5.186v-1.782l4.431-7.13h3.349v6.859h1.404v2.054h-1.404v2.791L27.1,35.835
+		L27.1,35.835z M27.1,30.991v-2.592c0-0.703,0.037-1.422,0.09-2.179h-0.07c-0.379,0.756-0.685,1.439-1.082,2.179l-1.565,2.557v0.035
+		H27.1z"/>
 </g>
 </svg>
diff --git a/icons/preset5.svg b/icons/preset5.svg
index 68c7eb0..53f5b08 100644
--- a/icons/preset5.svg
+++ b/icons/preset5.svg
@@ -2,12 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,45.031 38.209,45.031 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
-<path fill="#FFFFFF" d="M25.223,20.605h-4.537l-0.252,1.8c0.252-0.036,0.468-0.036,0.756-0.036c1.117,0,2.251,0.252,3.08,0.846
-	c0.883,0.594,1.422,1.566,1.422,2.936c0,2.178-1.873,4.105-5.023,4.105c-1.423,0-2.611-0.324-3.259-0.666l0.486-2.053
-	c0.522,0.252,1.585,0.576,2.647,0.576c1.134,0,2.34-0.541,2.34-1.783c0-1.207-0.955-1.945-3.295-1.945
-	c-0.648,0-1.098,0.037-1.584,0.109l0.774-6.141h6.445V20.605z"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,5.769 10.793,49.834 44.012,49.834 44.126,14.444 
+	35.45,5.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,6.042 35.334,14.753 44.166,14.753 "/>
+<path fill="#FFFFFF" d="M31.025,25.407h-4.537l-0.252,1.8c0.252-0.035,0.468-0.035,0.756-0.035c1.117,0,2.251,0.252,3.08,0.846
+	c0.883,0.594,1.422,1.566,1.422,2.936c0,2.179-1.873,4.105-5.022,4.105c-1.423,0-2.611-0.324-3.259-0.666l0.485-2.053
+	c0.522,0.252,1.585,0.575,2.647,0.575c1.134,0,2.34-0.541,2.34-1.782c0-1.207-0.955-1.945-3.295-1.945
+	c-0.648,0-1.098,0.037-1.584,0.109l0.773-6.142h6.445V25.407z"/>
 </svg>
diff --git a/icons/preset6.svg b/icons/preset6.svg
index a5543e3..4c2493c 100644
--- a/icons/preset6.svg
+++ b/icons/preset6.svg
@@ -2,16 +2,16 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.24 29.531,9.95 38.365,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.043 35.334,15.753 44.168,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M24.759,20.773c-0.307,0-0.63,0-1.062,0.036c-2.431,0.198-3.511,1.44-3.816,2.81h0.055
-		c0.576-0.595,1.386-0.938,2.484-0.938c1.963,0,3.619,1.387,3.619,3.817c0,2.321-1.782,4.23-4.321,4.23
-		c-3.115,0-4.646-2.322-4.646-5.113c0-2.196,0.812-4.033,2.07-5.203c1.171-1.062,2.685-1.639,4.521-1.729
-		c0.505-0.036,0.828-0.036,1.099-0.018L24.759,20.773L24.759,20.773z M21.698,28.713c0.953,0,1.565-0.883,1.565-2.07
-		c0-1.081-0.576-2.018-1.747-2.018c-0.738,0-1.351,0.451-1.62,1.045c-0.071,0.145-0.107,0.358-0.107,0.684
-		c0.054,1.242,0.647,2.359,1.891,2.359H21.698z"/>
+	<path fill="#FFFFFF" d="M30.562,26.575c-0.307,0-0.63,0-1.062,0.036c-2.431,0.198-3.511,1.44-3.815,2.811h0.055
+		c0.576-0.596,1.386-0.938,2.484-0.938c1.963,0,3.619,1.387,3.619,3.817c0,2.32-1.782,4.229-4.321,4.229
+		c-3.115,0-4.646-2.321-4.646-5.112c0-2.196,0.812-4.033,2.07-5.203c1.171-1.062,2.686-1.64,4.521-1.729
+		c0.505-0.036,0.828-0.036,1.099-0.018L30.562,26.575L30.562,26.575z M27.501,34.516c0.952,0,1.564-0.883,1.564-2.07
+		c0-1.081-0.576-2.018-1.747-2.018c-0.738,0-1.351,0.451-1.62,1.045c-0.07,0.145-0.106,0.357-0.106,0.684
+		c0.054,1.242,0.646,2.359,1.891,2.359H27.501z"/>
 </g>
 </svg>
diff --git a/icons/preset7.svg b/icons/preset7.svg
index 28611d9..d6de26c 100644
--- a/icons/preset7.svg
+++ b/icons/preset7.svg
@@ -2,11 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M26.344,19.493v1.729l-4.825,9.976H18.62l4.825-9.417v-0.036h-5.366v-2.251H26.344z"/>
+	<path fill="#FFFFFF" d="M32.146,25.296v1.729l-4.825,9.977h-2.898l4.824-9.417v-0.036h-5.365v-2.251L32.146,25.296L32.146,25.296z"
+		/>
 </g>
 </svg>
diff --git a/icons/preset8.svg b/icons/preset8.svg
index 4f5f030..5c4a17f 100644
--- a/icons/preset8.svg
+++ b/icons/preset8.svg
@@ -2,16 +2,16 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="11.793,6.769 11.793,49.501 45.012,49.501 45.126,15.444 
+	36.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="36.334,7.042 36.334,15.753 45.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M19.362,23.982c-1.135-0.576-1.692-1.53-1.692-2.557c0-1.98,1.782-3.295,4.123-3.295
-		c2.736,0,3.871,1.584,3.871,3.007c0,1.008-0.54,1.999-1.692,2.574v0.055c1.134,0.432,2.143,1.404,2.143,2.916
-		c0,2.125-1.783,3.548-4.502,3.548c-2.971,0-4.339-1.675-4.339-3.259c0-1.404,0.811-2.377,2.089-2.936V23.982z M23.323,26.881
-		c0-1.027-0.756-1.639-1.837-1.928c-0.899,0.253-1.422,0.9-1.422,1.747c-0.019,0.847,0.63,1.639,1.656,1.639
-		C22.693,28.339,23.323,27.709,23.323,26.881z M20.243,21.335c0,0.792,0.721,1.296,1.656,1.584c0.631-0.18,1.188-0.756,1.188-1.494
-		c0-0.72-0.414-1.44-1.422-1.44C20.73,19.985,20.243,20.597,20.243,21.335z"/>
+	<path fill="#FFFFFF" d="M26.164,29.784c-1.135-0.575-1.691-1.529-1.691-2.557c0-1.98,1.782-3.295,4.123-3.295
+		c2.735,0,3.871,1.584,3.871,3.007c0,1.008-0.54,1.999-1.692,2.574v0.055c1.134,0.433,2.144,1.404,2.144,2.916
+		c0,2.125-1.783,3.548-4.503,3.548c-2.971,0-4.339-1.675-4.339-3.259c0-1.404,0.812-2.377,2.089-2.936L26.164,29.784L26.164,29.784z
+		 M30.126,32.684c0-1.027-0.757-1.639-1.838-1.928c-0.898,0.253-1.422,0.899-1.422,1.747c-0.019,0.847,0.63,1.639,1.656,1.639
+		C29.495,34.142,30.126,33.512,30.126,32.684z M27.046,27.138c0,0.792,0.721,1.296,1.655,1.584c0.631-0.18,1.188-0.756,1.188-1.494
+		c0-0.72-0.414-1.44-1.422-1.44C27.532,25.787,27.046,26.399,27.046,27.138z"/>
 </g>
 </svg>
diff --git a/icons/preset9.svg b/icons/preset9.svg
index ef71766..4b803e9 100644
--- a/icons/preset9.svg
+++ b/icons/preset9.svg
@@ -2,16 +2,16 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="4.99,0.966 4.99,43.698 38.209,43.698 38.323,9.642 29.648,1.194 
-	"/>
-<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="29.531,1.239 29.531,9.95 38.364,9.95 "/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="10.793,6.769 10.793,49.501 44.012,49.501 44.126,15.444 
+	35.45,6.996 "/>
+<polyline fill="#E6E3E1" stroke="#5D6060" stroke-width="2" points="35.334,7.042 35.334,15.753 44.166,15.753 "/>
 <g>
-	<path fill="#FFFFFF" d="M18.99,28.362c0.343,0.036,0.648,0.036,1.188,0c0.828-0.055,1.675-0.288,2.305-0.721
-		c0.757-0.521,1.261-1.277,1.477-2.16l-0.054-0.018c-0.522,0.539-1.278,0.846-2.341,0.846c-1.98,0-3.655-1.387-3.655-3.655
-		c0-2.287,1.837-4.213,4.411-4.213c3.007,0,4.43,2.305,4.43,5.042c0,2.43-0.774,4.213-2.053,5.383
-		c-1.116,1.009-2.646,1.566-4.465,1.639c-0.469,0.036-0.937,0.018-1.243,0V28.362z M22.231,20.439c-0.918,0-1.603,0.828-1.584,2.052
-		c0,1.009,0.54,1.873,1.656,1.873c0.738,0,1.261-0.36,1.513-0.774c0.09-0.162,0.144-0.342,0.144-0.684
-		c0-1.243-0.468-2.467-1.71-2.467H22.231z"/>
+	<path fill="#FFFFFF" d="M24.793,34.164c0.343,0.036,0.647,0.036,1.188,0c0.828-0.055,1.675-0.287,2.305-0.721
+		c0.758-0.521,1.262-1.276,1.478-2.16l-0.054-0.018c-0.522,0.539-1.278,0.846-2.342,0.846c-1.979,0-3.654-1.387-3.654-3.655
+		c0-2.286,1.837-4.213,4.41-4.213c3.008,0,4.431,2.306,4.431,5.042c0,2.431-0.774,4.213-2.053,5.384
+		c-1.116,1.009-2.646,1.565-4.466,1.639c-0.469,0.036-0.937,0.018-1.242,0V34.164z M28.033,26.241c-0.918,0-1.603,0.828-1.584,2.053
+		c0,1.009,0.54,1.873,1.656,1.873c0.738,0,1.261-0.36,1.513-0.774c0.091-0.162,0.145-0.342,0.145-0.684
+		c0-1.243-0.468-2.468-1.71-2.468H28.033z"/>
 </g>
 </svg>
diff --git a/icons/props.svg b/icons/props.svg
new file mode 100644
index 0000000..18f6622
--- /dev/null
+++ b/icons/props.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<path fill="#FFFFFF" d="M33.958,27.5c0,3.562-2.896,6.458-6.458,6.458c-3.562,0-6.458-2.896-6.458-6.458
+	c0-3.562,2.896-6.458,6.458-6.458C31.062,21.042,33.958,23.938,33.958,27.5z"/>
+<polygon fill="#FFFFFF" points="44.26,25.326 45.87,25.119 47.082,25.262 50,26.575 50,28.425 47.082,29.738 45.87,29.881 
+	44.26,29.674 43.525,32.927 45.064,33.449 46.1,34.113 48.169,36.584 47.382,38.256 44.189,38.157 43.031,37.744 41.668,36.846 
+	39.625,39.451 40.784,40.602 41.438,41.661 42.244,44.797 40.82,45.947 37.988,44.456 37.113,43.575 36.273,42.165 33.32,43.611 
+	33.877,45.166 34.009,46.396 33.391,49.587 31.622,50 29.711,47.395 29.295,46.227 29.145,44.582 25.855,44.582 25.705,46.227 
+	25.289,47.395 23.378,50 21.609,49.587 20.991,46.396 21.123,45.166 21.68,43.611 18.727,42.165 17.886,43.575 17.011,44.456 
+	14.18,45.947 12.756,44.797 13.562,41.661 14.216,40.602 15.375,39.451 13.332,36.846 11.969,37.744 10.811,38.157 7.618,38.256 
+	6.831,36.584 8.9,34.113 9.935,33.449 11.474,32.927 10.74,29.674 9.13,29.881 7.918,29.738 5,28.425 5,26.575 7.918,25.262 
+	9.13,25.119 10.74,25.326 11.474,22.073 9.935,21.551 8.9,20.887 6.831,18.416 7.618,16.744 10.811,16.843 11.969,17.256 
+	13.332,18.155 15.375,15.549 14.216,14.399 13.562,13.339 12.756,10.203 14.18,9.053 17.011,10.544 17.886,11.425 18.727,12.835 
+	21.68,11.389 21.123,9.834 20.991,8.604 21.609,5.413 23.378,5 25.289,7.606 25.705,8.774 25.855,10.418 29.145,10.418 
+	29.295,8.774 29.711,7.606 31.622,5 33.391,5.413 34.009,8.604 33.877,9.834 33.32,11.389 36.273,12.835 37.113,11.425 
+	37.988,10.544 40.82,9.053 42.244,10.203 41.438,13.339 40.784,14.399 39.625,15.549 41.668,18.155 43.031,17.256 44.189,16.843 
+	47.382,16.744 48.169,18.416 46.1,20.887 45.064,21.551 43.525,22.073 "/>
+<ellipse fill="#3B3C3E" cx="27.5" cy="27.5" rx="14.593" ry="14.826"/>
+<path fill="#FFFFFF" d="M16.444,27.5c0-6.2,4.953-11.232,11.056-11.232c6.104,0,11.057,5.032,11.057,11.232
+	S33.604,38.732,27.5,38.732C21.397,38.732,16.444,33.7,16.444,27.5z"/>
+<ellipse fill="#3B3C3E" cx="27.5" cy="27.5" rx="4.863" ry="4.942"/>
+</svg>
diff --git a/icons/rec1.svg b/icons/rec1.svg
index f4f59e6..4a88eec 100644
--- a/icons/rec1.svg
+++ b/icons/rec1.svg
@@ -2,10 +2,10 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g enable-background="new    ">
-	<path fill="#FFFFFF" d="M21.78,19.426h-0.035l-2.233,1.062l-0.45-2.052l3.098-1.439h2.269V28.7H21.78V19.426z"/>
+	<path fill="#FFFFFF" d="M26.582,24.229h-0.034l-2.233,1.062l-0.45-2.052l3.099-1.438h2.269v11.703h-2.649V24.229z"/>
 </g>
 </svg>
diff --git a/icons/rec2.svg b/icons/rec2.svg
index 170548b..108ea7e 100644
--- a/icons/rec2.svg
+++ b/icons/rec2.svg
@@ -2,12 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g enable-background="new    ">
-	<path fill="#FFFFFF" d="M18.287,28.698v-1.656l1.512-1.369c2.557-2.286,3.8-3.602,3.835-4.969c0-0.954-0.576-1.711-1.926-1.711
-		c-1.008,0-1.892,0.504-2.503,0.973l-0.774-1.963c0.882-0.666,2.25-1.206,3.835-1.206c2.647,0,4.105,1.548,4.105,3.673
-		c0,1.963-1.423,3.529-3.115,5.042l-1.08,0.899v0.035h4.411v2.252H18.287z"/>
+	<path fill="#FFFFFF" d="M23.09,33.501v-1.656l1.512-1.369c2.557-2.286,3.8-3.603,3.835-4.969c0-0.954-0.576-1.711-1.926-1.711
+		c-1.008,0-1.893,0.504-2.503,0.973l-0.774-1.963c0.882-0.666,2.25-1.206,3.835-1.206c2.647,0,4.105,1.548,4.105,3.673
+		c0,1.963-1.423,3.529-3.115,5.042l-1.08,0.899v0.034h4.411v2.253H23.09z"/>
 </g>
 </svg>
diff --git a/icons/rec3.svg b/icons/rec3.svg
index c20650b..2c64c70 100644
--- a/icons/rec3.svg
+++ b/icons/rec3.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g enable-background="new    ">
-	<path fill="#FFFFFF" d="M18.773,26.016c0.486,0.252,1.604,0.72,2.72,0.72c1.423,0,2.143-0.684,2.143-1.565
-		c0-1.152-1.152-1.674-2.358-1.674H20.16v-1.963h1.062c0.918-0.02,2.088-0.36,2.088-1.352c0-0.702-0.576-1.224-1.728-1.224
-		c-0.955,0-1.962,0.414-2.449,0.702l-0.558-1.981c0.701-0.45,2.105-0.882,3.618-0.882c2.502,0,3.89,1.313,3.89,2.917
-		c0,1.242-0.702,2.215-2.144,2.719v0.036c1.404,0.252,2.539,1.314,2.539,2.845c0,2.07-1.818,3.583-4.79,3.583
-		c-1.512,0-2.791-0.396-3.475-0.828L18.773,26.016z"/>
+	<path fill="#FFFFFF" d="M23.575,30.818c0.486,0.252,1.604,0.72,2.721,0.72c1.423,0,2.143-0.684,2.143-1.564
+		c0-1.152-1.152-1.674-2.358-1.674h-1.117v-1.963h1.062c0.918-0.021,2.088-0.36,2.088-1.353c0-0.702-0.576-1.224-1.728-1.224
+		c-0.955,0-1.962,0.414-2.449,0.702l-0.558-1.981c0.7-0.45,2.104-0.882,3.617-0.882c2.502,0,3.891,1.312,3.891,2.917
+		c0,1.242-0.702,2.215-2.145,2.719v0.036c1.404,0.252,2.539,1.314,2.539,2.845c0,2.07-1.817,3.583-4.79,3.583
+		c-1.512,0-2.791-0.396-3.475-0.828L23.575,30.818z"/>
 </g>
 </svg>
diff --git a/icons/rec4.svg b/icons/rec4.svg
index 75f42f0..14b2d0a 100644
--- a/icons/rec4.svg
+++ b/icons/rec4.svg
@@ -2,12 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g enable-background="new    ">
-	<path fill="#FFFFFF" d="M23.131,28.698v-2.791h-5.187v-1.782l4.43-7.13h3.349v6.859h1.404v2.054h-1.404v2.791L23.131,28.698
-		L23.131,28.698z M23.131,23.855v-2.593c0-0.702,0.036-1.422,0.09-2.178h-0.072c-0.378,0.756-0.684,1.439-1.081,2.178l-1.565,2.557
-		v0.036H23.131z"/>
+	<path fill="#FFFFFF" d="M27.934,33.501V30.71h-5.188v-1.782l4.431-7.13h3.349v6.858h1.404v2.055h-1.404v2.791L27.934,33.501
+		L27.934,33.501z M27.934,28.657v-2.593c0-0.702,0.036-1.422,0.09-2.178h-0.072c-0.378,0.756-0.684,1.438-1.081,2.178l-1.564,2.557
+		v0.036H27.934z"/>
 </g>
 </svg>
diff --git a/icons/rec5.svg b/icons/rec5.svg
index 6512474..b5c7b21 100644
--- a/icons/rec5.svg
+++ b/icons/rec5.svg
@@ -2,13 +2,13 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g>
-	<path fill="#FFFFFF" d="M26.72,19.03h-5.042l-0.279,2c0.279-0.04,0.52-0.04,0.84-0.04c1.24,0,2.501,0.28,3.421,0.94
-		c0.98,0.66,1.58,1.74,1.58,3.261c0,2.42-2.08,4.561-5.581,4.561c-1.58,0-2.9-0.359-3.621-0.74l0.54-2.281
-		c0.58,0.281,1.761,0.641,2.941,0.641c1.26,0,2.601-0.6,2.601-1.98c0-1.34-1.061-2.16-3.661-2.16c-0.72,0-1.221,0.04-1.761,0.12
-		l0.86-6.822h7.162V19.03z"/>
+	<path fill="#FFFFFF" d="M31.522,23.832H26.48l-0.279,2c0.279-0.039,0.521-0.039,0.841-0.039c1.239,0,2.501,0.279,3.421,0.939
+		c0.979,0.66,1.58,1.74,1.58,3.261c0,2.42-2.08,4.562-5.581,4.562c-1.58,0-2.9-0.359-3.621-0.74l0.54-2.281
+		c0.58,0.281,1.761,0.642,2.94,0.642c1.26,0,2.602-0.601,2.602-1.98c0-1.34-1.062-2.16-3.661-2.16c-0.72,0-1.222,0.04-1.761,0.12
+		l0.859-6.822h7.162V23.832z"/>
 </g>
 </svg>
diff --git a/icons/rec6.svg b/icons/rec6.svg
index 1758bb9..6b0ccc0 100644
--- a/icons/rec6.svg
+++ b/icons/rec6.svg
@@ -2,14 +2,14 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<circle fill="#808284" cx="22.698" cy="22.606" r="22.5"/>
-<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="22.697" cy="22.698" r="21.572"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.501" cy="27.408" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.5" r="21.572"/>
 <g>
-	<path fill="#FFFFFF" d="M26.006,19.023c-0.34,0-0.7,0-1.18,0.04c-2.701,0.22-3.901,1.6-4.241,3.121h0.061
-		c0.64-0.66,1.54-1.04,2.76-1.04c2.181,0,4.021,1.54,4.021,4.241c0,2.58-1.98,4.7-4.801,4.7c-3.461,0-5.161-2.58-5.161-5.681
-		c0-2.441,0.899-4.481,2.3-5.781c1.301-1.181,2.98-1.821,5.021-1.92c0.56-0.04,0.92-0.04,1.22-0.02V19.023z M22.606,27.845
-		c1.061,0,1.74-0.979,1.74-2.3c0-1.201-0.64-2.241-1.94-2.241c-0.82,0-1.5,0.5-1.8,1.16c-0.08,0.16-0.12,0.4-0.12,0.761
-		c0.06,1.38,0.72,2.62,2.101,2.62H22.606z"/>
+	<path fill="#FFFFFF" d="M30.809,23.825c-0.34,0-0.7,0-1.18,0.04c-2.701,0.221-3.901,1.601-4.241,3.121h0.061
+		c0.641-0.66,1.54-1.04,2.761-1.04c2.181,0,4.021,1.54,4.021,4.241c0,2.58-1.98,4.7-4.801,4.7c-3.461,0-5.161-2.58-5.161-5.682
+		c0-2.44,0.899-4.48,2.3-5.78c1.301-1.182,2.98-1.821,5.021-1.92c0.56-0.04,0.92-0.04,1.22-0.021V23.825z M27.408,32.647
+		c1.062,0,1.74-0.979,1.74-2.3c0-1.201-0.64-2.241-1.939-2.241c-0.82,0-1.5,0.5-1.801,1.16c-0.08,0.16-0.12,0.4-0.12,0.761
+		c0.061,1.38,0.721,2.62,2.102,2.62H27.408z"/>
 </g>
 </svg>
diff --git a/icons/record.svg b/icons/record.svg
new file mode 100644
index 0000000..2440bf7
--- /dev/null
+++ b/icons/record.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<path fill="#808284" d="M50,27.5C50,39.931,39.931,50,27.5,50C15.07,50,5,39.931,5,27.5C5,15.07,15.07,5,27.5,5
+	C39.931,5,50,15.07,50,27.5z"/>
+<path fill="#FFFFFF" d="M35.394,27.5c0,4.354-3.54,7.894-7.894,7.894c-4.354,0-7.894-3.54-7.894-7.894
+	c0-4.354,3.54-7.894,7.894-7.894C31.854,19.606,35.394,23.146,35.394,27.5z"/>
+</svg>
diff --git a/icons/reset.svg b/icons/reset.svg
index a0bac5a..833e85b 100644
--- a/icons/reset.svg
+++ b/icons/reset.svg
@@ -2,12 +2,12 @@
 <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="45.395px" height="45.395px" viewBox="0 0 45.395 45.395" enable-background="new 0 0 45.395 45.395" xml:space="preserve">
-<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="32.865,41.156 13.581,40.868 9.948,13.345 36.823,13.345 "/>
-<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M9.948,11.51C28.947,9.38,31.823,9.136,35.384,8.489
-	S27.037,5.682,23.33,6.114c-1.728,0.202-9.713,1.619-13.275,5.396"/>
-<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M18.906,5.754l6.692-1.475c0,0-4.209-3.13-6.692,1.295"/>
-<line fill="none" stroke="#FFFFFF" x1="23.655" y1="18.85" x2="23.655" y2="33.96"/>
-<line fill="none" stroke="#FFFFFF" x1="31.426" y1="19.281" x2="29.699" y2="33.96"/>
-<line fill="none" stroke="#FFFFFF" x1="15.236" y1="19.929" x2="16.747" y2="33.96"/>
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<polygon fill="none" stroke="#FFFFFF" stroke-width="2" points="36.668,46.959 17.384,46.671 13.751,19.147 40.626,19.147 "/>
+<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M13.751,17.312c18.998-2.13,21.875-2.374,25.436-3.021
+	c3.561-0.647-8.347-2.808-12.054-2.375c-1.729,0.201-9.713,1.618-13.275,5.396"/>
+<path fill="none" stroke="#FFFFFF" stroke-width="2" d="M22.709,11.557l6.691-1.476c0,0-4.209-3.13-6.691,1.296"/>
+<line fill="none" stroke="#FFFFFF" x1="27.457" y1="24.652" x2="27.457" y2="39.763"/>
+<line fill="none" stroke="#FFFFFF" x1="35.229" y1="25.084" x2="33.502" y2="39.763"/>
+<line fill="none" stroke="#FFFFFF" x1="19.038" y1="25.731" x2="20.55" y2="39.763"/>
 </svg>
diff --git a/icons/rewind.svg b/icons/rewind.svg
new file mode 100644
index 0000000..00dbf9d
--- /dev/null
+++ b/icons/rewind.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path fill="#808284" d="M50,27.5C50,39.931,39.931,50,27.5,50C15.07,50,5,39.931,5,27.5C5,15.07,15.07,5,27.5,5
+				C39.931,5,50,15.07,50,27.5z"/>
+			<polygon fill="#FFFFFF" points="13.404,27.391 25.432,20.58 25.432,34.201 			"/>
+			<polygon fill="#FFFFFF" points="25.007,27.391 37.047,20.58 37.047,34.201 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/icons/stop.svg b/icons/stop.svg
new file mode 100644
index 0000000..d945237
--- /dev/null
+++ b/icons/stop.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<circle fill="#808284" cx="27.5" cy="27.5" r="22.5"/>
+<circle fill="none" stroke="#4C4D4F" stroke-width="2.25" cx="27.499" cy="27.592" r="18.677"/>
+<rect x="20.75" y="20.041" fill="#FFFFFF" width="13.5" height="14.1"/>
+</svg>
diff --git a/icons/voltemp.svg b/icons/voltemp.svg
new file mode 100644
index 0000000..a7a0a7a
--- /dev/null
+++ b/icons/voltemp.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="55px" height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+<path fill="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M5.76,20.303c0-1.355,1.13-2.455,2.5-2.455h40
+	c1.381,0,2.5,1.1,2.5,2.455c0,1.345-1.119,2.455-2.5,2.455h-40C6.89,22.758,5.76,21.648,5.76,20.303z"/>
+<path fill="#FFFFFF" d="M33.43,20.303c0,2.798-2.31,5.066-5.17,5.066c-2.85,0-5.16-2.268-5.16-5.066c0-2.808,2.31-5.076,5.16-5.076
+	C31.12,15.227,33.43,17.495,33.43,20.303z"/>
+<g>
+	<path fill="#808284" stroke="#FFFFFF" stroke-linecap="square" d="M5.76,35.188c0-1.346,1.13-2.455,2.5-2.455h40
+		c1.381,0,2.5,1.109,2.5,2.455c0,1.354-1.119,2.454-2.5,2.454h-40C6.89,37.643,5.76,36.542,5.76,35.188z"/>
+</g>
+<path fill="#FFFFFF" d="M20.76,34.696c0,2.808-2.31,5.076-5.16,5.076c-2.859,0-5.169-2.269-5.169-5.076
+	c0-2.797,2.31-5.066,5.169-5.066C18.45,29.63,20.76,31.899,20.76,34.696z"/>
+</svg>
diff --git a/miniTamTam/miniTamTamMain.py b/miniTamTam/miniTamTamMain.py
index 871d9f5..c1725ac 100644
--- a/miniTamTam/miniTamTamMain.py
+++ b/miniTamTam/miniTamTamMain.py
@@ -106,7 +106,6 @@ class miniTamTamMain(SubActivity):
 
 
         self.drawInstrumentButtons()
-        #self.drawSliders()
         self.drawGeneration()
         self.show_all()
         if 'a good idea' == True:
@@ -169,71 +168,6 @@ class miniTamTamMain(SubActivity):
             self.network.setMode( Net.MD_WAIT )
             #self.activity.activity_toolbar.share.hide()
 
-    def drawSliders( self ):
-        mainLowBox = gtk.HBox()
-        mainSliderBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        mainSliderBox.set_border_width(Config.PANEL_SPACING)
-
-        reverbSliderBox = gtk.HBox()
-        self.reverbSliderBoxImgTop = gtk.Image()
-        self.reverbSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'reverb0.png')
-        reverbAdjustment = gtk.Adjustment(value=self.reverb, lower=0, upper=1, step_incr=0.1, page_incr=0, page_size=0)
-        reverbSlider = ImageHScale( Config.IMAGE_ROOT + "sliderbutred.png", reverbAdjustment, 7 )
-        reverbSlider.set_inverted(False)
-        reverbSlider.set_size_request(250,15)
-        reverbAdjustment.connect("value_changed" , self.handleReverbSlider)
-        reverbSliderBox.pack_start(reverbSlider, True, 20)
-        reverbSliderBox.pack_start(self.reverbSliderBoxImgTop, False, padding=0)
-        self.tooltips.set_tip(reverbSlider,Tooltips.REV)
-
-        balSliderBox = gtk.HBox()
-        self.balSliderBoxImgBot = gtk.Image()
-        self.balSliderBoxImgTop = gtk.Image()
-        self.balSliderBoxImgBot.set_from_file(Config.IMAGE_ROOT + 'dru2.png')
-        self.balSliderBoxImgTop.set_from_file(Config.IMAGE_ROOT + 'instr2.png')
-        balAdjustment = gtk.Adjustment(value=self.instVolume, lower=0, upper=100, step_incr=1, page_incr=0, page_size=0)
-        balSlider = ImageHScale( Config.IMAGE_ROOT + "sliderbutviolet.png", balAdjustment, 7 )
-        balSlider.set_inverted(False)
-        balSlider.set_size_request(250,15)
-        balAdjustment.connect("value_changed" , self.handleBalanceSlider)
-        balSliderBox.pack_start(self.balSliderBoxImgBot, False, padding=0)
-        balSliderBox.pack_start(balSlider, True, 20)
-        balSliderBox.pack_start(self.balSliderBoxImgTop, False, padding=0)
-        self.tooltips.set_tip(balSlider,Tooltips.BAL)
-
-        micRecordBox = gtk.HBox()
-        for i in [1,2,3,4]:
-            recordButton = ImageButton(Config.IMAGE_ROOT + 'synthRecord' + str(i) + '.png', Config.IMAGE_ROOT + 'synthRecord' + str(i) + 'Down.png', Config.IMAGE_ROOT + 'synthRecord' + str(i) + 'Over.png')
-            target = 'mic' + str(i)
-            recordButton.connect("clicked", self.micRec, target)
-            micRecordBox.pack_start(recordButton, False, False, 2)
-            self.tooltips.set_tip(recordButton, Tooltips.MT_RECORDBUTTONS[i-1])
-
-        #Transport Button Box
-        transportBox = RoundHBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
-        transportBox.set_border_width(Config.PANEL_SPACING)
-        self.seqRecordButton = ImageToggleButton(Config.IMAGE_ROOT + 'krecord.png', Config.IMAGE_ROOT + 'krecordDown.png', Config.IMAGE_ROOT + 'krecordOver.png')
-        self.seqRecordButton.connect('button-press-event', self.sequencer.handleRecordButton )
-
-        self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png')
-        self.playStopButton.connect('clicked' , self.handlePlayButton)
-        transportBox.pack_start(self.seqRecordButton)
-        transportBox.pack_start(self.playStopButton)
-        closeButton = ImageButton(Config.IMAGE_ROOT + 'close.png')
-        closeButton.connect('pressed',self.handleClose)
-        transportBox.pack_start(closeButton)
-        self.tooltips.set_tip(self.seqRecordButton,Tooltips.SEQ)
-        self.tooltips.set_tip(self.playStopButton,Tooltips.PLAY)
-
-        mainSliderBox.pack_start(balSliderBox, padding = 5)
-        mainSliderBox.pack_start(reverbSliderBox, padding = 5)
-        mainSliderBox.pack_start(micRecordBox, padding = 5)
-
-        mainLowBox.pack_start(mainSliderBox)
-        mainLowBox.pack_start(transportBox)
-
-        self.masterVBox.pack_start(mainLowBox)
-
     def drawGeneration( self ):
 
         slidersBox = RoundVBox(fillcolor = Config.PANEL_COLOR, bordercolor = Config.PANEL_BCK_COLOR, radius = Config.PANEL_RADIUS)
@@ -494,7 +428,7 @@ class miniTamTamMain(SubActivity):
             self.playStopButton.set_active(False)
         self.sequencer.clearSequencer()
         self.csnd.loopClear()
-        self.set_mode('quit')
+        self.activity.close()
 
     def handleGenerationSlider(self, adj):
         img = int(adj.value * 7)+1
diff --git a/miniTamTam/miniToolbars.py b/miniTamTam/miniToolbars.py
index 92a1afc..a55d571 100644
--- a/miniTamTam/miniToolbars.py
+++ b/miniTamTam/miniToolbars.py
@@ -5,6 +5,7 @@ import Config
 
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.toggletoolbutton import ToggleToolButton
+from sugar.graphics.palette import Palette
 from gettext import gettext as _
 
 class playToolbar(gtk.Toolbar):
@@ -147,4 +148,5 @@ class recordToolbar(gtk.Toolbar):
         self.loopSetButton.connect('clicked', self.miniTamTam.handleLoopSettingsBtn)
         self.insert(self.loopSetButton, -1)
         self.loopSetButton.show()
-        self.loopSetButton.set_tooltip(_('Add new sound'))
-\ No newline at end of file
+        self.loopSetButton.set_tooltip(_('Add new sound'))    
+        
+\ No newline at end of file
diff --git a/po/TamTam.pot b/po/TamTam.pot
new file mode 100644
index 0000000..13ca615
--- /dev/null
+++ b/po/TamTam.pot
@@ -0,0 +1,997 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-27 11:05-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Edit/EditToolbars.py:29 Resources/tooltips_en.py:114
+#: miniTamTam/miniToolbars.py:31
+msgid "Play / Stop"
+msgstr ""
+
+#: Edit/EditToolbars.py:51
+msgid "Draw Tool"
+msgstr ""
+
+#: Edit/EditToolbars.py:61
+msgid "Volume / Tempo"
+msgstr ""
+
+#: Edit/EditToolbars.py:69
+msgid "Properties"
+msgstr ""
+
+#: Edit/EditToolbars.py:90
+msgid "Non-continuous"
+msgstr ""
+
+#: Edit/EditToolbars.py:96
+msgid "1/2"
+msgstr ""
+
+#: Edit/EditToolbars.py:97
+msgid "1/4"
+msgstr ""
+
+#: Edit/EditToolbars.py:98
+msgid "1/8"
+msgstr ""
+
+#: Edit/EditToolbars.py:99
+msgid "1/16"
+msgstr ""
+
+#: Edit/EditToolbars.py:100
+msgid "1/32"
+msgstr ""
+
+#: Edit/EditToolbars.py:121 Resources/tooltips_en.py:111
+msgid "Volume"
+msgstr ""
+
+#: Edit/EditToolbars.py:131 Resources/tooltips_en.py:49
+#: Resources/tooltips_en.py:120
+msgid "Tempo"
+msgstr ""
+
+#: Edit/MainWindow.py:59
+msgid "Compose"
+msgstr ""
+
+#: Resources/tooltips_en.py:8
+msgid "Select tool"
+msgstr ""
+
+#: Resources/tooltips_en.py:9
+msgid "Draw tool"
+msgstr ""
+
+#: Resources/tooltips_en.py:10
+msgid "Paint tool"
+msgstr ""
+
+#: Resources/tooltips_en.py:12
+msgid "Generate new tune"
+msgstr ""
+
+#: Resources/tooltips_en.py:14
+msgid "Generate page"
+msgstr ""
+
+#: Resources/tooltips_en.py:15
+msgid "Page properties"
+msgstr ""
+
+#: Resources/tooltips_en.py:16
+msgid "Delete page(s)"
+msgstr ""
+
+#: Resources/tooltips_en.py:17
+msgid "Duplicate page(s)"
+msgstr ""
+
+#: Resources/tooltips_en.py:18
+msgid "Add page"
+msgstr ""
+
+#: Resources/tooltips_en.py:19
+msgid "Beats per page"
+msgstr ""
+
+#: Resources/tooltips_en.py:20
+msgid "Save tune"
+msgstr ""
+
+#: Resources/tooltips_en.py:21
+msgid "Load tune"
+msgstr ""
+
+#: Resources/tooltips_en.py:23
+msgid "Generate track"
+msgstr ""
+
+#: Resources/tooltips_en.py:24
+msgid "Track properties"
+msgstr ""
+
+#: Resources/tooltips_en.py:25
+msgid "Clear track"
+msgstr ""
+
+#: Resources/tooltips_en.py:26
+msgid "Duplicate track"
+msgstr ""
+
+#: Resources/tooltips_en.py:28
+msgid "Note(s) properties"
+msgstr ""
+
+#: Resources/tooltips_en.py:29
+msgid "Delete note(s)"
+msgstr ""
+
+#: Resources/tooltips_en.py:30
+msgid "Duplicate note(s)"
+msgstr ""
+
+#: Resources/tooltips_en.py:31 Resources/tooltips_en.py:32
+msgid "Move note in time"
+msgstr ""
+
+#: Resources/tooltips_en.py:33
+msgid "Lower pitch"
+msgstr ""
+
+#: Resources/tooltips_en.py:34
+msgid "Raise pitch"
+msgstr ""
+
+#: Resources/tooltips_en.py:35 Resources/tooltips_en.py:36
+msgid "Modify duration"
+msgstr ""
+
+#: Resources/tooltips_en.py:37
+msgid "Lower volume"
+msgstr ""
+
+#: Resources/tooltips_en.py:38
+msgid "Raise volume"
+msgstr ""
+
+#: Resources/tooltips_en.py:40 miniTamTam/miniTamTamMain.py:149
+msgid "Play"
+msgstr ""
+
+#: Resources/tooltips_en.py:41
+msgid "Pause"
+msgstr ""
+
+#: Resources/tooltips_en.py:42 Resources/tooltips_en.py:115
+msgid "Stop"
+msgstr ""
+
+#: Resources/tooltips_en.py:43
+msgid "Keyboard recording"
+msgstr ""
+
+#: Resources/tooltips_en.py:44
+msgid "Save as .ogg"
+msgstr ""
+
+#: Resources/tooltips_en.py:45
+msgid "Rewind"
+msgstr ""
+
+#: Resources/tooltips_en.py:46 Resources/tooltips_en.py:141
+msgid "Save to journal and quit"
+msgstr ""
+
+#: Resources/tooltips_en.py:48
+msgid "Master volume"
+msgstr ""
+
+#: Resources/tooltips_en.py:51 Resources/tooltips_en.py:52
+#: Resources/tooltips_en.py:53 Resources/tooltips_en.py:54
+#: Resources/tooltips_en.py:55
+msgid "Left click to mute, right click to solo"
+msgstr ""
+
+#: Resources/tooltips_en.py:58
+msgid "-- Rythm density, |  Rythm regularity"
+msgstr ""
+
+#: Resources/tooltips_en.py:59
+msgid "-- Pitch regularity, | Pitch maximum step"
+msgstr ""
+
+#: Resources/tooltips_en.py:60
+msgid "-- Average duration, | Silence probability"
+msgstr ""
+
+#: Resources/tooltips_en.py:61 Resources/tooltips_en.py:98
+msgid "Drunk"
+msgstr ""
+
+#: Resources/tooltips_en.py:62
+msgid "Drone and Jump"
+msgstr ""
+
+#: Resources/tooltips_en.py:63 Resources/tooltips_en.py:100
+msgid "Repeater"
+msgstr ""
+
+#: Resources/tooltips_en.py:64 Resources/tooltips_en.py:101
+msgid "Loop segments"
+msgstr ""
+
+#: Resources/tooltips_en.py:65
+msgid "Major scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:66
+msgid "Harmonic minor scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:67
+msgid "Natural minor scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:68
+msgid "Phrygian scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:69
+msgid "Dorian scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:70
+msgid "Lydian scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:71
+msgid "Myxolydian scale"
+msgstr ""
+
+#: Resources/tooltips_en.py:72
+msgid "Save preset"
+msgstr ""
+
+#: Resources/tooltips_en.py:73
+msgid "Load preset"
+msgstr ""
+
+#: Resources/tooltips_en.py:74 Resources/tooltips_en.py:117
+msgid "Generate"
+msgstr ""
+
+#: Resources/tooltips_en.py:75
+msgid "Close"
+msgstr ""
+
+#: Resources/tooltips_en.py:78
+msgid "Transpose up"
+msgstr ""
+
+#: Resources/tooltips_en.py:79
+msgid "Transpose down"
+msgstr ""
+
+#: Resources/tooltips_en.py:80
+msgid "Volume up"
+msgstr ""
+
+#: Resources/tooltips_en.py:81
+msgid "Volume down"
+msgstr ""
+
+#: Resources/tooltips_en.py:82
+msgid "Panoramisation"
+msgstr ""
+
+#: Resources/tooltips_en.py:83 Resources/tooltips_en.py:113
+#: Resources/tooltips_en.py:264 miniTamTam/miniToolbars.py:83
+msgid "Reverb"
+msgstr ""
+
+#: Resources/tooltips_en.py:84
+msgid "Attack duration"
+msgstr ""
+
+#: Resources/tooltips_en.py:85
+msgid "Decay duration"
+msgstr ""
+
+#: Resources/tooltips_en.py:86
+msgid "Lowpass filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:87
+msgid "Highpass filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:88
+msgid "Bandpass filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:89
+msgid "Filter cutoff"
+msgstr ""
+
+#: Resources/tooltips_en.py:90 Resources/tooltips_en.py:91
+#: Resources/tooltips_en.py:92 Resources/tooltips_en.py:93
+#: Resources/tooltips_en.py:94 Resources/tooltips_en.py:95
+#: Resources/tooltips_en.py:96
+msgid "Open algorithmic generator"
+msgstr ""
+
+#: Resources/tooltips_en.py:97
+msgid "Line"
+msgstr ""
+
+#: Resources/tooltips_en.py:99
+msgid "Drone and jump"
+msgstr ""
+
+#: Resources/tooltips_en.py:102
+msgid "Minimum value"
+msgstr ""
+
+#: Resources/tooltips_en.py:103
+msgid "Maximum value"
+msgstr ""
+
+#: Resources/tooltips_en.py:104
+msgid "Specific parameter"
+msgstr ""
+
+#: Resources/tooltips_en.py:105
+msgid "Apply generator"
+msgstr ""
+
+#: Resources/tooltips_en.py:106
+msgid "Cancel"
+msgstr ""
+
+#: Resources/tooltips_en.py:112 miniTamTam/miniToolbars.py:60
+msgid "Balance"
+msgstr ""
+
+#: Resources/tooltips_en.py:116
+msgid "Left click to record, right click to record on top"
+msgstr ""
+
+#: Resources/tooltips_en.py:118
+msgid "Complexity of beat"
+msgstr ""
+
+#: Resources/tooltips_en.py:119
+msgid "Beats per bar"
+msgstr ""
+
+#: Resources/tooltips_en.py:121
+msgid "Jazz / Rock Kit"
+msgstr ""
+
+#: Resources/tooltips_en.py:122
+msgid "African Kit"
+msgstr ""
+
+#: Resources/tooltips_en.py:123
+msgid "Arabic Kit"
+msgstr ""
+
+#: Resources/tooltips_en.py:124
+msgid "South American Kit"
+msgstr ""
+
+#: Resources/tooltips_en.py:125
+msgid "Electronic Kit"
+msgstr ""
+
+#: Resources/tooltips_en.py:126
+msgid "Record with the microphone"
+msgstr ""
+
+#: Resources/tooltips_en.py:127
+msgid "Open SynthLab to create noise"
+msgstr ""
+
+#: Resources/tooltips_en.py:128
+msgid "Record mic into slot 1"
+msgstr ""
+
+#: Resources/tooltips_en.py:128
+msgid "Record mic into slot 2"
+msgstr ""
+
+#: Resources/tooltips_en.py:128
+msgid "Record mic into slot 3"
+msgstr ""
+
+#: Resources/tooltips_en.py:128
+msgid "Record mic into slot 4"
+msgstr ""
+
+#: Resources/tooltips_en.py:132
+msgid "Source"
+msgstr ""
+
+#: Resources/tooltips_en.py:133
+msgid "Effect"
+msgstr ""
+
+#: Resources/tooltips_en.py:134
+msgid "Control"
+msgstr ""
+
+#: Resources/tooltips_en.py:135
+msgid "Sound Output"
+msgstr ""
+
+#: Resources/tooltips_en.py:136
+msgid "Sound Duration"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 1"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 2"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 3"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 4"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 5"
+msgstr ""
+
+#: Resources/tooltips_en.py:137
+msgid "Record into slot 6"
+msgstr ""
+
+#: Resources/tooltips_en.py:138
+msgid "Save"
+msgstr ""
+
+#: Resources/tooltips_en.py:139
+msgid "Load"
+msgstr ""
+
+#: Resources/tooltips_en.py:140
+msgid "Save to miniTamTam"
+msgstr ""
+
+#: Resources/tooltips_en.py:142
+msgid "Reset"
+msgstr ""
+
+#: Resources/tooltips_en.py:145
+msgid "LFO"
+msgstr ""
+
+#: Resources/tooltips_en.py:146
+msgid "Amplitude"
+msgstr ""
+
+#: Resources/tooltips_en.py:147
+msgid "Frequency"
+msgstr ""
+
+#: Resources/tooltips_en.py:148
+msgid "Waveform"
+msgstr ""
+
+#: Resources/tooltips_en.py:149
+msgid "Sine"
+msgstr ""
+
+#: Resources/tooltips_en.py:149 Resources/tooltips_en.py:194
+msgid "Triangle"
+msgstr ""
+
+#: Resources/tooltips_en.py:149
+msgid "Bi-Square"
+msgstr ""
+
+#: Resources/tooltips_en.py:149
+msgid "Uni-Square"
+msgstr ""
+
+#: Resources/tooltips_en.py:149 Resources/tooltips_en.py:194
+msgid "Sawtooth"
+msgstr ""
+
+#: Resources/tooltips_en.py:149
+msgid "Sawtooth-down"
+msgstr ""
+
+#: Resources/tooltips_en.py:150
+msgid "Offset"
+msgstr ""
+
+#: Resources/tooltips_en.py:152
+msgid "Random"
+msgstr ""
+
+#: Resources/tooltips_en.py:153
+msgid "Minimum"
+msgstr ""
+
+#: Resources/tooltips_en.py:154
+msgid "Maximum"
+msgstr ""
+
+#: Resources/tooltips_en.py:156
+msgid "Seed"
+msgstr ""
+
+#: Resources/tooltips_en.py:158
+msgid "Envelope"
+msgstr ""
+
+#: Resources/tooltips_en.py:159
+msgid "Attack"
+msgstr ""
+
+#: Resources/tooltips_en.py:160
+msgid "Decay"
+msgstr ""
+
+#: Resources/tooltips_en.py:161
+msgid "Sustain"
+msgstr ""
+
+#: Resources/tooltips_en.py:162
+msgid "Release"
+msgstr ""
+
+#: Resources/tooltips_en.py:164
+msgid "Trackpad X"
+msgstr ""
+
+#: Resources/tooltips_en.py:167
+msgid "Scaling"
+msgstr ""
+
+#: Resources/tooltips_en.py:168
+msgid "Lin"
+msgstr ""
+
+#: Resources/tooltips_en.py:168
+msgid "Log"
+msgstr ""
+
+#: Resources/tooltips_en.py:169
+msgid "Poll time"
+msgstr ""
+
+#: Resources/tooltips_en.py:171
+msgid "Trackpad Y"
+msgstr ""
+
+#: Resources/tooltips_en.py:179
+msgid "FM"
+msgstr ""
+
+#: Resources/tooltips_en.py:180
+msgid "Carrier Frequency"
+msgstr ""
+
+#: Resources/tooltips_en.py:181
+msgid "Modulator Frequency"
+msgstr ""
+
+#: Resources/tooltips_en.py:182
+msgid "Index"
+msgstr ""
+
+#: Resources/tooltips_en.py:183
+msgid "Gain"
+msgstr ""
+
+#: Resources/tooltips_en.py:185
+msgid "Buzz"
+msgstr ""
+
+#: Resources/tooltips_en.py:187
+msgid "Number of harmonics"
+msgstr ""
+
+#: Resources/tooltips_en.py:188
+msgid "Filter Slope"
+msgstr ""
+
+#: Resources/tooltips_en.py:191
+msgid "VCO"
+msgstr ""
+
+#: Resources/tooltips_en.py:194
+msgid "Square"
+msgstr ""
+
+#: Resources/tooltips_en.py:198
+msgid "Pluck"
+msgstr ""
+
+#: Resources/tooltips_en.py:200 Resources/tooltips_en.py:266
+msgid "Lowpass Filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:201
+msgid "Vibrato"
+msgstr ""
+
+#: Resources/tooltips_en.py:204
+msgid "Noise"
+msgstr ""
+
+#: Resources/tooltips_en.py:205 Resources/tooltips_en.py:253
+msgid "Type"
+msgstr ""
+
+#: Resources/tooltips_en.py:206
+msgid "White"
+msgstr ""
+
+#: Resources/tooltips_en.py:206
+msgid "Pink"
+msgstr ""
+
+#: Resources/tooltips_en.py:206
+msgid "Gauss"
+msgstr ""
+
+#: Resources/tooltips_en.py:208
+msgid "Bandwith"
+msgstr ""
+
+#: Resources/tooltips_en.py:211
+msgid "Sound Sample"
+msgstr ""
+
+#: Resources/tooltips_en.py:213
+msgid "Sample Number"
+msgstr ""
+
+#: Resources/tooltips_en.py:214
+msgid "Sample name"
+msgstr ""
+
+#: Resources/tooltips_en.py:218
+msgid "Voice"
+msgstr ""
+
+#: Resources/tooltips_en.py:220
+msgid "Vowel"
+msgstr ""
+
+#: Resources/tooltips_en.py:225 Resources/tooltips_en.py:301
+msgid "grain"
+msgstr ""
+
+#: Resources/tooltips_en.py:228
+msgid "index"
+msgstr ""
+
+#: Resources/tooltips_en.py:231 Resources/tooltips_en.py:302
+msgid "addSynth"
+msgstr ""
+
+#: Resources/tooltips_en.py:233
+msgid "spread"
+msgstr ""
+
+#: Resources/tooltips_en.py:234
+msgid "waveform"
+msgstr ""
+
+#: Resources/tooltips_en.py:238 Resources/tooltips_en.py:285
+msgid "Delay"
+msgstr ""
+
+#: Resources/tooltips_en.py:241
+msgid "Feedback"
+msgstr ""
+
+#: Resources/tooltips_en.py:244
+msgid "Distortion"
+msgstr ""
+
+#: Resources/tooltips_en.py:246
+msgid "Resonance"
+msgstr ""
+
+#: Resources/tooltips_en.py:247
+msgid "Distotion Level"
+msgstr ""
+
+#: Resources/tooltips_en.py:250
+msgid "Filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:254
+msgid "Lowpass"
+msgstr ""
+
+#: Resources/tooltips_en.py:254
+msgid "Highpass"
+msgstr ""
+
+#: Resources/tooltips_en.py:254
+msgid "Bandpass"
+msgstr ""
+
+#: Resources/tooltips_en.py:257
+msgid "Ring Modulator"
+msgstr ""
+
+#: Resources/tooltips_en.py:259
+msgid "Mix"
+msgstr ""
+
+#: Resources/tooltips_en.py:265
+msgid "Length"
+msgstr ""
+
+#: Resources/tooltips_en.py:267
+msgid "Reverb Level"
+msgstr ""
+
+#: Resources/tooltips_en.py:270
+msgid "Harmonizer"
+msgstr ""
+
+#: Resources/tooltips_en.py:272
+msgid "Dry delay"
+msgstr ""
+
+#: Resources/tooltips_en.py:276
+msgid "Equalizer 4 bands"
+msgstr ""
+
+#: Resources/tooltips_en.py:277
+msgid "Band one gain"
+msgstr ""
+
+#: Resources/tooltips_en.py:278
+msgid "Band two gain"
+msgstr ""
+
+#: Resources/tooltips_en.py:279
+msgid "Band three gain"
+msgstr ""
+
+#: Resources/tooltips_en.py:280
+msgid "Band four gain"
+msgstr ""
+
+#: Resources/tooltips_en.py:282
+msgid "Chorus"
+msgstr ""
+
+#: Resources/tooltips_en.py:283
+msgid "LFO Depth"
+msgstr ""
+
+#: Resources/tooltips_en.py:284
+msgid "LFO Frequency"
+msgstr ""
+
+#: Resources/tooltips_en.py:289
+msgid "lfo"
+msgstr ""
+
+#: Resources/tooltips_en.py:290
+msgid "rand"
+msgstr ""
+
+#: Resources/tooltips_en.py:291
+msgid "adsr"
+msgstr ""
+
+#: Resources/tooltips_en.py:292
+msgid "trackpadX"
+msgstr ""
+
+#: Resources/tooltips_en.py:293
+msgid "trackpadY"
+msgstr ""
+
+#: Resources/tooltips_en.py:294
+msgid "fm"
+msgstr ""
+
+#: Resources/tooltips_en.py:295
+msgid "buzz"
+msgstr ""
+
+#: Resources/tooltips_en.py:296
+msgid "vco"
+msgstr ""
+
+#: Resources/tooltips_en.py:297
+msgid "pluck"
+msgstr ""
+
+#: Resources/tooltips_en.py:298
+msgid "noise"
+msgstr ""
+
+#: Resources/tooltips_en.py:299
+msgid "sample"
+msgstr ""
+
+#: Resources/tooltips_en.py:300
+msgid "voice"
+msgstr ""
+
+#: Resources/tooltips_en.py:303
+msgid "wguide"
+msgstr ""
+
+#: Resources/tooltips_en.py:304
+msgid "distort"
+msgstr ""
+
+#: Resources/tooltips_en.py:305
+msgid "filter"
+msgstr ""
+
+#: Resources/tooltips_en.py:306
+msgid "ring"
+msgstr ""
+
+#: Resources/tooltips_en.py:307
+msgid "reverb"
+msgstr ""
+
+#: Resources/tooltips_en.py:308
+msgid "harmon"
+msgstr ""
+
+#: Resources/tooltips_en.py:309
+msgid "eq4band"
+msgstr ""
+
+#: Resources/tooltips_en.py:310
+msgid "chorus"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:27
+msgid "Duration:  "
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:43
+msgid "Duration"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:51
+msgid "Record Synth sound into slot 1"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:57
+msgid "Record Synth sound into slot 2"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:63
+msgid "Record Synth sound into slot 3"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:69
+msgid "Record Synth sound into slot 4"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:75
+msgid "Record Synth sound into slot 5"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:81
+msgid "Record Synth sound into slot 6"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:89
+msgid "Reset the worktable"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:109
+msgid "Preset 1"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:115
+msgid "Preset 2"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:121
+msgid "Preset 3"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:127
+msgid "Preset 4"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:133
+msgid "Preset 5"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:139
+msgid "Preset 6"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:145
+msgid "Preset 7"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:151
+msgid "Preset 8"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:157
+msgid "Preset 9"
+msgstr ""
+
+#: SynthLab/SynthLabToolbars.py:163
+msgid "Preset 10"
+msgstr ""
+
+#: SynthLab/SynthLabWindow.py:61
+msgid "Main"
+msgstr ""
+
+#: SynthLab/SynthLabWindow.py:62
+msgid "Presets"
+msgstr ""
+
+#: Welcome.py:32
+msgid "Help"
+msgstr ""
+
+#: miniTamTam/miniTamTamMain.py:150
+msgid "Record"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:104
+msgid "Record microphone into slot 1"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:110
+msgid "Record microphone into slot 2"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:116
+msgid "Record microphone into slot 3"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:130
+msgid "Click to record a loop"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:136
+msgid "Click to add a loop"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:143
+msgid "Click to clear all loops"
+msgstr ""
+
+#: miniTamTam/miniToolbars.py:151
+msgid "Add new sound"
+msgstr ""
author	Oli <olivier.beloanger@umontreal.ca>	2007-07-30 05:04:35 (GMT)
committer	Oli <olivier.beloanger@umontreal.ca>	2007-07-30 05:04:35 (GMT)
commit	143f535abcf66b6bb16ac3ae2be33f53233411c9 (patch)
tree	9a36cae458890789ae4cc1c52c027b4678b05c0b
parent	a422f5df140f489ff34c4d0e78d2f51831035f9e (diff)
parent	8d2150a51306c0fc95cbadb4e9aae6be47f9b064 (diff)