diff --git a/.classpath b/.classpath
old mode 100644
new mode 100755
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.project b/.project
old mode 100644
new mode 100755
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
old mode 100644
new mode 100755
index 6aaf6be..a93c30f
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rj.pixelesque"
-      android:versionCode="6"
-      android:versionName="1.2">
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
+      android:versionCode="7"
+      android:versionName="1.2.01">
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hardwareAccelerated="true"
diff --git a/README b/README
old mode 100644
new mode 100755
diff --git a/dist/Android 4.0/PixelArt.bar b/dist/Android 4.0/PixelArt.bar
new file mode 100644
index 0000000..441017f
Binary files /dev/null and b/dist/Android 4.0/PixelArt.bar differ
diff --git a/dist/Android 4.0/PixelArt.lsv b/dist/Android 4.0/PixelArt.lsv
new file mode 100644
index 0000000..561cfa0
--- /dev/null
+++ b/dist/Android 4.0/PixelArt.lsv	
@@ -0,0 +1 @@
+1.0.7.0
\ No newline at end of file
diff --git a/exports/Pixelesque-1.0.1.apk b/exports/Pixelesque-1.0.1.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.0.apk b/exports/Pixelesque-1.0.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.1.5.apk b/exports/Pixelesque-1.1.5.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.1.5final.apk b/exports/Pixelesque-1.1.5final.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.1.apk b/exports/Pixelesque-1.1.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.2.apk b/exports/Pixelesque-1.2.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-1.2ALPHA.apk b/exports/Pixelesque-1.2ALPHA.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque-rc1.apk b/exports/Pixelesque-rc1.apk
old mode 100644
new mode 100755
diff --git a/exports/Pixelesque1.1aUNSIGNED.apk b/exports/Pixelesque1.1aUNSIGNED.apk
old mode 100644
new mode 100755
diff --git a/futureideas.txt b/futureideas.txt
old mode 100644
new mode 100755
index 8b9ea06..015b273
--- a/futureideas.txt
+++ b/futureideas.txt
@@ -23,3 +23,15 @@ pro tools:
 	non destructive resize/move
 	auto import image (not as background)
 
+
+
+import activity
+	camera or image
+	adjust pixel size
+editor activity
+	control foreground transparancy/toggle
+
+Camera
+	automatically pixelate
+		gradient algorithms for better pixelating
+	import into pixelesque
diff --git a/libs/AndMT.zip b/libs/AndMT.zip
old mode 100644
new mode 100755
diff --git a/proguard.cfg b/proguard.cfg
old mode 100644
new mode 100755
diff --git a/proguard/dump.txt b/proguard/dump.txt
old mode 100644
new mode 100755
diff --git a/proguard/mapping.txt b/proguard/mapping.txt
old mode 100644
new mode 100755
diff --git a/proguard/seeds.txt b/proguard/seeds.txt
old mode 100644
new mode 100755
diff --git a/proguard/usage.txt b/proguard/usage.txt
old mode 100644
new mode 100755
diff --git a/project.properties b/project.properties
old mode 100644
new mode 100755
index d1c8338..8d27e43
--- a/project.properties
+++ b/project.properties
@@ -7,8 +7,8 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-android.library.reference.1=../../../Documents/workspace/AndMT
 #proguard.config=proguard.cfg
 # Project target.
-target=android-11
-android.library.reference.2=../../../Documents/workspace/Processing15
+target=android-14
+android.library.reference.1=../../../../../Volumes/osfree/workspace/AndMT
+android.library.reference.2=../../../../../Volumes/osfree/workspace/Processing15
diff --git a/psds/blockynull-small.xcf b/psds/blockynull-small.xcf
old mode 100644
new mode 100755
diff --git a/psds/bottombar.xcf b/psds/bottombar.xcf
old mode 100644
new mode 100755
diff --git a/psds/featured.png b/psds/featured.png
old mode 100644
new mode 100755
diff --git a/psds/featured.xcf b/psds/featured.xcf
old mode 100644
new mode 100755
diff --git a/psds/featured1920.png b/psds/featured1920.png
new file mode 100644
index 0000000..25b7391
Binary files /dev/null and b/psds/featured1920.png differ
diff --git a/psds/featured1920.xcf b/psds/featured1920.xcf
new file mode 100644
index 0000000..8551926
Binary files /dev/null and b/psds/featured1920.xcf differ
diff --git a/psds/featured290.png b/psds/featured290.png
old mode 100644
new mode 100755
diff --git a/psds/icon.png b/psds/icon.png
old mode 100644
new mode 100755
diff --git a/psds/icon114.png b/psds/icon114.png
old mode 100644
new mode 100755
diff --git a/psds/icon480.png b/psds/icon480.png
new file mode 100644
index 0000000..6763ae8
Binary files /dev/null and b/psds/icon480.png differ
diff --git a/psds/icons.psd b/psds/icons.psd
old mode 100644
new mode 100755
diff --git a/psds/icons.xcf b/psds/icons.xcf
old mode 100644
new mode 100755
diff --git a/psds/pixelesque.xcf b/psds/pixelesque.xcf
old mode 100644
new mode 100755
diff --git a/psds/pixelesque2.xcf b/psds/pixelesque2.xcf
old mode 100644
new mode 100755
diff --git a/psds/promo.png b/psds/promo.png
old mode 100644
new mode 100755
diff --git a/psds/promo.xcf b/psds/promo.xcf
old mode 100644
new mode 100755
diff --git a/psds/topbar-hc.xcf b/psds/topbar-hc.xcf
old mode 100644
new mode 100755
diff --git a/psds/topbar.xcf b/psds/topbar.xcf
old mode 100644
new mode 100755
diff --git a/psds/topbar2.xcf b/psds/topbar2.xcf
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/back.png b/res/drawable-hdpi/back.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/back_disabled.png b/res/drawable-hdpi/back_disabled.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/back_pressed.png b/res/drawable-hdpi/back_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bottombar_bg.png b/res/drawable-hdpi/bottombar_bg.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bucket.png b/res/drawable-hdpi/bucket.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bucket_pressed.png b/res/drawable-hdpi/bucket_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/bucket_selected.png b/res/drawable-hdpi/bucket_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/circle.png b/res/drawable-hdpi/circle.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/circle_pressed.png b/res/drawable-hdpi/circle_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/circle_selected.png b/res/drawable-hdpi/circle_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/clear.png b/res/drawable-hdpi/clear.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/color.png b/res/drawable-hdpi/color.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/color_pressed.png b/res/drawable-hdpi/color_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/eraser.png b/res/drawable-hdpi/eraser.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/eraser_pressed.png b/res/drawable-hdpi/eraser_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/eraser_selected.png b/res/drawable-hdpi/eraser_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/export.png b/res/drawable-hdpi/export.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/forward.png b/res/drawable-hdpi/forward.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/forward_disabled.png b/res/drawable-hdpi/forward_disabled.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/forward_pressed.png b/res/drawable-hdpi/forward_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/res/drawable-hdpi/ic_menu_close_clear_cancel.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_save.png b/res/drawable-hdpi/ic_menu_save.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_set_as.png b/res/drawable-hdpi/ic_menu_set_as.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/iconsmall.png b/res/drawable-hdpi/iconsmall.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/line.png b/res/drawable-hdpi/line.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/line_pressed.png b/res/drawable-hdpi/line_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/line_selected.png b/res/drawable-hdpi/line_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/menunew.png b/res/drawable-hdpi/menunew.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/more.png b/res/drawable-hdpi/more.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/open.png b/res/drawable-hdpi/open.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pen.png b/res/drawable-hdpi/pen.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pen_pressed.png b/res/drawable-hdpi/pen_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pen_selected.png b/res/drawable-hdpi/pen_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pencil.png b/res/drawable-hdpi/pencil.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pencil_disabled.png b/res/drawable-hdpi/pencil_disabled.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pencil_pressed.png b/res/drawable-hdpi/pencil_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/pencil_selected.png b/res/drawable-hdpi/pencil_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/rect.png b/res/drawable-hdpi/rect.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/rect_pressed.png b/res/drawable-hdpi/rect_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/rect_selected.png b/res/drawable-hdpi/rect_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/save.png b/res/drawable-hdpi/save.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/saveas.png b/res/drawable-hdpi/saveas.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/shapes.png b/res/drawable-hdpi/shapes.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/shapes_pressed.png b/res/drawable-hdpi/shapes_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/shapes_selected.png b/res/drawable-hdpi/shapes_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/share.png b/res/drawable-hdpi/share.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_down_disabled.9.png b/res/drawable-hdpi/timepicker_down_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_down_disabled_focused.9.png b/res/drawable-hdpi/timepicker_down_disabled_focused.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_down_normal.9.png b/res/drawable-hdpi/timepicker_down_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_down_pressed.9.png b/res/drawable-hdpi/timepicker_down_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_down_selected.9.png b/res/drawable-hdpi/timepicker_down_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_input_disabled.9.png b/res/drawable-hdpi/timepicker_input_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_input_normal.9.png b/res/drawable-hdpi/timepicker_input_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_input_pressed.9.png b/res/drawable-hdpi/timepicker_input_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_input_selected.9.png b/res/drawable-hdpi/timepicker_input_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_up_disabled.9.png b/res/drawable-hdpi/timepicker_up_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_up_disabled_focused.9.png b/res/drawable-hdpi/timepicker_up_disabled_focused.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_up_normal.9.png b/res/drawable-hdpi/timepicker_up_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_up_pressed.9.png b/res/drawable-hdpi/timepicker_up_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/timepicker_up_selected.9.png b/res/drawable-hdpi/timepicker_up_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-hdpi/topbar_rightside.png b/res/drawable-hdpi/topbar_rightside.png
old mode 100644
new mode 100755
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/clear.png b/res/drawable-mdpi/clear.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/export.png b/res/drawable-mdpi/export.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/ic_menu_save.png b/res/drawable-mdpi/ic_menu_save.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/menunew.png b/res/drawable-mdpi/menunew.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/open.png b/res/drawable-mdpi/open.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/save.png b/res/drawable-mdpi/save.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/saveas.png b/res/drawable-mdpi/saveas.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/share.png b/res/drawable-mdpi/share.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_down_disabled.9.png b/res/drawable-mdpi/timepicker_down_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_down_disabled_focused.9.png b/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_down_normal.9.png b/res/drawable-mdpi/timepicker_down_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_down_pressed.9.png b/res/drawable-mdpi/timepicker_down_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_down_selected.9.png b/res/drawable-mdpi/timepicker_down_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_input_disabled.9.png b/res/drawable-mdpi/timepicker_input_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_input_normal.9.png b/res/drawable-mdpi/timepicker_input_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_input_pressed.9.png b/res/drawable-mdpi/timepicker_input_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_input_selected.9.png b/res/drawable-mdpi/timepicker_input_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_up_disabled.9.png b/res/drawable-mdpi/timepicker_up_disabled.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_up_disabled_focused.9.png b/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_up_normal.9.png b/res/drawable-mdpi/timepicker_up_normal.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_up_pressed.9.png b/res/drawable-mdpi/timepicker_up_pressed.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-mdpi/timepicker_up_selected.9.png b/res/drawable-mdpi/timepicker_up_selected.9.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/bucket_pressed.png b/res/drawable-xlarge-hdpi/bucket_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/bucket_selected.png b/res/drawable-xlarge-hdpi/bucket_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/circle_pressed.png b/res/drawable-xlarge-hdpi/circle_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/circle_selected.png b/res/drawable-xlarge-hdpi/circle_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/eraser_pressed.png b/res/drawable-xlarge-hdpi/eraser_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/eraser_selected.png b/res/drawable-xlarge-hdpi/eraser_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/line_pressed.png b/res/drawable-xlarge-hdpi/line_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/line_selected.png b/res/drawable-xlarge-hdpi/line_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/more.png b/res/drawable-xlarge-hdpi/more.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/pen_pressed.png b/res/drawable-xlarge-hdpi/pen_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/pen_selected.png b/res/drawable-xlarge-hdpi/pen_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/pencil_pressed.png b/res/drawable-xlarge-hdpi/pencil_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/pencil_selected.png b/res/drawable-xlarge-hdpi/pencil_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/rect_pressed.png b/res/drawable-xlarge-hdpi/rect_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/rect_selected.png b/res/drawable-xlarge-hdpi/rect_selected.png
old mode 100644
new mode 100755
diff --git a/res/drawable-xlarge-hdpi/shapes_pressed.png b/res/drawable-xlarge-hdpi/shapes_pressed.png
old mode 100644
new mode 100755
diff --git a/res/drawable/bucketbutton_bg.xml b/res/drawable/bucketbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/circlebutton_bg.xml b/res/drawable/circlebutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/color_hue.png b/res/drawable/color_hue.png
old mode 100644
new mode 100755
diff --git a/res/drawable/color_seekselector.png b/res/drawable/color_seekselector.png
old mode 100644
new mode 100755
diff --git a/res/drawable/color_selector.png b/res/drawable/color_selector.png
old mode 100644
new mode 100755
diff --git a/res/drawable/colorbutton_bg.xml b/res/drawable/colorbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/dialogbg.xml b/res/drawable/dialogbg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/eraserbutton_bg.xml b/res/drawable/eraserbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/hex32.png b/res/drawable/hex32.png
old mode 100644
new mode 100755
diff --git a/res/drawable/hsv32.png b/res/drawable/hsv32.png
old mode 100644
new mode 100755
diff --git a/res/drawable/linebutton_bg.xml b/res/drawable/linebutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/penbutton_bg.xml b/res/drawable/penbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/pencilbutton_bg.xml b/res/drawable/pencilbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/rectbutton_bg.xml b/res/drawable/rectbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/redobutton_bg.xml b/res/drawable/redobutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/rgb32.png b/res/drawable/rgb32.png
old mode 100644
new mode 100755
diff --git a/res/drawable/shapesbutton_bg.xml b/res/drawable/shapesbutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/timepicker_down_btn.xml b/res/drawable/timepicker_down_btn.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/timepicker_input.xml b/res/drawable/timepicker_input.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/timepicker_up_btn.xml b/res/drawable/timepicker_up_btn.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/transparentback.png b/res/drawable/transparentback.png
old mode 100644
new mode 100755
diff --git a/res/drawable/transparentbackrepeat.xml b/res/drawable/transparentbackrepeat.xml
old mode 100644
new mode 100755
diff --git a/res/drawable/undobutton_bg.xml b/res/drawable/undobutton_bg.xml
old mode 100644
new mode 100755
diff --git a/res/layout-land/actual_buttonbar.xml b/res/layout-land/actual_buttonbar.xml
new file mode 100755
index 0000000..1a5fc20
--- /dev/null
+++ b/res/layout-land/actual_buttonbar.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scroll_buttonbarz"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_alignParentRight="true"
+    android:scrollbars="none" >
+
+    <com.rj.pixelesque.PixelArtStateView
+        android:id="@+id/buttonbarz"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/hud_background"
+        android:orientation="vertical" >
+
+        <ImageView
+            android:id="@+id/pencilmode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/pencilbutton_bg" />
+
+        <RelativeLayout
+            android:id="@+id/shapesholder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+
+            <ImageView
+                android:id="@+id/shapesmode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/shapesbutton_bg" />
+
+            <ImageView
+                android:id="@+id/shapesmode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/more" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/erasermode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/eraserbutton_bg" />
+
+        <ImageView
+            android:id="@+id/pointermode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/penbutton_bg"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+
+            <ImageView
+                android:id="@+id/colorpicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/colorbutton_bg" />
+
+            <View
+                android:id="@+id/colorindicator"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerInParent="true" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/undo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/undobutton_bg" />
+
+        <ImageView
+            android:id="@+id/redo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/redobutton_bg" />
+    </com.rj.pixelesque.PixelArtStateView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-land/buttonbar.xml b/res/layout-land/buttonbar.xml
new file mode 100755
index 0000000..d649f5b
--- /dev/null
+++ b/res/layout-land/buttonbar.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/layout"
+    >
+    <LinearLayout 
+    	android:id="@+id/surfaceholder"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent"
+    	android:layout_toLeftOf="@+id/scroll_buttonbarz"
+    	android:background="#199"
+    />
+    
+    <include
+        layout="@layout/shapesmenu" 
+ 		android:id="@+id/shapesmenu" />
+    
+    
+	<include
+	    layout="@layout/actual_buttonbar"
+		android:id="@+id/scroll_buttonbarz"
+		android:layout_alignParentRight="true"
+		android:layout_width="wrap_content"
+	    android:layout_height="match_parent"
+	    android:scrollbars="none"
+		/>
+</RelativeLayout>
diff --git a/res/layout-land/shapesmenu.xml b/res/layout-land/shapesmenu.xml
new file mode 100755
index 0000000..0fec129
--- /dev/null
+++ b/res/layout-land/shapesmenu.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/shapesmenu"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_toLeftOf="@+id/scroll_buttonbarz"
+    android:background="@color/hud_background"
+    android:orientation="vertical"
+    android:visibility="gone" >
+
+    <ImageView
+        android:id="@+id/bucketmode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        android:src="@drawable/bucketbutton_bg" />
+
+    <ImageView
+        android:id="@+id/circlemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/bucketmode"
+        android:layout_toRightOf="@+id/bucketmode"
+        android:scaleType="centerInside"
+        android:src="@drawable/circlebutton_bg" />
+
+    <ImageView
+        android:id="@+id/rectanglemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/bucketmode"
+        android:scaleType="centerInside"
+        android:src="@drawable/rectbutton_bg" />
+
+    <ImageView
+        android:id="@+id/linemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/rectanglemode"
+        android:layout_alignRight="@+id/circlemode"
+        android:layout_below="@+id/circlemode"
+        android:layout_toRightOf="@+id/rectanglemode"
+        android:scaleType="centerInside"
+        android:src="@drawable/linebutton_bg" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-ldpi/buttonbar.xml b/res/layout-ldpi/buttonbar.xml
old mode 100644
new mode 100755
diff --git a/res/layout-v11/buttonbar.xml b/res/layout-v11/buttonbar.xml
old mode 100644
new mode 100755
index aeba67a..db205ae
--- a/res/layout-v11/buttonbar.xml
+++ b/res/layout-v11/buttonbar.xml
@@ -1,181 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
     android:id="@+id/layout"
-    >
-    <LinearLayout 
-    	android:id="@+id/surfaceholder"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	android:layout_toLeftOf="@+id/scroll_buttonbarz"
-    	android:background="#199"
-    />
-    
-        <RelativeLayout 
-	   	android:id="@+id/shapesmenu"
-	   	android:layout_width="wrap_content"
-	   	android:layout_height="wrap_content"
-	   	android:orientation="vertical"
-		android:visibility="gone"
-		android:background="@color/hud_background"
-	   	android:layout_toLeftOf="@+id/scroll_buttonbarz">
-	    <ImageView
-	    	android:id="@+id/bucketmode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/bucketbutton_bg"
-	    	android:scaleType="centerInside"
-	    	/>
-	    <ImageView
-	    	android:id="@+id/circlemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/circlebutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_toRightOf="@+id/bucketmode"
-	    	android:layout_alignBottom="@+id/bucketmode"    
-	    	/>
-	    <ImageView
-	    	android:id="@+id/rectanglemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/rectbutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_below="@+id/bucketmode"
-	    	/>
-	    <ImageView
-	    	android:id="@+id/linemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/linebutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_below="@+id/circlemode"
-	    	android:layout_toRightOf="@+id/rectanglemode"
-	    	android:layout_alignBottom="@+id/rectanglemode"  
-	    	android:layout_alignRight="@+id/circlemode"  
-	    	/>
-	    	
-    </RelativeLayout>
-    
-    
-	<LinearLayout
-		android:id="@+id/scroll_buttonbarz"
-		android:layout_alignParentRight="true"
-		android:layout_width="wrap_content"
-	    android:layout_height="match_parent"
-	    android:scrollbars="none"
-		>
-		<com.rj.pixelesque.PixelArtStateView 
-			android:id="@+id/buttonbarz"
-		    android:orientation="vertical"
-		    android:layout_width="wrap_content"
-		    android:layout_height="match_parent"
-		    android:background="@color/hud_background"
-		    >
-
-
-
-
-		    <ImageView
-		    	android:id="@+id/pencilmode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/pencilbutton_bg"
-		    	android:scaleType="centerInside"
-		    	android:layout_weight="1"
-		    	/>
-
-
-
-
-		   	<RelativeLayout
-		   		android:id="@+id/shapesholder"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:layout_weight="1"
-			>
-			
-				<ImageView
-			    	android:id="@+id/shapesmode"
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/shapesbutton_bg"
-		    		android:scaleType="centerInside"	
-		    		android:layout_centerInParent="true"		    	
-			    	/>
-				<ImageView
-			    	android:id="@+id/shapesmode"
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/more"
-		    		android:scaleType="centerInside"	
-		    		android:layout_centerInParent="true"		    	
-			    	/>
-		    </RelativeLayout>
-
-
-
-		    <ImageView
-		    	android:id="@+id/erasermode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/eraserbutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	/>	
-		    	
- 		   	<ImageView
-		    	android:id="@+id/pointermode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/penbutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	android:visibility="gone"
-		    	/>   	
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
 
 
+    <LinearLayout
+        android:id="@+id/surfaceholder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/topbar"
+        android:layout_above="@+id/scroll_buttonbarz"
+        android:background="#119" />
 
+    <include
+        android:id="@+id/shapesmenu"
+	   	android:layout_width="wrap_content"
+	   	android:layout_height="wrap_content"
+        android:layout_above="@+id/scroll_buttonbarz"
+        layout="@layout/shapesmenu" />
 
-		   	<RelativeLayout
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:layout_weight="1"
-			>
-				<ImageView
-			    	android:id="@+id/colorpicker"
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/colorbutton_bg"
-		    		android:scaleType="centerInside"	
-		    		android:layout_centerInParent="true"		    	
-			    	/>
-			    <View
-			    	android:id="@+id/colorindicator"
-			    	android:layout_width="30dp"
-			    	android:layout_height="30dp"
-			    	android:layout_centerInParent="true"
-			    		/>
-		    </RelativeLayout>
+    <include
+        android:id="@+id/scroll_buttonbarz"
+		android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:scrollbars="none"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        layout="@layout/actual_buttonbar" />
 
-		    
-		    <ImageView
-		    	android:id="@+id/undo"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/undobutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	/>	
-			<ImageView
-		    	android:id="@+id/redo"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/redobutton_bg"
-		    	android:scaleType="centerInside"
-		    	android:layout_weight="1"
-		    	/>
-		</com.rj.pixelesque.PixelArtStateView>
-	</LinearLayout>
 </RelativeLayout>
diff --git a/res/layout-xlarge-land-v11/buttonbar.xml b/res/layout-xlarge-land-v11/buttonbar.xml
new file mode 100755
index 0000000..aeba67a
--- /dev/null
+++ b/res/layout-xlarge-land-v11/buttonbar.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/layout"
+    >
+    <LinearLayout 
+    	android:id="@+id/surfaceholder"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent"
+    	android:layout_toLeftOf="@+id/scroll_buttonbarz"
+    	android:background="#199"
+    />
+    
+        <RelativeLayout 
+	   	android:id="@+id/shapesmenu"
+	   	android:layout_width="wrap_content"
+	   	android:layout_height="wrap_content"
+	   	android:orientation="vertical"
+		android:visibility="gone"
+		android:background="@color/hud_background"
+	   	android:layout_toLeftOf="@+id/scroll_buttonbarz">
+	    <ImageView
+	    	android:id="@+id/bucketmode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/bucketbutton_bg"
+	    	android:scaleType="centerInside"
+	    	/>
+	    <ImageView
+	    	android:id="@+id/circlemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/circlebutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_toRightOf="@+id/bucketmode"
+	    	android:layout_alignBottom="@+id/bucketmode"    
+	    	/>
+	    <ImageView
+	    	android:id="@+id/rectanglemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/rectbutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_below="@+id/bucketmode"
+	    	/>
+	    <ImageView
+	    	android:id="@+id/linemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/linebutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_below="@+id/circlemode"
+	    	android:layout_toRightOf="@+id/rectanglemode"
+	    	android:layout_alignBottom="@+id/rectanglemode"  
+	    	android:layout_alignRight="@+id/circlemode"  
+	    	/>
+	    	
+    </RelativeLayout>
+    
+    
+	<LinearLayout
+		android:id="@+id/scroll_buttonbarz"
+		android:layout_alignParentRight="true"
+		android:layout_width="wrap_content"
+	    android:layout_height="match_parent"
+	    android:scrollbars="none"
+		>
+		<com.rj.pixelesque.PixelArtStateView 
+			android:id="@+id/buttonbarz"
+		    android:orientation="vertical"
+		    android:layout_width="wrap_content"
+		    android:layout_height="match_parent"
+		    android:background="@color/hud_background"
+		    >
+
+
+
+
+		    <ImageView
+		    	android:id="@+id/pencilmode"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/pencilbutton_bg"
+		    	android:scaleType="centerInside"
+		    	android:layout_weight="1"
+		    	/>
+
+
+
+
+		   	<RelativeLayout
+		   		android:id="@+id/shapesholder"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:layout_weight="1"
+			>
+			
+				<ImageView
+			    	android:id="@+id/shapesmode"
+			    	android:layout_width="wrap_content"
+			    	android:layout_height="wrap_content"
+			    	android:src="@drawable/shapesbutton_bg"
+		    		android:scaleType="centerInside"	
+		    		android:layout_centerInParent="true"		    	
+			    	/>
+				<ImageView
+			    	android:id="@+id/shapesmode"
+			    	android:layout_width="wrap_content"
+			    	android:layout_height="wrap_content"
+			    	android:src="@drawable/more"
+		    		android:scaleType="centerInside"	
+		    		android:layout_centerInParent="true"		    	
+			    	/>
+		    </RelativeLayout>
+
+
+
+		    <ImageView
+		    	android:id="@+id/erasermode"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/eraserbutton_bg"
+		    	android:scaleType="centerInside"		    	
+		    	android:layout_weight="1"
+		    	/>	
+		    	
+ 		   	<ImageView
+		    	android:id="@+id/pointermode"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/penbutton_bg"
+		    	android:scaleType="centerInside"		    	
+		    	android:layout_weight="1"
+		    	android:visibility="gone"
+		    	/>   	
+
+
+
+
+		   	<RelativeLayout
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:layout_weight="1"
+			>
+				<ImageView
+			    	android:id="@+id/colorpicker"
+			    	android:layout_width="wrap_content"
+			    	android:layout_height="wrap_content"
+			    	android:src="@drawable/colorbutton_bg"
+		    		android:scaleType="centerInside"	
+		    		android:layout_centerInParent="true"		    	
+			    	/>
+			    <View
+			    	android:id="@+id/colorindicator"
+			    	android:layout_width="30dp"
+			    	android:layout_height="30dp"
+			    	android:layout_centerInParent="true"
+			    		/>
+		    </RelativeLayout>
+
+		    
+		    <ImageView
+		    	android:id="@+id/undo"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/undobutton_bg"
+		    	android:scaleType="centerInside"		    	
+		    	android:layout_weight="1"
+		    	/>	
+			<ImageView
+		    	android:id="@+id/redo"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/redobutton_bg"
+		    	android:scaleType="centerInside"
+		    	android:layout_weight="1"
+		    	/>
+		</com.rj.pixelesque.PixelArtStateView>
+	</LinearLayout>
+</RelativeLayout>
diff --git a/res/layout-xlarge-land-v11/colordialog.xml b/res/layout-xlarge-land-v11/colordialog.xml
new file mode 100755
index 0000000..20c215c
--- /dev/null
+++ b/res/layout-xlarge-land-v11/colordialog.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/popupbox"
+	android:layout_width="325dp" 
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:background="@drawable/dialogbg">
+	
+	<de.devmil.common.ui.color.ColorSelectorView
+		android:id="@+id/content"
+		android:layout_width="match_parent" 
+		android:layout_height="match_parent"
+		android:orientation="horizontal"
+		/>
+		
+
+	<de.devmil.common.ui.color.HistorySelectorView
+		android:id="@+id/historyselector"
+		android:layout_width="match_parent" 
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="5dp"
+	/>
+			
+	<LinearLayout
+		android:layout_width="match_parent" 
+		android:layout_height="wrap_content"
+		android:orientation="horizontal"
+		android:background="@drawable/transparentbackrepeat">
+		<Button
+			android:id="@+id/button_old"
+			android:layout_width="fill_parent" 
+			android:layout_height="40dp"
+			android:text="@string/color_old_color"
+			android:layout_weight="1"
+		/>
+		
+		<View
+			android:layout_width="5dp" 
+			android:layout_height="40dp"
+			android:background="#033"
+			android:layout_weight="0.01"
+			/>
+		
+		<Button
+			android:id="@+id/button_new"
+			android:layout_width="fill_parent" 
+			android:layout_height="40dp"
+			android:text="@string/color_new_color"
+			android:layout_weight="1"
+		/>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/actual_buttonbar.xml b/res/layout/actual_buttonbar.xml
new file mode 100755
index 0000000..da93f97
--- /dev/null
+++ b/res/layout/actual_buttonbar.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	>
+   	<ImageView
+   		android:id="@+id/bottombarbackground"
+    	android:layout_width="wrap_content"
+    	android:layout_height="wrap_content"
+    	android:layout_alignBottom="@+id/buttonbarz"
+    	android:layout_alignLeft="@+id/buttonbarz"
+    	android:src="@drawable/bottombar_bg"
+		android:scaleType="centerCrop"
+		android:background="@color/hud_background"
+    	/>    
+	<com.rj.pixelesque.PixelArtStateView 
+		android:id="@+id/buttonbarz"
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="60dp"
+	    android:gravity="bottom"
+	    >
+
+	    <ImageView
+	    	android:id="@+id/pencilmode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/pencilbutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_weight="1"
+	    	/>
+
+	   	<RelativeLayout
+	   		android:id="@+id/shapesholder"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:layout_weight="1"
+		>
+		
+			<ImageView
+		    	android:id="@+id/shapesmode"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/shapesbutton_bg"
+	    		android:scaleType="centerInside"	
+	    		android:layout_centerInParent="true"		    	
+		    	/>
+			<ImageView
+		    	android:id="@+id/shapesmode"
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/more"
+	    		android:scaleType="centerInside"	
+	    		android:layout_centerInParent="true"		    	
+		    	/>
+	    </RelativeLayout>
+
+	    <ImageView
+	    	android:id="@+id/erasermode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/eraserbutton_bg"
+	    	android:scaleType="centerInside"		    	
+	    	android:layout_weight="1"
+	    	/>	
+	    	
+		   	<ImageView
+	    	android:id="@+id/pointermode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/penbutton_bg"
+	    	android:scaleType="centerInside"		    	
+	    	android:layout_weight="1"
+	    	android:visibility="gone"
+	    	/>   	
+			<RelativeLayout
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:layout_weight="1"
+		>
+			<ImageView
+		    	android:id="@+id/colorpicker" 
+		    	android:layout_width="wrap_content"
+		    	android:layout_height="wrap_content"
+		    	android:src="@drawable/colorbutton_bg"
+	    		android:scaleType="centerInside"		
+	    		android:layout_centerInParent="true"		    	
+			    	/>
+		    <View
+		    	android:id="@+id/colorindicator"
+		    	android:layout_width="25dp"
+		    	android:layout_height="25dp"
+		    	android:layout_centerInParent="true"
+		    		/>
+	    </RelativeLayout>
+	    
+	    <ImageView
+	    	android:id="@+id/undo"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/undobutton_bg"
+	    	android:scaleType="centerInside"		    	
+	    	android:layout_weight="1"
+	    	/>	
+		<ImageView
+	    	android:id="@+id/redo"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/redobutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_weight="1"
+	    	/>
+	</com.rj.pixelesque.PixelArtStateView>
+</RelativeLayout>
diff --git a/res/layout/artlist.xml b/res/layout/artlist.xml
old mode 100644
new mode 100755
diff --git a/res/layout/artlistitem.xml b/res/layout/artlistitem.xml
old mode 100644
new mode 100755
diff --git a/res/layout/buttonbar.xml b/res/layout/buttonbar.xml
old mode 100644
new mode 100755
index e63701a..bee62c6
--- a/res/layout/buttonbar.xml
+++ b/res/layout/buttonbar.xml
@@ -1,214 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
     android:id="@+id/layout"
-    >
-    <RelativeLayout
-    	android:id="@+id/topbar"
-    	android:layout_width="match_parent"
-    	android:layout_height="26dp"
-    	android:paddingLeft="10dp"
-    	android:layout_alignParentTop="true"
-	    android:background="@color/hud_background"
-	    android:layout_marginBottom="2dp"
-    >
-    	<ImageView
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:layout_alignParentRight="true"
-	    	android:layout_alignParentTop="true"
-	    	android:src="@drawable/topbar_rightside"
-			android:scaleType="centerCrop"
-	    	/>    
-    	<ImageView
-        	android:id="@+id/title"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:layout_alignParentLeft="true"
-	    	android:layout_centerVertical="true"
-	    	android:src="@drawable/iconsmall"
-	    	/>
-    
-    	<TextView
-        	android:id="@+id/picturename"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:layout_centerHorizontal="true"
-	    	android:layout_centerVertical="true"
-	    	android:text="New Pixel Art"
-	    	android:textStyle="bold"
-	    	/>
-	    	
-	 </RelativeLayout>
-    <LinearLayout 
-    	android:id="@+id/surfaceholder"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent"
-    	android:layout_above="@+id/scroll_buttonbarz"
-    	android:layout_below="@+id/topbar"
-    	android:background="#199"
-    />
-    <RelativeLayout 
-	   	android:id="@+id/shapesmenu"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <include
+        android:id="@+id/topbar"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        layout="@layout/topbar" />
+
+    <LinearLayout
+        android:id="@+id/surfaceholder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/topbar"
+        android:layout_above="@+id/scroll_buttonbarz"
+        android:background="#119" />
+
+    <include
+        android:id="@+id/shapesmenu"
+        android:layout_above="@+id/scroll_buttonbarz"
 	   	android:layout_width="wrap_content"
 	   	android:layout_height="wrap_content"
-	   	android:orientation="vertical"
-		android:visibility="gone"
-		android:background="@color/hud_background"
-	   	android:layout_above="@+id/scroll_buttonbarz">
-	    <ImageView
-	    	android:id="@+id/bucketmode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/bucketbutton_bg"
-	    	android:scaleType="centerInside"
-	    	/>
-	    <ImageView
-	    	android:id="@+id/circlemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/circlebutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_toRightOf="@+id/bucketmode"
-	    	android:layout_alignBottom="@+id/bucketmode"    
-	    	/>
-	    <ImageView
-	    	android:id="@+id/rectanglemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/rectbutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_below="@+id/bucketmode"
-	    	/>
-	    <ImageView
-	    	android:id="@+id/linemode"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:src="@drawable/linebutton_bg"
-	    	android:scaleType="centerInside"
-	    	android:layout_below="@+id/circlemode"
-	    	android:layout_toRightOf="@+id/rectanglemode"
-	    	android:layout_alignBottom="@+id/rectanglemode"  
-	    	android:layout_alignRight="@+id/circlemode"  
-	    	/>
-	    	
-    </RelativeLayout>
-    
-	<RelativeLayout
-		android:id="@+id/scroll_buttonbarz"
-		android:layout_alignParentBottom="true"
+        layout="@layout/shapesmenu"
+         />
+
+    <include
+        android:id="@+id/scroll_buttonbarz"
 		android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 	    android:scrollbars="none"
-		>
-    	<ImageView
-    		android:id="@+id/bottombarbackground"
-	    	android:layout_width="wrap_content"
-	    	android:layout_height="wrap_content"
-	    	android:layout_alignBottom="@+id/buttonbarz"
-	    	android:layout_alignLeft="@+id/buttonbarz"
-	    	android:src="@drawable/bottombar_bg"
-			android:scaleType="centerCrop"
-			android:background="@color/hud_background"
-	    	/>    
-		<com.rj.pixelesque.PixelArtStateView 
-			android:id="@+id/buttonbarz"
-		    android:orientation="horizontal"
-		    android:layout_width="fill_parent"
-		    android:layout_height="60dp"
-		    android:gravity="bottom"
-		    >
-
-		    <ImageView
-		    	android:id="@+id/pencilmode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/pencilbutton_bg"
-		    	android:scaleType="centerInside"
-		    	android:layout_weight="1"
-		    	/>
-
-		   	<RelativeLayout
-		   		android:id="@+id/shapesholder"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:layout_weight="1"
-			>
-			
-				<ImageView
-			    	android:id="@+id/shapesmode"
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/shapesbutton_bg"
-		    		android:scaleType="centerInside"	
-		    		android:layout_centerInParent="true"		    	
-			    	/>
-				<ImageView
-			    	android:id="@+id/shapesmode"
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/more"
-		    		android:scaleType="centerInside"	
-		    		android:layout_centerInParent="true"		    	
-			    	/>
-		    </RelativeLayout>
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        layout="@layout/actual_buttonbar" />
 
-		    <ImageView
-		    	android:id="@+id/erasermode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/eraserbutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	/>	
-		    	
- 		   	<ImageView
-		    	android:id="@+id/pointermode"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/penbutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	android:visibility="gone"
-		    	/>   	
- 			<RelativeLayout
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:layout_weight="1"
-			>
-				<ImageView
-			    	android:id="@+id/colorpicker" 
-			    	android:layout_width="wrap_content"
-			    	android:layout_height="wrap_content"
-			    	android:src="@drawable/colorbutton_bg"
-		    		android:scaleType="centerInside"		
-		    		android:layout_centerInParent="true"		    	
- 			    	/>
-			    <View
-			    	android:id="@+id/colorindicator"
-			    	android:layout_width="25dp"
-			    	android:layout_height="25dp"
-			    	android:layout_centerInParent="true"
-			    		/>
-		    </RelativeLayout>
-		    
-		    <ImageView
-		    	android:id="@+id/undo"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/undobutton_bg"
-		    	android:scaleType="centerInside"		    	
-		    	android:layout_weight="1"
-		    	/>	
-			<ImageView
-		    	android:id="@+id/redo"
-		    	android:layout_width="wrap_content"
-		    	android:layout_height="wrap_content"
-		    	android:src="@drawable/redobutton_bg"
-		    	android:scaleType="centerInside"
-		    	android:layout_weight="1"
-		    	/>
-		</com.rj.pixelesque.PixelArtStateView>
-	</RelativeLayout>
 </RelativeLayout>
diff --git a/res/layout/color_colorselectview.xml b/res/layout/color_colorselectview.xml
old mode 100644
new mode 100755
diff --git a/res/layout/color_hexview.xml b/res/layout/color_hexview.xml
old mode 100644
new mode 100755
diff --git a/res/layout/color_historyview.xml b/res/layout/color_historyview.xml
old mode 100644
new mode 100755
diff --git a/res/layout/color_historyview_item.xml b/res/layout/color_historyview_item.xml
old mode 100644
new mode 100755
diff --git a/res/layout/color_hsvview.xml b/res/layout/color_hsvview.xml
old mode 100644
new mode 100755
diff --git a/res/layout/color_rgbview.xml b/res/layout/color_rgbview.xml
old mode 100644
new mode 100755
diff --git a/res/layout/colordialog.xml b/res/layout/colordialog.xml
old mode 100644
new mode 100755
diff --git a/res/layout/colordialogactivity.xml b/res/layout/colordialogactivity.xml
old mode 100644
new mode 100755
diff --git a/res/layout/listactivity.xml b/res/layout/listactivity.xml
old mode 100644
new mode 100755
diff --git a/res/layout/main.xml b/res/layout/main.xml
old mode 100644
new mode 100755
diff --git a/res/layout/number_picker.xml b/res/layout/number_picker.xml
old mode 100644
new mode 100755
diff --git a/res/layout/number_picker_pref.xml b/res/layout/number_picker_pref.xml
old mode 100644
new mode 100755
diff --git a/res/layout/shapesmenu.xml b/res/layout/shapesmenu.xml
new file mode 100755
index 0000000..15d1638
--- /dev/null
+++ b/res/layout/shapesmenu.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <RelativeLayout 
+        xmlns:android="http://schemas.android.com/apk/res/android"
+	   	android:orientation="vertical"
+		android:visibility="gone"
+		android:background="@color/hud_background">
+	    <ImageView
+	    	android:id="@+id/bucketmode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/bucketbutton_bg"
+	    	android:scaleType="centerInside"
+	    	/>
+	    <ImageView
+	    	android:id="@+id/circlemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/circlebutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_toRightOf="@+id/bucketmode"
+	    	android:layout_alignBottom="@+id/bucketmode"    
+	    	/>
+	    <ImageView
+	    	android:id="@+id/rectanglemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/rectbutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_below="@+id/bucketmode"
+	    	/>
+	    <ImageView
+	    	android:id="@+id/linemode"
+	    	android:layout_width="wrap_content"
+	    	android:layout_height="wrap_content"
+	    	android:src="@drawable/linebutton_bg"
+	    	android:scaleType="centerInside"
+	    	android:layout_below="@+id/circlemode"
+	    	android:layout_toRightOf="@+id/rectanglemode"
+	    	android:layout_alignBottom="@+id/rectanglemode"  
+	    	android:layout_alignRight="@+id/circlemode"  
+	    	/>
+	    	
+    </RelativeLayout>
diff --git a/res/layout/topbar.xml b/res/layout/topbar.xml
new file mode 100755
index 0000000..5131918
--- /dev/null
+++ b/res/layout/topbar.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+   <RelativeLayout
+       xmlns:android="http://schemas.android.com/apk/res/android"
+   	android:layout_width="match_parent"
+   	android:layout_height="26dp"
+   	android:paddingLeft="10dp"
+    android:background="@color/hud_background"
+    android:layout_marginBottom="2dp"
+   >
+   	<ImageView
+    	android:layout_width="wrap_content"
+    	android:layout_height="wrap_content"
+    	android:layout_alignParentRight="true"
+    	android:layout_alignParentTop="true"
+    	android:src="@drawable/topbar_rightside"
+		android:scaleType="centerCrop"
+    	/>    
+   	<ImageView
+       	android:id="@+id/title"
+    	android:layout_width="wrap_content"
+    	android:layout_height="wrap_content"
+    	android:layout_alignParentLeft="true"
+    	android:layout_centerVertical="true"
+    	android:src="@drawable/iconsmall"
+    	/>
+   
+   	<TextView
+       	android:id="@+id/picturename"
+    	android:layout_width="wrap_content"
+    	android:layout_height="wrap_content"
+    	android:layout_centerHorizontal="true"
+    	android:layout_centerVertical="true"
+    	android:text="New Pixel Art"
+    	android:textStyle="bold"
+    	/>
+    	
+ </RelativeLayout>
diff --git a/res/menu-xlarge-v11/mainmenu.xml b/res/menu-xlarge-v11/mainmenu.xml
new file mode 100755
index 0000000..cecf525
--- /dev/null
+++ b/res/menu-xlarge-v11/mainmenu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/main_menu_new" android:title="@string/menu_new"   android:icon="@drawable/menunew"  android:showAsAction="always" ></item>
+    <item android:id="@+id/main_menu_save" android:title="@string/menu_save" android:icon="@drawable/save" android:showAsAction="always"/>
+    <item android:id="@+id/main_menu_open" android:title="@string/menu_open"  android:icon="@drawable/open"  android:showAsAction="always" ></item>
+    <!--  <item android:id="@+id/main_menu_background" android:title="@string/menu_background"  android:icon="@drawable/clear"  android:showAsAction="always|withText" ></item> -->
+    <item android:id="@+id/main_menu_share" android:title="@string/menu_share"  android:icon="@drawable/share"  android:showAsAction="always|withText" ></item>
+    <item android:id="@+id/main_menu_export" android:title="@string/menu_export"  android:icon="@drawable/export"  android:showAsAction="never" ></item>
+    <item android:id="@+id/main_menu_save_as" android:title="@string/menu_saveas"   android:icon="@drawable/saveas"  android:showAsAction="never" ></item>
+    <item android:id="@+id/main_menu_clear" android:title="@string/menu_clear"  android:icon="@drawable/clear"  android:showAsAction="never" ></item>
+    <item android:id="@+id/main_menu_preview" android:title="@string/menu_togglepreview"   android:showAsAction="never" ></item>
+    <item android:id="@+id/main_menu_gridtoggle" android:title="@string/menu_togglegrid"   android:showAsAction="never" ></item>
+    <item android:id="@+id/main_menu_about" android:title="@string/menu_about"   android:showAsAction="never" ></item>
+</menu>
diff --git a/res/menu/mainmenu.xml b/res/menu/mainmenu.xml
old mode 100644
new mode 100755
index cecf525..bdaabf0
--- a/res/menu/mainmenu.xml
+++ b/res/menu/mainmenu.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/main_menu_new" android:title="@string/menu_new"   android:icon="@drawable/menunew"  android:showAsAction="always" ></item>
+    <item android:id="@+id/main_menu_new" android:title="@string/menu_new"   android:icon="@drawable/menunew"  android:showAsAction="never" ></item>
     <item android:id="@+id/main_menu_save" android:title="@string/menu_save" android:icon="@drawable/save" android:showAsAction="always"/>
     <item android:id="@+id/main_menu_open" android:title="@string/menu_open"  android:icon="@drawable/open"  android:showAsAction="always" ></item>
     <!--  <item android:id="@+id/main_menu_background" android:title="@string/menu_background"  android:icon="@drawable/clear"  android:showAsAction="always|withText" ></item> -->
-    <item android:id="@+id/main_menu_share" android:title="@string/menu_share"  android:icon="@drawable/share"  android:showAsAction="always|withText" ></item>
+    <item android:id="@+id/main_menu_share" android:title="@string/menu_share"  android:icon="@drawable/share"  android:showAsAction="never" ></item>
     <item android:id="@+id/main_menu_export" android:title="@string/menu_export"  android:icon="@drawable/export"  android:showAsAction="never" ></item>
     <item android:id="@+id/main_menu_save_as" android:title="@string/menu_saveas"   android:icon="@drawable/saveas"  android:showAsAction="never" ></item>
     <item android:id="@+id/main_menu_clear" android:title="@string/menu_clear"  android:icon="@drawable/clear"  android:showAsAction="never" ></item>
diff --git a/res/values-v11/colorpickerstyle.xml b/res/values-v11/colorpickerstyle.xml
old mode 100644
new mode 100755
diff --git a/res/values/color.xml b/res/values/color.xml
old mode 100644
new mode 100755
diff --git a/res/values/colordialogcolor.xml b/res/values/colordialogcolor.xml
old mode 100644
new mode 100755
diff --git a/res/values/colordialogstrings.xml b/res/values/colordialogstrings.xml
old mode 100644
new mode 100755
diff --git a/res/values/colordialogstyle.xml b/res/values/colordialogstyle.xml
old mode 100644
new mode 100755
diff --git a/res/values/strings.xml b/res/values/strings.xml
old mode 100644
new mode 100755
index c54857f..27185cc
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -54,5 +54,5 @@
     <string name="about_title">About Pixelesque</string>
     <string name="about_button_market">Market</string>
     <string name="about_button_ok">Ok</string>
-    <string name="about">Pixelesque is made by &lt;a href=&quot;http://rjmarsan.com&quot;&gt;RJ Marsan&lt;/a&gt;.  It\'s 100% ad &amp; cost free, and &lt;a href=&quot;http://github.com/rjmarsan/Pixelesque&quot;&gt;open source&lt;/a&gt;.  Show your support by leaving a comment in the market, and stay tuned for Pixelesque++\!</string>
+    <string name="about">Pixelesque is made by &lt;a href=&quot;http://rjmarsan.com&quot;&gt;RJ Marsan&lt;/a&gt;.  It\'s 100% ad &amp; cost free, and &lt;a href=&quot;http://github.com/rjmarsan/Pixelesque&quot;&gt;open source&lt;/a&gt;.</string>
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
old mode 100644
new mode 100755
diff --git a/screenshots/beta1.png b/screenshots/beta1.png
old mode 100644
new mode 100755
diff --git a/screenshots/devframe/v1.1.5-1.png b/screenshots/devframe/v1.1.5-1.png
old mode 100644
new mode 100755
diff --git a/screenshots/devframe/v1.1.5-2.png b/screenshots/devframe/v1.1.5-2.png
old mode 100644
new mode 100755
diff --git a/screenshots/devframe/v1.1.5-4.png b/screenshots/devframe/v1.1.5-4.png
old mode 100644
new mode 100755
diff --git a/screenshots/rc1-1.png b/screenshots/rc1-1.png
old mode 100644
new mode 100755
diff --git a/screenshots/rc1-2.png b/screenshots/rc1-2.png
old mode 100644
new mode 100755
diff --git a/screenshots/rc1-3.png b/screenshots/rc1-3.png
old mode 100644
new mode 100755
diff --git a/screenshots/rc1-4.png b/screenshots/rc1-4.png
old mode 100644
new mode 100755
diff --git a/screenshots/rc1-5.png b/screenshots/rc1-5.png
old mode 100644
new mode 100755
diff --git a/screenshots/testing.psd b/screenshots/testing.psd
old mode 100644
new mode 100755
diff --git a/screenshots/v1-1.png b/screenshots/v1-1.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1-2.png b/screenshots/v1-2.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1-3.png b/screenshots/v1-3.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1-4.png b/screenshots/v1-4.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1-5.png b/screenshots/v1-5.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1-6.png b/screenshots/v1-6.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-1.png b/screenshots/v1.1.5-1.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-2.png b/screenshots/v1.1.5-2.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-3.png b/screenshots/v1.1.5-3.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-4.png b/screenshots/v1.1.5-4.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-5.png b/screenshots/v1.1.5-5.png
old mode 100644
new mode 100755
diff --git a/screenshots/v1.1.5-6.png b/screenshots/v1.1.5-6.png
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/ArtExtras.java b/src/com/rj/pixelesque/ArtExtras.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/ArtListActivity.java b/src/com/rj/pixelesque/ArtListActivity.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/ArtListFragment.java b/src/com/rj/pixelesque/ArtListFragment.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/BrushSelectorView.java b/src/com/rj/pixelesque/BrushSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/ColorPickerDialog.java b/src/com/rj/pixelesque/ColorPickerDialog.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/Dialogs.java b/src/com/rj/pixelesque/Dialogs.java
old mode 100644
new mode 100755
index 1d9c113..806dd5a
--- a/src/com/rj/pixelesque/Dialogs.java
+++ b/src/com/rj/pixelesque/Dialogs.java
@@ -213,14 +213,14 @@ public static void showAboutDialog(final PixelArtEditor p) {
 		textcontent.setPadding(5,5,5,5);
 		textcontent.setTextSize(15);
 		builder.setView(textcontent);
-		builder.setPositiveButton(R.string.about_button_market, new DialogInterface.OnClickListener() {  
-			public void onClick(DialogInterface dialog, int whichButton) { 
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-				intent.setData(Uri.parse("market://details?id="+p.getApplication().getPackageName()));
-				p.startActivity(intent);
-				dialog.dismiss();
-			}
-			}); 
+//		builder.setPositiveButton(R.string.about_button_market, new DialogInterface.OnClickListener() {  
+//			public void onClick(DialogInterface dialog, int whichButton) { 
+//				Intent intent = new Intent(Intent.ACTION_VIEW);
+//				intent.setData(Uri.parse("market://details?id="+p.getApplication().getPackageName()));
+//				p.startActivity(intent);
+//				dialog.dismiss();
+//			}
+//			}); 
 		builder.setNegativeButton(R.string.about_button_ok, new DialogInterface.OnClickListener() {  
 			public void onClick(DialogInterface dialog, int whichButton) {  
 				dialog.dismiss();
diff --git a/src/com/rj/pixelesque/Drawer.java b/src/com/rj/pixelesque/Drawer.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/History.java b/src/com/rj/pixelesque/History.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/IntArrayList.java b/src/com/rj/pixelesque/IntArrayList.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/NumberPicker.java b/src/com/rj/pixelesque/NumberPicker.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/NumberPickerButton.java b/src/com/rj/pixelesque/NumberPickerButton.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/PixelArt.java b/src/com/rj/pixelesque/PixelArt.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/PixelArtEditor.java b/src/com/rj/pixelesque/PixelArtEditor.java
old mode 100644
new mode 100755
index 82ad8dd..cd4af82
--- a/src/com/rj/pixelesque/PixelArtEditor.java
+++ b/src/com/rj/pixelesque/PixelArtEditor.java
@@ -1,16 +1,15 @@
 package com.rj.pixelesque;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 
 import processing.core.PApplet;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -19,12 +18,14 @@
 import android.provider.MediaStore;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.Display;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
@@ -64,9 +65,19 @@ public class PixelArtEditor extends PApplet implements TouchListener, Drawer {
 	private ScaleGestureDetector mScaleDetector;
 	private PixelArtState state;
 	
+	public static boolean horizontal = false;
 	
+	public static void setIsHorizontal(Context context) {
+		 DisplayMetrics metrics = new DisplayMetrics();
+		 Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+		 display.getMetrics(metrics);
+		 int size = (context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK);
+		 if (size == Configuration.SCREENLAYOUT_SIZE_LARGE || size == 4/*Configuration.SCREENLAYOUT_SIZE_XLARGE*/) {
+			 horizontal = true;
+		 }
+	}
 	public static boolean isHorizontal() {
-		return Build.VERSION.SDK_INT > 10;
+		return horizontal;
 	}
 	
 	public static final int LOAD_ACTIVITY = 313;
@@ -77,7 +88,7 @@ public static boolean isHorizontal() {
 	public int sketchWidth() { return this.screenWidth; }
 	public int sketchHeight() { return this.screenHeight; }
 	public String sketchRenderer() { return PApplet.P2D; }
-	public boolean keepTitlebar() { return isHorizontal(); }
+	public boolean keepTitlebar() { return Build.VERSION.SDK_INT > 10; /*isHorizontal();*/ }
 	public boolean keepStatusbar() { return true; }
 	
 	
@@ -89,6 +100,7 @@ public static boolean isHorizontal() {
 	
 	@Override
 	public void onCreate(final Bundle savedinstance) {
+		setIsHorizontal(this);
 		super.onCreate(savedinstance);
 		figureOutOrientation();
 		 
@@ -522,11 +534,13 @@ public void run() {
 			TextView view = (TextView)findViewById(com.rj.pixelesque.R.id.picturename);
 			if (art != null && art.name != null)  {
 				if (view != null) view.setText(art.name);
-				setTitle("Pixelesque - "+art.name);
+				//setTitle("Pixelesque - "+art.name);
+				setTitle(art.name);
 			} else {
 				String title = getResources().getString(com.rj.pixelesque.R.string.new_art_title);
 				if (view != null) view.setText(title);
-				setTitle("Pixelesque - "+title);
+				//setTitle("Pixelesque - "+title);
+				setTitle(title);
 			}
 			scheduleRedraw();
 		}
diff --git a/src/com/rj/pixelesque/PixelArtState.java b/src/com/rj/pixelesque/PixelArtState.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/PixelArtStateView.java b/src/com/rj/pixelesque/PixelArtStateView.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/SaveTask.java b/src/com/rj/pixelesque/SaveTask.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/StorageUtils.java b/src/com/rj/pixelesque/StorageUtils.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Bucket.java b/src/com/rj/pixelesque/shapes/Bucket.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Circle.java b/src/com/rj/pixelesque/shapes/Circle.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Line.java b/src/com/rj/pixelesque/shapes/Line.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Pen.java b/src/com/rj/pixelesque/shapes/Pen.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Pencil.java b/src/com/rj/pixelesque/shapes/Pencil.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Rectangle.java b/src/com/rj/pixelesque/shapes/Rectangle.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/Shape.java b/src/com/rj/pixelesque/shapes/Shape.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/ShapeEditor.java b/src/com/rj/pixelesque/shapes/ShapeEditor.java
old mode 100644
new mode 100755
diff --git a/src/com/rj/pixelesque/shapes/SuperShape.java b/src/com/rj/pixelesque/shapes/SuperShape.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/ColorSelectorActivity.java b/src/de/devmil/common/ui/color/ColorSelectorActivity.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/ColorSelectorDialog.java b/src/de/devmil/common/ui/color/ColorSelectorDialog.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/ColorSelectorView.java b/src/de/devmil/common/ui/color/ColorSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HexSelectorView.java b/src/de/devmil/common/ui/color/HexSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HistorySelectorView.java b/src/de/devmil/common/ui/color/HistorySelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HsvAlphaSelectorView.java b/src/de/devmil/common/ui/color/HsvAlphaSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HsvColorValueView.java b/src/de/devmil/common/ui/color/HsvColorValueView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HsvHueSelectorView.java b/src/de/devmil/common/ui/color/HsvHueSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/HsvSelectorView.java b/src/de/devmil/common/ui/color/HsvSelectorView.java
old mode 100644
new mode 100755
diff --git a/src/de/devmil/common/ui/color/RgbSelectorView.java b/src/de/devmil/common/ui/color/RgbSelectorView.java
old mode 100644
new mode 100755
diff --git a/tests/back.png b/tests/back.png
old mode 100644
new mode 100755
diff --git a/tests/bar-medium.png b/tests/bar-medium.png
old mode 100644
new mode 100755
diff --git a/tests/blocky2null-small.png b/tests/blocky2null-small.png
old mode 100644
new mode 100755
diff --git a/tests/blockynull-small.png b/tests/blockynull-small.png
old mode 100644
new mode 100755
diff --git a/tests/circle-small.png b/tests/circle-small.png
old mode 100644
new mode 100755
diff --git a/tests/clear.png b/tests/clear.png
old mode 100644
new mode 100755
diff --git a/tests/clear2.png b/tests/clear2.png
old mode 100644
new mode 100755
diff --git a/tests/color.png b/tests/color.png
old mode 100644
new mode 100755
diff --git a/tests/color2-small.png b/tests/color2-small.png
old mode 100644
new mode 100755
diff --git a/tests/eraser.png b/tests/eraser.png
old mode 100644
new mode 100755
diff --git a/tests/export.png b/tests/export.png
old mode 100644
new mode 100755
diff --git a/tests/forward.png b/tests/forward.png
old mode 100644
new mode 100755
diff --git a/tests/heart-small.png b/tests/heart-small.png
old mode 100644
new mode 100755
diff --git a/tests/line-small.png b/tests/line-small.png
old mode 100644
new mode 100755
diff --git a/tests/more-small.png b/tests/more-small.png
old mode 100644
new mode 100755
diff --git a/tests/new.png b/tests/new.png
old mode 100644
new mode 100755
diff --git a/tests/open.png b/tests/open.png
old mode 100644
new mode 100755
diff --git a/tests/paint-small.png b/tests/paint-small.png
old mode 100644
new mode 100755
diff --git a/tests/pen.png b/tests/pen.png
old mode 100644
new mode 100755
diff --git a/tests/pencil.png b/tests/pencil.png
old mode 100644
new mode 100755
diff --git a/tests/pixel.png b/tests/pixel.png
old mode 100644
new mode 100755
diff --git a/tests/pixelesque-medium.png b/tests/pixelesque-medium.png
old mode 100644
new mode 100755
diff --git a/tests/pixelesque2-large.png b/tests/pixelesque2-large.png
old mode 100644
new mode 100755
diff --git a/tests/pointer.png b/tests/pointer.png
old mode 100644
new mode 100755
diff --git a/tests/rect-small.png b/tests/rect-small.png
old mode 100644
new mode 100755
diff --git a/tests/redo -small.png b/tests/redo -small.png
old mode 100644
new mode 100755
diff --git a/tests/save.png b/tests/save.png
old mode 100644
new mode 100755
diff --git a/tests/saveas.png b/tests/saveas.png
old mode 100644
new mode 100755
diff --git a/tests/shapes-small.png b/tests/shapes-small.png
old mode 100644
new mode 100755
diff --git a/tests/share.png b/tests/share.png
old mode 100644
new mode 100755
diff --git a/tests/test.png b/tests/test.png
old mode 100644
new mode 100755
diff --git a/tests/traces.txt b/tests/traces.txt
old mode 100644
new mode 100755
diff --git a/tests/undo-small.png b/tests/undo-small.png
old mode 100644
new mode 100755