73 files changed, 380 insertions, 1274 deletions
diff --git a/emulator/skins/HVGA-L/arrow_down.png b/emulator/skins/HVGA-L/arrow_down.png
deleted file mode 100644
index 374299c..0000000
--- a/emulator/skins/HVGA-L/arrow_down.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/arrow_left.png b/emulator/skins/HVGA-L/arrow_left.png
deleted file mode 100644
index ba7dd3f..0000000
--- a/emulator/skins/HVGA-L/arrow_left.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/arrow_right.png b/emulator/skins/HVGA-L/arrow_right.png
deleted file mode 100644
index 271311d..0000000
--- a/emulator/skins/HVGA-L/arrow_right.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/arrow_up.png b/emulator/skins/HVGA-L/arrow_up.png
deleted file mode 100644
index 01f4554..0000000
--- a/emulator/skins/HVGA-L/arrow_up.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/back.png b/emulator/skins/HVGA-L/back.png
deleted file mode 100644
index 46cca3d..0000000
--- a/emulator/skins/HVGA-L/back.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/background.png b/emulator/skins/HVGA-L/background.png
deleted file mode 100644
index fde44b5..0000000
--- a/emulator/skins/HVGA-L/background.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/end.png b/emulator/skins/HVGA-L/end.png
deleted file mode 100644
index 760a614..0000000
--- a/emulator/skins/HVGA-L/end.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/hardware.ini b/emulator/skins/HVGA-L/hardware.ini
deleted file mode 100644
index f6a30b0..0000000
--- a/emulator/skins/HVGA-L/hardware.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-# skin-specific hardware values
-hw.lcd.density=160
-\ No newline at end of file
diff --git a/emulator/skins/HVGA-L/home.png b/emulator/skins/HVGA-L/home.png
deleted file mode 100644
index 47beb77..0000000
--- a/emulator/skins/HVGA-L/home.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/layout b/emulator/skins/HVGA-L/layout
deleted file mode 100644
index 1a98bfd..0000000
--- a/emulator/skins/HVGA-L/layout
+++ /dev/null
@@ -1,332 +0,0 @@
-display {
-	width  480
-	height 320
-	x 145
-	y 78
-}
-
-background {
-	image background.png
-	x 0
-	y 0
-}
-
-button {
-	1 {
-	   image  key.png
-	   x  224
-	   y  468
-	}
-	2 {
-	   image  key.png
-	   x 261
-	   y 468
-	}
-	3 {
-	   image  key.png
-	   x 298
-	   y 468
-	}
-	4 {
-	   image  key.png
-	   x 335
-	   y 468
-	}
-	5 {
-	   image  key.png
-	   x 372
-	   y 468
-	}
-	6 {
-	   image  key.png
-	   x 409
-	   y 468
-	}
-	7 {
-	   image  key.png
-	   x 446
-	   y 468
-	}
-	8 {
-	   image  key.png
-	   x 482
-	   y 468
-	}
-	9 {
-	   image  key.png
-	   x 520
-	   y 468
-	}
-	0 {
-	   image  key.png
-	   x 557
-	   y 468
-	}
-
-	q {
-	   image  key.png
-	   x  224
-	   y  504
-	}
-	w {
-	   image  key.png
-	   x 261
-	   y 504
-	}
-	e {
-	   image  key.png
-	   x 298
-	   y 504
-	}
-	r {
-	   image  key.png
-	   x 335
-	   y 504
-	}
-	t {
-	   image  key.png
-	   x 372
-	   y 504
-	}
-	y {
-	   image  key.png
-	   x 409
-	   y 504
-	}
-	u {
-	   image  key.png
-	   x 446
-	   y 504
-	}
-	i {
-	   image  key.png
-	   x 482
-	   y 504
-	}
-	o {
-	   image  key.png
-	   x 520
-	   y 504
-	}
-	p {
-	   image  key.png
-	   x 557
-	   y 504
-	}
-
-	a {
-	   image  key.png
-	   x  224
-	   y  540
-	}
-	s {
-	   image  key.png
-	   x 261
-	   y 540
-	}
-	d {
-	   image  key.png
-	   x 298
-	   y 540
-	}
-	f {
-	   image  key.png
-	   x 335
-	   y 540
-	}
-	g {
-	   image  key.png
-	   x 372
-	   y 540
-	}
-	h {
-	   image  key.png
-	   x 409
-	   y 540
-	}
-	j {
-	   image  key.png
-	   x 446
-	   y 540
-	}
-	k {
-	   image  key.png
-	   x 482
-	   y 540
-	}
-	l {
-	   image  key.png
-	   x 520
-	   y 540
-	}
-	DEL {
-	   image  key.png
-	   x 557
-	   y 540
-	}
-
-	CAP {
-	   image  key.png
-	   x  224
-	   y  576
-	}
-	z {
-	   image  key.png
-	   x 261
-	   y 576
-	}
-	x {
-	   image  key.png
-	   x 298
-	   y 576
-	}
-	c {
-	   image  key.png
-	   x 335
-	   y 576
-	}
-	v {
-	   image  key.png
-	   x 372
-	   y 576
-	}
-	b {
-	   image  key.png
-	   x 409
-	   y 576
-	}
-	n {
-	   image  key.png
-	   x 446
-	   y 576
-	}
-	m {
-	   image  key.png
-	   x 482
-	   y 576
-	}
-	PERIOD {
-	   image  key.png
-	   x 520
-	   y 576
-	}
-	ENTER {
-	   image  key.png
-	   x 557
-	   y 576
-	}
-
-	ALT {
-	   image  key.png
-	   x  224
-	   y  612
-	}
-	SYM {
-	   image  key.png
-	   x 261
-	   y 612
-	}
-	AT {
-	   image  key.png
-	   x 298
-	   y 612
-	}
-	SPACE {
-	   image  spacebar.png
-	   x 335
-	   y 612
-	}
-	SLASH {
-	   image  key.png
-	   x 482
-	   y 612
-	}
-	COMMA {
-	   image  key.png
-	   x 520
-	   y 612
-	}
-	ALT2 {
-	   image  key.png
-	   x 557
-	   y 612
-	}
-
-	soft-left {
-		image menu.png
-		x 630
-		y 196
-	}
-	home {
-		image home.png
-		x 665
-		y 334
-	}
-	back {
-		image back.png
-		x 664
-		y 96
-	}
-	dpad-up {
-		image arrow_up.png
-		x 671
-		y 160
-	}
-	dpad-down {
-		image arrow_down.png
-		x 671
-		y 270
-	}
-	dpad-left {
-		image arrow_left.png
-		x 669
-		y 190
-	}
-	dpad-right {
-		image arrow_right.png
-		x 730
-		y 190
-	}
-	dpad-center {
-		image select.png
-		x 698
-		y 190
-	}
-	phone-dial {
-		image send.png
-		x 720
-		y 334
-	}
-	phone-hangup {
-		image end.png
-		x 720
-		y 96
-	}
-
-	power {
-		image power.png
-		x 128
-		y 407
-	}
-
-	volume-up {
-		image volume_up.png
-		x 336
-		y 0
-	}
-
-	volume-down {
-		image volume_down.png
-		x 386
-		y 0
-	}
-}
-
-network {
-    speed  full
-    delay  none
-}
-
-keyboard {
-    charmap qwerty2
-}
diff --git a/emulator/skins/HVGA-L/menu.png b/emulator/skins/HVGA-L/menu.png
deleted file mode 100644
index 7510f33..0000000
--- a/emulator/skins/HVGA-L/menu.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/power.png b/emulator/skins/HVGA-L/power.png
deleted file mode 100644
index e947d4d..0000000
--- a/emulator/skins/HVGA-L/power.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/select.png b/emulator/skins/HVGA-L/select.png
deleted file mode 100644
index 82fb762..0000000
--- a/emulator/skins/HVGA-L/select.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/send.png b/emulator/skins/HVGA-L/send.png
deleted file mode 100644
index 2669515..0000000
--- a/emulator/skins/HVGA-L/send.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/volume_down.png b/emulator/skins/HVGA-L/volume_down.png
deleted file mode 100644
index f1c0fbf..0000000
--- a/emulator/skins/HVGA-L/volume_down.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-L/volume_up.png b/emulator/skins/HVGA-L/volume_up.png
deleted file mode 100644
index 67d2d2a..0000000
--- a/emulator/skins/HVGA-L/volume_up.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/arrow_down.png b/emulator/skins/HVGA-P/arrow_down.png
deleted file mode 100644
index 19b3764..0000000
--- a/emulator/skins/HVGA-P/arrow_down.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/arrow_left.png b/emulator/skins/HVGA-P/arrow_left.png
deleted file mode 100644
index 113e584..0000000
--- a/emulator/skins/HVGA-P/arrow_left.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/arrow_right.png b/emulator/skins/HVGA-P/arrow_right.png
deleted file mode 100644
index ffe3356..0000000
--- a/emulator/skins/HVGA-P/arrow_right.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/arrow_up.png b/emulator/skins/HVGA-P/arrow_up.png
deleted file mode 100644
index 81c54df..0000000
--- a/emulator/skins/HVGA-P/arrow_up.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/back.png b/emulator/skins/HVGA-P/back.png
deleted file mode 100644
index 41034d9..0000000
--- a/emulator/skins/HVGA-P/back.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/background.png b/emulator/skins/HVGA-P/background.png
deleted file mode 100644
index bab8c6d..0000000
--- a/emulator/skins/HVGA-P/background.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/end.png b/emulator/skins/HVGA-P/end.png
deleted file mode 100644
index 6830a60..0000000
--- a/emulator/skins/HVGA-P/end.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/hardware.ini b/emulator/skins/HVGA-P/hardware.ini
deleted file mode 100644
index f6a30b0..0000000
--- a/emulator/skins/HVGA-P/hardware.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-# skin-specific hardware values
-hw.lcd.density=160
-\ No newline at end of file
diff --git a/emulator/skins/HVGA-P/home.png b/emulator/skins/HVGA-P/home.png
deleted file mode 100644
index 7d02136..0000000
--- a/emulator/skins/HVGA-P/home.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/key.png b/emulator/skins/HVGA-P/key.png
deleted file mode 100644
index 7a3f563..0000000
--- a/emulator/skins/HVGA-P/key.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/layout b/emulator/skins/HVGA-P/layout
deleted file mode 100644
index 1189ca5..0000000
--- a/emulator/skins/HVGA-P/layout
+++ /dev/null
@@ -1,332 +0,0 @@
-display {
-	width  320
-	height 480
-	x 75
-	y 84
-}
-
-background {
-	image background.png
-	x 0
-	y 0
-}
-
-button {
-	1 {
-	   image  key.png
-	   x  468
-	   y  276
-	}
-	2 {
-	   image  key.png
-	   x 505
-	   y 276
-	}
-	3 {
-	   image  key.png
-	   x 543
-	   y 276
-	}
-	4 {
-	   image  key.png
-	   x 579
-	   y 276
-	}
-	5 {
-	   image  key.png
-	   x 616
-	   y 276
-	}
-	6 {
-	   image  key.png
-	   x 653
-	   y 276
-	}
-	7 {
-	   image  key.png
-	   x 690
-	   y 276
-	}
-	8 {
-	   image  key.png
-	   x 727
-	   y 276
-	}
-	9 {
-	   image  key.png
-	   x 763
-	   y 276
-	}
-	0 {
-	   image  key.png
-	   x 801
-	   y 276
-	}
-
-	q {
-	   image  key.png
-	   x  468
-	   y  312
-	}
-	w {
-	   image  key.png
-	   x 505
-	   y 312
-	}
-	e {
-	   image  key.png
-	   x 543
-	   y 312
-	}
-	r {
-	   image  key.png
-	   x 579
-	   y 312
-	}
-	t {
-	   image  key.png
-	   x 616
-	   y 312
-	}
-	y {
-	   image  key.png
-	   x 653
-	   y 312
-	}
-	u {
-	   image  key.png
-	   x 690
-	   y 312
-	}
-	i {
-	   image  key.png
-	   x 727
-	   y 312
-	}
-	o {
-	   image  key.png
-	   x 763
-	   y 312
-	}
-	p {
-	   image  key.png
-	   x 801
-	   y 312
-	}
-
-	a {
-	   image  key.png
-	   x  468
-	   y  348
-	}
-	s {
-	   image  key.png
-	   x 505
-	   y 348
-	}
-	d {
-	   image  key.png
-	   x 543
-	   y 348
-	}
-	f {
-	   image  key.png
-	   x 579
-	   y 348
-	}
-	g {
-	   image  key.png
-	   x 616
-	   y 348
-	}
-	h {
-	   image  key.png
-	   x 653
-	   y 348
-	}
-	j {
-	   image  key.png
-	   x 690
-	   y 348
-	}
-	k {
-	   image  key.png
-	   x 727
-	   y 348
-	}
-	l {
-	   image  key.png
-	   x 763
-	   y 348
-	}
-	DEL {
-	   image  key.png
-	   x 801
-	   y 348
-	}
-
-	CAP {
-	   image  key.png
-	   x  468
-	   y  384
-	}
-	z {
-	   image  key.png
-	   x 505
-	   y 384
-	}
-	x {
-	   image  key.png
-	   x 543
-	   y 384
-	}
-	c {
-	   image  key.png
-	   x 579
-	   y 384
-	}
-	v {
-	   image  key.png
-	   x 616
-	   y 384
-	}
-	b {
-	   image  key.png
-	   x 653
-	   y 384
-	}
-	n {
-	   image  key.png
-	   x 690
-	   y 384
-	}
-	m {
-	   image  key.png
-	   x 727
-	   y 384
-	}
-	PERIOD {
-	   image  key.png
-	   x 763
-	   y 384
-	}
-	ENTER {
-	   image  key.png
-	   x 801
-	   y 384
-	}
-
-	ALT {
-	   image  key.png
-	   x  468
-	   y  420
-	}
-	SYM {
-	   image  key.png
-	   x 505
-	   y 420
-	}
-	AT {
-	   image  key.png
-	   x 543
-	   y 420
-	}
-	SPACE {
-	   image  spacebar.png
-	   x 579
-	   y 420
-	}
-	SLASH {
-	   image  key.png
-	   x 727
-	   y 420
-	}
-	COMMA {
-	   image  key.png
-	   x 763
-	   y 420
-	}
-	ALT2 {
-	   image  key.png
-	   x 801
-	   y 420
-	}
-
-	soft-left {
-		image menu.png
-		x 192
-		y 569
-	}
-	home {
-		image home.png
-		x 93
-		y 602
-	}
-	back {
-		image back.png
-		x 331
-		y 602
-	}
-	dpad-up {
-		image arrow_up.png
-		x 185
-		y 608
-	}
-	dpad-down {
-		image arrow_down.png
-		x 185
-		y 669
-	}
-	dpad-left {
-		image arrow_left.png
-		x 155
-		y 610
-	}
-	dpad-right {
-		image arrow_right.png
-		x 266
-		y 610
-	}
-	dpad-center {
-		image select.png
-		x 186
-		y 637
-	}
-	phone-dial {
-		image send.png
-		x 93
-		y 658
-	}
-	phone-hangup {
-		image end.png
-		x 331
-		y 658
-	}
-
-	power {
-		image power.png
-		x 7
-		y 66
-	}
-
-	volume-up {
-		image volume_up.png
-		x 407
-		y 274
-	}
-
-	volume-down {
-		image volume_down.png
-		x 407
-		y 324
-	}
-}
-
-keyboard {
-    charmap qwerty2
-}
-
-network {
-    speed  full
-    delay  none
-}
diff --git a/emulator/skins/HVGA-P/menu.png b/emulator/skins/HVGA-P/menu.png
deleted file mode 100644
index e81d8ab..0000000
--- a/emulator/skins/HVGA-P/menu.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/power.png b/emulator/skins/HVGA-P/power.png
deleted file mode 100644
index 5894288..0000000
--- a/emulator/skins/HVGA-P/power.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/select.png b/emulator/skins/HVGA-P/select.png
deleted file mode 100644
index 803d493..0000000
--- a/emulator/skins/HVGA-P/select.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/send.png b/emulator/skins/HVGA-P/send.png
deleted file mode 100644
index f547c88..0000000
--- a/emulator/skins/HVGA-P/send.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/volume_down.png b/emulator/skins/HVGA-P/volume_down.png
deleted file mode 100644
index f8a88de..0000000
--- a/emulator/skins/HVGA-P/volume_down.png
+++ /dev/null
diff --git a/emulator/skins/HVGA-P/volume_up.png b/emulator/skins/HVGA-P/volume_up.png
deleted file mode 100644
index 940457f..0000000
--- a/emulator/skins/HVGA-P/volume_up.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/back.png b/emulator/skins/QVGA-L/back.png
deleted file mode 100644
index 883b4ca..0000000
--- a/emulator/skins/QVGA-L/back.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/background.png b/emulator/skins/QVGA-L/background.png
deleted file mode 100644
index 81832ec..0000000
--- a/emulator/skins/QVGA-L/background.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/end.png b/emulator/skins/QVGA-L/end.png
deleted file mode 100644
index 7a6ae1c..0000000
--- a/emulator/skins/QVGA-L/end.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/favorites.png b/emulator/skins/QVGA-L/favorites.png
deleted file mode 100644
index ad85c5c..0000000
--- a/emulator/skins/QVGA-L/favorites.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/key.png b/emulator/skins/QVGA-L/key.png
deleted file mode 100644
index 3c17cec..0000000
--- a/emulator/skins/QVGA-L/key.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/layout b/emulator/skins/QVGA-L/layout
deleted file mode 100644
index fd86934..0000000
--- a/emulator/skins/QVGA-L/layout
+++ /dev/null
@@ -1,275 +0,0 @@
-display {
-	width  320
-	height 240
-	x 78
-	y 96
-}
-
-background {
-	image background.png
-	x 0
-	y 0
-}
-
-button {
-	soft-left {
-		image menu.png
-		x 136
-		y 378
-	}
-	home {
-		image home.png
-		x 312
-		y 372
-	}
-	back {
-		image back.png
-		x 137
-		y 420
-	}
-	dpad-up {
-		image arrow_up.png
-		x 190
-		y 364
-	}
-	dpad-down {
-		image arrow_down.png
-		x 190
-		y 421
-	}
-	dpad-left {
-		image arrow_left.png
-		x 181
-		y 372
-	}
-	dpad-right {
-		image arrow_right.png
-		x 257
-		y 372
-	}
-	dpad-center {
-		image select.png
-		x 216
-		y 394
-	}
-	phone-dial {
-		image send.png
-		x 76
-		y 394
-	}
-	phone-hangup {
-		image end.png
-		x 358
-		y 394
-	}
-	
-	q {
-	       image  key.png
-	       x  55
-	       y  480
-	}
-	w {
-	       image  key.png
-	       x 91
-	       y 480
-	}
-	e {
-	       image  key.png
-	       x 128
-	       y 480
-	}
-	r {
-	       image  key.png
-	       x 163
-	       y 480
-	}
-	t {
-	       image  key.png
-	       x 200
-	       y 480
-	}
-	y {
-	       image  key.png
-	       x 237
-	       y 480
-	}
-	u {
-	       image  key.png
-	       x 273
-	       y 480
-	}
-	i {
-	       image  key.png
-	       x 310
-	       y 480
-	}
-	o {
-	       image  key.png
-	       x 346
-	       y 480
-	}
-	p {
-	       image  key.png
-	       x 382
-	       y 480
-	}
-
-	a {
-	       image  key.png
-	       x  55
-	       y  530
-	}
-	s {
-	       image  key.png
-	       x 91
-	       y 530
-	}
-	d {
-	       image  key.png
-	       x 128
-	       y 530
-	}
-	f {
-	       image  key.png
-	       x 163
-	       y 530
-	}
-	g {
-	       image  key.png
-	       x 200
-	       y 530
-	}
-	h {
-	       image  key.png
-	       x 237
-	       y 530
-	}
-	j {
-	       image  key.png
-	       x 273
-	       y 530
-	}
-	k {
-	       image  key.png
-	       x 310
-	       y 530
-	}
-	l {
-	       image  key.png
-	       x 346
-	       y 530
-	}
-	DEL {
-	       image  key.png
-	       x 382
-	       y 530
-	}
-	
-	CAP {
-	       image  key.png
-	       x  55
-	       y  580
-	}
-	z {
-	       image  key.png
-	       x 91
-	       y 580
-	}
-	x {
-	       image  key.png
-	       x 128
-	       y 580
-	}
-	c {
-	       image  key.png
-	       x 163
-	       y 580
-	}
-	v {
-	       image  key.png
-	       x 200
-	       y 580
-	}
-	b {
-	       image  key.png
-	       x 237
-	       y 580
-	}
-	n {
-	       image  key.png
-	       x 273
-	       y 580
-	}
-	m {
-	       image  key.png
-	       x 310
-	       y 580
-	}
-	PERIOD {
-	       image  key.png
-	       x 346
-	       y 580
-	}
-	ENTER {
-	       image  key.png
-	       x 382
-	       y 580
-	}
-
-	ALT {
-	       image  key.png
-	       x  55
-	       y  630
-	}
-	SYM {
-	       image  key.png
-	       x 91
-	       y 630
-	}
-	AT {
-	       image  key.png
-	       x 128
-	       y 630
-	}
-	SPACE {
-	       image  spacebar.png
-	       x 165
-	       y 630
-	}
-	SLASH {
-	       image  key.png
-	       x 310
-	       y 630
-	}
-	COMMA {
-	       image  key.png
-	       x 346
-	       y 630
-	}
-	CAP2 {
-	       image  key.png
-	       x 382
-	       y 630
-	}
-	
-	power {
-		image power.png
-		x     4
-		y     38
-	}
-	volume-up {
-		image volume_up.png
-		x     420
-		y     165
-	}
-	volume-down {
-		image volume_down.png
-		x     420
-		y     218
-	}
-}
-
-network {
-    speed  full
-    delay  none
-}
diff --git a/emulator/skins/QVGA-L/power.png b/emulator/skins/QVGA-L/power.png
deleted file mode 100644
index 7886a16..0000000
--- a/emulator/skins/QVGA-L/power.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-L/spacebar.png b/emulator/skins/QVGA-L/spacebar.png
deleted file mode 100644
index c45a580..0000000
--- a/emulator/skins/QVGA-L/spacebar.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/arrow_down.png b/emulator/skins/QVGA-P/arrow_down.png
deleted file mode 100644
index 7398bae..0000000
--- a/emulator/skins/QVGA-P/arrow_down.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/arrow_left.png b/emulator/skins/QVGA-P/arrow_left.png
deleted file mode 100644
index f7e3c12..0000000
--- a/emulator/skins/QVGA-P/arrow_left.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/arrow_right.png b/emulator/skins/QVGA-P/arrow_right.png
deleted file mode 100644
index 33fa169..0000000
--- a/emulator/skins/QVGA-P/arrow_right.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/arrow_up.png b/emulator/skins/QVGA-P/arrow_up.png
deleted file mode 100644
index f21105a..0000000
--- a/emulator/skins/QVGA-P/arrow_up.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/background.png b/emulator/skins/QVGA-P/background.png
deleted file mode 100644
index 39348c4..0000000
--- a/emulator/skins/QVGA-P/background.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/hardware.ini b/emulator/skins/QVGA-P/hardware.ini
deleted file mode 100644
index 2efe617..0000000
--- a/emulator/skins/QVGA-P/hardware.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-# skin-specific hardware values
-hw.lcd.density=120
-\ No newline at end of file
diff --git a/emulator/skins/QVGA-P/key.png b/emulator/skins/QVGA-P/key.png
deleted file mode 100644
index 7a3f563..0000000
--- a/emulator/skins/QVGA-P/key.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/layout b/emulator/skins/QVGA-P/layout
deleted file mode 100644
index a9abb1b..0000000
--- a/emulator/skins/QVGA-P/layout
+++ /dev/null
@@ -1,329 +0,0 @@
-display {
-	width  240
-	height 320
-	x 50
-	y 83
-}
-
-background {
-	image background.png
-	x 0
-	y 0
-}
-
-button {
-	soft-left {
-		image button.png
-		x 148
-		y 418
-	}
-	home {
-		image button.png
-		x 94
-		y 418
-	}
-	back {
-		image button.png
-		x 202
-		y 418
-	}
-	dpad-up {
-		image arrow_up.png
-		x 122
-		y 475
-	}
-	dpad-down {
-		image arrow_down.png
-		x 122
-		y 534
-	}
-	dpad-left {
-		image arrow_left.png
-		x 113
-		y 483
-	}
-	dpad-right {
-		image arrow_right.png
-		x 189
-		y 483
-	}
-	dpad-center {
-		image select.png
-		x 148
-		y 506
-	}
-	phone-dial {
-		image button.png
-		x 40
-		y 418
-	}
-	phone-hangup {
-		image button.png
-		x 256
-		y 418
-	}
-	power {
-		image power.png
-		x     5
-		y     18
-	}
-	volume-up {
-		image volume_up.png
-		x     306
-		y     192
-	}
-	volume-down {
-		image volume_down.png
-		x     306
-		y     245
-	}
-	1 {
-	   image  key.png
-	   x  367
-	   y  242
-	}
-	2 {
-	   image  key.png
-	   x 404
-	   y 242
-	}
-	3 {
-	   image  key.png
-	   x 441
-	   y 242
-	}
-	4 {
-	   image  key.png
-	   x 478
-	   y 242
-	}
-	5 {
-	   image  key.png
-	   x 515
-	   y 242
-	}
-	6 {
-	   image  key.png
-	   x 552
-	   y 242
-	}
-	7 {
-	   image  key.png
-	   x 589
-	   y 242
-	}
-	8 {
-	   image  key.png
-	   x 626
-	   y 242
-	}
-	9 {
-	   image  key.png
-	   x 663
-	   y 242
-	}
-	0 {
-	   image  key.png
-	   x 700
-	   y 242
-	}
-
-	q {
-	   image  key.png
-	   x  367
-	   y  278
-	}
-	w {
-	   image  key.png
-	   x 404
-	   y 278
-	}
-	e {
-	   image  key.png
-	   x 441
-	   y 278
-	}
-	r {
-	   image  key.png
-	   x 478
-	   y 278
-	}
-	t {
-	   image  key.png
-	   x 515
-	   y 278
-	}
-	y {
-	   image  key.png
-	   x 552
-	   y 278
-	}
-	u {
-	   image  key.png
-	   x 589
-	   y 278
-	}
-	i {
-	   image  key.png
-	   x 626
-	   y 278
-	}
-	o {
-	   image  key.png
-	   x 663
-	   y 278
-	}
-	p {
-	   image  key.png
-	   x 700
-	   y 278
-	}
-
-	a {
-	   image  key.png
-	   x  367
-	   y  314
-	}
-	s {
-	   image  key.png
-	   x 404
-	   y 314
-	}
-	d {
-	   image  key.png
-	   x 441
-	   y 314
-	}
-	f {
-	   image  key.png
-	   x 478
-	   y 314
-	}
-	g {
-	   image  key.png
-	   x 515
-	   y 314
-	}
-	h {
-	   image  key.png
-	   x 552
-	   y 314
-	}
-	j {
-	   image  key.png
-	   x 589
-	   y 314
-	}
-	k {
-	   image  key.png
-	   x 626
-	   y 314
-	}
-	l {
-	   image  key.png
-	   x 663
-	   y 314
-	}
-	DEL {
-	   image  key.png
-	   x 700
-	   y 314
-	}
-
-	CAP {
-	   image  key.png
-	   x  367
-	   y  350
-	}
-	z {
-	   image  key.png
-	   x 404
-	   y 350
-	}
-	x {
-	   image  key.png
-	   x 441
-	   y 350
-	}
-	c {
-	   image  key.png
-	   x 478
-	   y 350
-	}
-	v {
-	   image  key.png
-	   x 515
-	   y 350
-	}
-	b {
-	   image  key.png
-	   x 552
-	   y 350
-	}
-	n {
-	   image  key.png
-	   x 589
-	   y 350
-	}
-	m {
-	   image  key.png
-	   x 626
-	   y 350
-	}
-	PERIOD {
-	   image  key.png
-	   x 663
-	   y 350
-	}
-	ENTER {
-	   image  key.png
-	   x 700
-	   y 350
-	}
-
-	ALT {
-	   image  key.png
-	   x  367
-	   y  386
-	}
-	SYM {
-	   image  key.png
-	   x 404
-	   y 386
-	}
-	AT {
-	   image  key.png
-	   x 441
-	   y 386
-	}
-	SPACE {
-	   image  spacebar.png
-	   x 478
-	   y 386
-	}
-	SLASH {
-	   image  key.png
-	   x 626
-	   y 386
-	}
-	COMMA {
-	   image  key.png
-	   x 663
-	   y 386
-	}
-	ALT2 {
-	   image  key.png
-	   x 408
-	   y 855
-	}
-
-}
-
-network {
-    speed  full
-    delay  none
-}
-
-keyboard {
-    charmap qwerty2
-}
diff --git a/emulator/skins/QVGA-P/select.png b/emulator/skins/QVGA-P/select.png
deleted file mode 100644
index 8691f53..0000000
--- a/emulator/skins/QVGA-P/select.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/spacebar.png b/emulator/skins/QVGA-P/spacebar.png
deleted file mode 100644
index 19fe604..0000000
--- a/emulator/skins/QVGA-P/spacebar.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/volume_down.png b/emulator/skins/QVGA-P/volume_down.png
deleted file mode 100644
index 09175b1..0000000
--- a/emulator/skins/QVGA-P/volume_down.png
+++ /dev/null
diff --git a/emulator/skins/QVGA-P/volume_up.png b/emulator/skins/QVGA-P/volume_up.png
deleted file mode 100644
index ab52c63..0000000
--- a/emulator/skins/QVGA-P/volume_up.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/.DS_Store b/emulator/skins/QVGA/.DS_Store
new file mode 100644
index 0000000..6aff2f6
--- /dev/null
+++ b/emulator/skins/QVGA/.DS_Store
diff --git a/emulator/skins/QVGA-L/arrow_down.png b/emulator/skins/QVGA/arrow_down.png
index 7398bae..7398bae 100644
--- a/emulator/skins/QVGA-L/arrow_down.png
+++ b/emulator/skins/QVGA/arrow_down.png
diff --git a/emulator/skins/QVGA-L/arrow_left.png b/emulator/skins/QVGA/arrow_left.png
index f7e3c12..f7e3c12 100644
--- a/emulator/skins/QVGA-L/arrow_left.png
+++ b/emulator/skins/QVGA/arrow_left.png
diff --git a/emulator/skins/QVGA-L/arrow_right.png b/emulator/skins/QVGA/arrow_right.png
index 33fa169..33fa169 100644
--- a/emulator/skins/QVGA-L/arrow_right.png
+++ b/emulator/skins/QVGA/arrow_right.png
diff --git a/emulator/skins/QVGA-L/arrow_up.png b/emulator/skins/QVGA/arrow_up.png
index f21105a..f21105a 100644
--- a/emulator/skins/QVGA-L/arrow_up.png
+++ b/emulator/skins/QVGA/arrow_up.png
diff --git a/emulator/skins/QVGA-L/send.png b/emulator/skins/QVGA/back.png
index 8519ebd..8519ebd 100644
--- a/emulator/skins/QVGA-L/send.png
+++ b/emulator/skins/QVGA/back.png
diff --git a/emulator/skins/QVGA/device.png b/emulator/skins/QVGA/device.png
new file mode 100644
index 0000000..eb64104
--- /dev/null
+++ b/emulator/skins/QVGA/device.png
diff --git a/emulator/skins/QVGA-P/button.png b/emulator/skins/QVGA/end.png
index 8519ebd..8519ebd 100644
--- a/emulator/skins/QVGA-P/button.png
+++ b/emulator/skins/QVGA/end.png
diff --git a/emulator/skins/QVGA-L/hardware.ini b/emulator/skins/QVGA/hardware.ini
index 2efe617..2efe617 100644
--- a/emulator/skins/QVGA-L/hardware.ini
+++ b/emulator/skins/QVGA/hardware.ini
diff --git a/emulator/skins/QVGA-L/home.png b/emulator/skins/QVGA/home.png
index 36f314e..8519ebd 100644
--- a/emulator/skins/QVGA-L/home.png
+++ b/emulator/skins/QVGA/home.png
diff --git a/emulator/skins/HVGA-L/key.png b/emulator/skins/QVGA/key.png
index 7a3f563..7a3f563 100644
--- a/emulator/skins/HVGA-L/key.png
+++ b/emulator/skins/QVGA/key.png
diff --git a/emulator/skins/QVGA/keyboard.png b/emulator/skins/QVGA/keyboard.png
new file mode 100644
index 0000000..bb076d3
--- /dev/null
+++ b/emulator/skins/QVGA/keyboard.png
diff --git a/emulator/skins/QVGA/layout b/emulator/skins/QVGA/layout
new file mode 100644
index 0000000..d7539c5
--- /dev/null
+++ b/emulator/skins/QVGA/layout
@@ -0,0 +1,380 @@
+parts {
+    device {
+        background {
+            image   device.png
+        }
+        display {
+            width   240
+            height  320
+            x       33
+            y       69
+        }
+
+        buttons {
+            soft-left {
+                    image menu.png
+                    x 131
+                    y 404
+            }
+            home {
+                    image home.png
+                    x 77
+                    y 404
+            }
+            back {
+                    image back.png
+                    x 185
+                    y 404
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 105
+                    y 463
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 104
+                    y 519
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 96
+                    y 470
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 172
+                    y 470
+            }
+            dpad-center {
+                    image select.png
+                    x 131
+                    y 492
+            }
+            phone-dial {
+                    image send.png
+                    x 23
+                    y 404
+            }
+            phone-hangup {
+                    image end.png
+                    x 238
+                    y 404
+            }
+
+            power {
+                    image power.png
+                    x -16
+                    y 0
+            }
+
+            volume-up {
+                    image volume_up.png
+                    x 289
+                    y 177
+            }
+
+            volume-down {
+                    image volume_down.png
+                    x 289
+                    y 233
+            }
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  0
+                y  0
+            }
+            2 {
+                image  key.png
+                x 37
+                y 0
+            }
+            3 {
+                image  key.png
+                x 74
+                y 0
+            }
+            4 {
+                image  key.png
+                x 111
+                y 0
+            }
+            5 {
+                image  key.png
+                x 148
+                y 0
+            }
+            6 {
+                image  key.png
+                x 185
+                y 0
+            }
+            7 {
+                image  key.png
+                x 222
+                y 0
+            }
+            8 {
+                image  key.png
+                x 259
+                y 0
+            }
+            9 {
+                image  key.png
+                x 296
+                y 0
+            }
+            0 {
+                image  key.png
+                x 333
+                y 0
+            }
+
+            q {
+                image  key.png
+                x  0
+                y  36
+            }
+            w {
+                image  key.png
+                x 37
+                y 36
+            }
+            e {
+                image  key.png
+                x 74
+                y 36
+            }
+            r {
+                image  key.png
+                x 111
+                y 36
+            }
+            t {
+                image  key.png
+                x 148
+                y 36
+            }
+            y {
+                image  key.png
+                x 185
+                y 36
+            }
+            u {
+                image  key.png
+                x 222
+                y 36
+            }
+            i {
+                image  key.png
+                x 259
+                y 36
+            }
+            o {
+                image  key.png
+                x 296
+                y 36
+            }
+            p {
+                image  key.png
+                x 333
+                y 36
+            }
+
+            a {
+                image  key.png
+                x  0
+                y  72
+            }
+            s {
+                image  key.png
+                x 37
+                y 72
+            }
+            d {
+                image  key.png
+                x 74
+                y 72
+            }
+            f {
+                image  key.png
+                x 111
+                y 72
+            }
+            g {
+                image  key.png
+                x 148
+                y 72
+            }
+            h {
+                image  key.png
+                x 185
+                y 72
+            }
+            j {
+                image  key.png
+                x 222
+                y 72
+            }
+            k {
+                image  key.png
+                x 259
+                y 72
+            }
+            l {
+                image  key.png
+                x 296
+                y 72
+            }
+            DEL {
+                image  key.png
+                x 333
+                y 72
+            }
+
+            CAP {
+                image  key.png
+                x  0
+                y  108
+            }
+            z {
+                image  key.png
+                x 37
+                y 108
+            }
+            x {
+                image  key.png
+                x 74
+                y 108
+            }
+            c {
+                image  key.png
+                x 111
+                y 108
+            }
+            v {
+                image  key.png
+                x 148
+                y 108
+            }
+            b {
+                image  key.png
+                x 185
+                y 108
+            }
+            n {
+                image  key.png
+                x 222
+                y 108
+            }
+            m {
+                image  key.png
+                x 259
+                y 108
+            }
+            PERIOD {
+                image  key.png
+                x 296
+                y 108
+            }
+            ENTER {
+                image  key.png
+                x 333
+                y 108
+            }
+
+            ALT {
+                image  key.png
+                x  0
+                y  144
+            }
+            SYM {
+                image  key.png
+                x 37
+                y 144
+            }
+            AT {
+                image  key.png
+                x 74
+                y 144
+            }
+            SPACE {
+                image  spacebar.png
+                x 111
+                y 144
+            }
+            SLASH {
+                image  key.png
+                x 259
+                y 144
+            }
+            COMMA {
+                image  key.png
+                x 296
+                y 144
+            }
+            ALT2 {
+                image  key.png
+                x 333
+                y 144
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     750
+        height    610
+        color     0xe0e0e0
+        event     EV_SW:0:1
+
+        part1 {
+            name    device
+            x       30
+            y       097
+        }
+        part2 {
+            name    keyboard
+            x       360
+            y       300
+        }
+    }
+
+    landscape {
+        width     645
+        height    575
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        part1 {
+            name      device
+            x         10
+            y         360
+            rotation  3
+        }
+        part2 {
+            name     keyboard
+            x        135
+            y        380
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/emulator/skins/QVGA-L/menu.png b/emulator/skins/QVGA/menu.png
index 224b077..8519ebd 100644
--- a/emulator/skins/QVGA-L/menu.png
+++ b/emulator/skins/QVGA/menu.png
diff --git a/emulator/skins/QVGA-P/power.png b/emulator/skins/QVGA/power.png
index 0c04ced..0c04ced 100644
--- a/emulator/skins/QVGA-P/power.png
+++ b/emulator/skins/QVGA/power.png
diff --git a/emulator/skins/QVGA-L/select.png b/emulator/skins/QVGA/select.png
index 8691f53..8691f53 100644
--- a/emulator/skins/QVGA-L/select.png
+++ b/emulator/skins/QVGA/select.png
diff --git a/emulator/skins/HVGA-P/spacebar.png b/emulator/skins/QVGA/send.png
index 19fe604..8519ebd 100644
--- a/emulator/skins/HVGA-P/spacebar.png
+++ b/emulator/skins/QVGA/send.png
diff --git a/emulator/skins/HVGA-L/spacebar.png b/emulator/skins/QVGA/spacebar.png
index 19fe604..19fe604 100644
--- a/emulator/skins/HVGA-L/spacebar.png
+++ b/emulator/skins/QVGA/spacebar.png
diff --git a/emulator/skins/QVGA-L/volume_down.png b/emulator/skins/QVGA/volume_down.png
index 09175b1..09175b1 100644
--- a/emulator/skins/QVGA-L/volume_down.png
+++ b/emulator/skins/QVGA/volume_down.png
diff --git a/emulator/skins/QVGA-L/volume_up.png b/emulator/skins/QVGA/volume_up.png
index ab52c63..ab52c63 100644
--- a/emulator/skins/QVGA-L/volume_up.png
+++ b/emulator/skins/QVGA/volume_up.png