diff --git a/build/all/app/install/deploytophone.sh b/build/all/app/install/deploytophone.sh
old mode 100644
new mode 100755
diff --git a/build/all/app/install/manifest.json b/build/all/app/install/manifest.json
index 9ce6fe4..e9dd79d 100644
--- a/build/all/app/install/manifest.json
+++ b/build/all/app/install/manifest.json
@@ -6,12 +6,11 @@
     "hooks": {
         "qmlmahjongg": {
             "apparmor": "qmlmahjongg.apparmor",
-            "desktop":  "qmlmahjongg.desktop"
+            "desktop": "qmlmahjongg.desktop"
         }
     },
-    "version": "0.2",
+    "version": "0.3",
     "maintainer": "Mateo Salta <mateo_salta@yahoo.com>",
-    "framework" : "ubuntu-sdk-16.04.5",
-    "__commento_precedente_framework" : "ubuntu-sdk-16.04"
-}
-
+    "framework": "ubuntu-sdk-20.04.1",
+    "__commento_precedente_framework": "@CLICK_FRAMEWORK@"
+}
\ No newline at end of file
diff --git a/build/all/app/install/qml/QmlMahjongg.qml b/build/all/app/install/qml/QmlMahjongg.qml
index 426f024..f38c409 100644
--- a/build/all/app/install/qml/QmlMahjongg.qml
+++ b/build/all/app/install/qml/QmlMahjongg.qml
@@ -6,8 +6,9 @@ import "GameLogic.js" as Logic
 ApplicationWindow {
     id: appWindow
     title: "Mahjongg"
-    width: root.width
-    height: root.height
+    width: units.gu(45)
+    height: units.gu(75)
+    property real margin: units.gu(2)
 
     //@bug Menu is not displayed? Why?
 
@@ -20,13 +21,6 @@ ApplicationWindow {
                 Logic.createBoard()
             
         }
-//        Button {
-//            id: test
-//            text: "Test"
-//            onClicked: {
-//                gameBoard.gameState=(gameBoard.gameState+1)%3
-//            }
-//        }
 
         Rectangle {
          Image {
@@ -73,8 +67,6 @@ ApplicationWindow {
             Layout.minimumHeight: gameBoard.implicitHeight
             Layout.fillWidth: true
             Layout.fillHeight: true
-            //implicitHeight: gameBoard.implicitHeight
-            //implicitWidth: gameBoard.implicitWidth
         }
 
 
diff --git a/build/all/app/install/qml/build/tmp/GameBoard.qml b/build/all/app/install/qml/build/tmp/GameBoard.qml
deleted file mode 100644
index e3e4f9b..0000000
--- a/build/all/app/install/qml/build/tmp/GameBoard.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    color: "#008000"
-    visible: true
-    implicitWidth: 1920/3*15+20
-    implicitHeight: 1080/3*8+20
-
-    property int gameState:0        
-
-    Text {
-        id: won
-        anchors.centerIn:parent
-        visible: false
-        text: "Congratulations"
-        verticalAlignment: Text.AlignTop
-        horizontalAlignment: Text.AlignLeft
-        clip: false
-        font.pointSize: 60
-        color: "#0500ff"
-
-        Behavior on visible {
-            SequentialAnimation {
-               // PropertyAction { target: won; property: "visible"; value: visible }
-                ParallelAnimation {
-                    NumberAnimation { target: won; property: "opacity"; from: 0.; to: 1.0; duration: 1000 }
-                    NumberAnimation { target: won; property: "font.pointSize"; from: 1.; to: 60.0; duration: 1000}
-                    NumberAnimation { target: won; property: "rotation"; from: 0.; to: 360; duration: 1000}
-                }
-            }
-        }
-    }
-
-
-
-    Text {
-        id: lost
-        anchors.centerIn:parent
-        visible: false
-        text: "You lost"
-        font.pointSize: 60
-        color: "red"
-        Behavior on visible {
-            SequentialAnimation {
-               // PropertyAction { target: won; property: "visible"; value: visible }
-                ParallelAnimation {
-                    NumberAnimation { target: lost; property: "opacity"; from: 0.; to: 1.0; duration: 1000 }
-                    NumberAnimation { target: lost; property: "font.pointSize"; from: 1.; to: 60.0; duration: 1000}
-
-                }
-            }
-        }
-
-    }
-
-    onGameStateChanged: {
-        if (gameState==0) {
-            won.visible=false;
-            lost.visible=false;
-        } else if (gameState==1) {
-            won.visible=true
-            lost.visible=false
-        } else if (gameState==2) {
-            won.visible=false
-            lost.visible=true
-        }
-    }
-
-}
diff --git a/build/all/app/install/qml/build/tmp/GameLogic.js b/build/all/app/install/qml/build/tmp/GameLogic.js
deleted file mode 100644
index 0f076d9..0000000
--- a/build/all/app/install/qml/build/tmp/GameLogic.js
+++ /dev/null
@@ -1,276 +0,0 @@
-var defaultBoard={
-    w:30,
-    h:16,
-    d:5,
-    config:[
-        "\
-..121212121212121212121212....\
-..434343434343434343434343....\
-......1212121212121212........\
-......4343434343434343........\
-....12121212121212121212......\
-....43434343434343434343......\
-..121212121212121212121212....\
-124343434343434343434343431212\
-431212121212121212121212124343\
-..434343434343434343434343....\
-....12121212121212121212......\
-....43434343434343434343......\
-......1212121212121212........\
-......4343434343434343........\
-..121212121212121212121212....\
-..434343434343434343434343....",
-"\
-..............................\
-..............................\
-........121212121212..........\
-........434343434343..........\
-........121212121212..........\
-........434343434343..........\
-........121212121212..........\
-........434343434343..........\
-........121212121212..........\
-........434343434343..........\
-........121212121212..........\
-........434343434343..........\
-........121212121212..........\
-........434343434343..........\
-..............................\
-..............................",
-"\
-..............................\
-..............................\
-..............................\
-..............................\
-..........12121212............\
-..........43434343............\
-..........12121212............\
-..........43434343............\
-..........12121212............\
-..........43434343............\
-..........12121212............\
-..........43434343............\
-..............................\
-..............................\
-..............................\
-..............................",
-        "\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-............1212..............\
-............4343..............\
-............1212..............\
-............4343..............\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................",
-"\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-.............12...............\
-.............43...............\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-..............................\
-"    ]
-}
-
-var gameConfig=[/*
-            {x:2,y:0,z:0,piece:2,gamepiece:null,isRemoved:false},
-            {x:4,y:4,z:0,piece:2,gamepiece:null,isRemoved:false},
-            {x:8,y:6,z:0,piece:3,gamepiece:null,isRemoved:false},
-            {x:10,y:6,z:0,piece:4,gamepiece:null,isRemoved:false},
-            {x:12,y:6,z:0,piece:4,gamepiece:null,isRemoved:false},
-            {x:14,y:6,z:0,piece:3,gamepiece:null,isRemoved:false},
-            {x:2,y:0,z:0,piece:9,gamepiece:null,isRemoved:false},
-            {x:4,y:4,z:0,piece:9,gamepiece:null,isRemoved:false},
-*/
-        ]
-
-var gamepieces=[]
-
-// Must be called only once
-function initGamePieces(container) {
-    if (gamepieces.length>0) return
-    for (var i=0; i<144; i++) {
-        var gamePiece=createGamePiece(container)
-        gamepieces.push(gamePiece)
-        //console.log(gamePiece)
-        gamePiece.clicked.connect(gamePieceClicked)
-    }
-}
-
-function shuffle(array) {
-  var currentIndex = array.length, temporaryValue, randomIndex;
-
-  // While there remain elements to shuffle...
-  while (0 !== currentIndex) {
-
-    // Pick a remaining element...
-    randomIndex = Math.floor(Math.random() * currentIndex);
-    currentIndex -= 1;
-
-    // And swap it with the current element.
-    temporaryValue = array[currentIndex];
-    array[currentIndex] = array[randomIndex];
-    array[randomIndex] = temporaryValue;
-  }
-
-  return array;
-}
-
-function readBoard(ids) {
-    var idIndex=0
-    for (var d=0; d<defaultBoard.config.length; d++) {
-        var str=defaultBoard.config[d]
-        for (var r=0; r<defaultBoard.h; r++) {
-            for (var c=0; c<defaultBoard.w; c++) {
-                var index=r*defaultBoard.w+c
-                if (str[index]==='1') {
-                    //{"xPos":piece.x,"yPos":piece.y,"zPos":piece.z,"pieceId":piece.piece, "isRemoved":piece.isRemoved, "number":index}
-                    var pieceConfig={x:c, y:r, z:d, piece:ids[idIndex],gamepiece:gamepieces[idIndex], isRemoved:false};
-                    gamepieces[idIndex].xPos=pieceConfig.x
-                    gamepieces[idIndex].yPos=pieceConfig.y
-                    gamepieces[idIndex].zPos=pieceConfig.z
-                    gamepieces[idIndex].pieceId=pieceConfig.piece
-                    gamepieces[idIndex].isRemoved=pieceConfig.isRemoved
-                    gamepieces[idIndex].number=idIndex
-
-                    gameConfig.push(pieceConfig)
-                    idIndex++
-                }
-            }
-        }
-    }
-}
-
-function createIds() {
-    var ids=[]
-    for (var i=1; i<=36; i++) {
-        ids=ids.concat([i,i,i,i]);
-    }
-    return ids;
-}
-
-function createBoard(container) {
-    gameConfig=[]
-    var randomIds=shuffle(createIds())
-    readBoard(randomIds)
-
-}
-
-var previousSelectedPiece=-1
-
-function blockedByAdjacentPieces(index) {
-    var myPiece=gameConfig[index]
-    var nonRemoved=gameConfig.filter(function(gamePiece) { return !gamePiece.isRemoved && Math.abs(gamePiece.y-myPiece.y)<=1; })
-    var hasLeft=nonRemoved.filter(  function(gamePiece) { return gamePiece.x===myPiece.x-2 && gamePiece.z===myPiece.z }).length>0
-    var hasRight=nonRemoved.filter( function(gamePiece) { return gamePiece.x===myPiece.x+2 && gamePiece.z===myPiece.z }).length>0
-    var hasOnTop=nonRemoved.filter( function(gamePiece) { return gamePiece.z>myPiece.z && Math.abs(gamePiece.x-myPiece.x)<=1; }).length>0
-   // console.log(hasLeft,hasRight,hasOnTop)
-    if (hasOnTop) return true
-    if (hasLeft && hasRight) return true
-    return false
-}
-
-function setPreviousSelection(index) {
-    if (previousSelectedPiece!=-1) {
-        gameConfig[previousSelectedPiece].gamepiece.isSelected=false
-    }
-    previousSelectedPiece=index
-    if (previousSelectedPiece!=-1) {
-        gameConfig[previousSelectedPiece].gamepiece.isSelected=true
-    }
-
-}
-
-function isGameWon() {
-    return gameConfig.filter(function(gamePiece) { return !gamePiece.isRemoved }).length===0
-}
-
-function isGameLost() {
-    var selectableGamePieces=[]
-    for (var index1 in gameConfig) {
-        if (!isSelectableGamePiece(index1)) continue
-        selectableGamePieces.push(gameConfig[index1])
-    }
-    var ids=selectableGamePieces.map(function(piece){ return piece.piece})
-    ids=ids.sort()
-    while (ids.length>0) {
-        if (ids[0]===ids[1]) return false
-        ids.shift()
-        ids.shift()
-    }
-    return true
-}
-
-function arePiecesEqual(index1, index2) {
-    return gameConfig[index1].piece===gameConfig[index2].piece
-}
-
-function removePiece(index) {
-    gameConfig[index].isRemoved=true
-    gameConfig[index].gamepiece.isRemoved=true
-}
-
-function removePieces(index1, index2) {
-    if (!arePiecesEqual(index1,index2)) return false
-    removePiece(index1)
-    removePiece(index2)
-    setPreviousSelection(-1)
-}
-
-function isSelectableGamePiece(index) {
-    if (index<0) return false
-    if (index>=gameConfig.length) return false
-    var gamePiece=gameConfig[index]
-    if (gamePiece.isRemoved) return false
-    if (blockedByAdjacentPieces(index)) return false
-    return true
-}
-
-function gamePieceClicked(index) {
-    console.log("Game piece clicked"+index)
-    console.log(gameConfig.length)
-    if (!isSelectableGamePiece(index)) return
-    if (previousSelectedPiece==-1) {
-        // Noch kein Stein gewählt
-        setPreviousSelection(index)
-    } else if (previousSelectedPiece===index) {
-        // Deselectieren
-        setPreviousSelection(-1)
-    } else {
-        // Wenn beide Steine gleich, dann entfernen
-        removePieces(previousSelectedPiece,index)
-        if (isGameWon()) {
-            gameBoard.gameState=1
-        } else if (isGameLost()) {
-            gameBoard.gameState=2
-        } else {
-            gameBoard.gameState=0
-        }
-    }
-
-    console.log("IsSelectable")
-}
-
-function createGamePiece(container) {
-    var component = Qt.createComponent("GamePiece.qml");
-    return component.createObject(container);
-}
diff --git a/build/all/app/install/qml/build/tmp/GamePiece.qml b/build/all/app/install/qml/build/tmp/GamePiece.qml
deleted file mode 100644
index e44b1f3..0000000
--- a/build/all/app/install/qml/build/tmp/GamePiece.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Rectangle {
-    property bool isSelected:false
-    property bool isRemoved:false
-    property int zPos:0
-    property int xPos:0
-    property int yPos:0
-    property int number:-1
-    property int pieceId:-1
-
-    signal clicked(int number)
-
-    width: 240/3
-    height: 330/3
-    z:zPos*10000000-1000*xPos-yPos+10000000000
-    x:xPos*width/2+zPos*33/3+33/3
-    y:yPos*height/2+zPos*33/3+33/3
-    color:"transparent"
-    visible: true
-
-    Image {
-        id: bevel
-        source:"gamepieces/Bevel.png"
-        antialiasing:  true
-        smooth: true
-        height: sourceSize.height/3
-        x:-33/3
-        y:-33/3
-        width: sourceSize.width/3
-    }
-    Colorize {
-        visible: isSelected
-        anchors.fill: bevel
-        source: bevel
-        hue: 0.0
-        saturation: 0.5
-        lightness: -0.2
-    }
-
-    Image {
-        id: pieceImage
-        source:"gamepieces/1.png"
-        antialiasing: true
-        smooth:true
-        height: parent.height
-        width: parent.width
-    }
-    Colorize {
-        visible: isSelected
-        anchors.fill: pieceImage
-        source: pieceImage
-        hue: 0.0
-        saturation: 0.5
-        lightness: -0.2
-    }
-
-    onPieceIdChanged: {
-        if (pieceId<1) return
-        if (pieceId>36) return
-        pieceImage.source="gamepieces/"+pieceId+".png"
-    }
-
-    onVisibleChanged: {
-        console.log("Changed")
-    }
-
-    onIsRemovedChanged: {
-        if (isRemoved) {
-            visible=false
-        } else {
-            visible=true
-        }
-    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        onClicked: {
-            parent.clicked(number)
-            //parent.isSelected=!parent.isSelected
-        }
-    }
-}
diff --git a/build/all/app/install/qml/build/tmp/QmlMahjongg.qml b/build/all/app/install/qml/build/tmp/QmlMahjongg.qml
deleted file mode 100644
index 0d377cf..0000000
--- a/build/all/app/install/qml/build/tmp/QmlMahjongg.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.1
-import "GameLogic.js" as Logic
-
-ApplicationWindow {
-    id: appWindow
-    title: "Mahjongg"
-    width: layout.implicitWidth
-    height: layout.implicitHeight
-
-    //@bug Menu is not displayed? Why?
-    MenuBar {
-        Menu {
-            title: "File"
-            MenuItem {
-                text: "New"
-                onTriggered: {
-                }
-            }
-            MenuItem {
-                text: "Quit"
-                onTriggered: appWindow.close();
-            }
-        }
-        Menu {
-            title: "About"
-            MenuItem {
-                text: "About"
-                onTriggered: {
-
-                }
-            }
-        }
-    }
-    ColumnLayout {
-        id:layout
-        anchors.fill:parent
-        Button {
-            id: newGame
-            text: "New Game"
-            onClicked: {
-                Logic.initGamePieces(gameBoard)
-                Logic.createBoard()
-            }
-        }
-//        Button {
-//            id: test
-//            text: "Test"
-//            onClicked: {
-//                gameBoard.gameState=(gameBoard.gameState+1)%3
-//            }
-//        }
-
-        Rectangle {
-            color: "green"
-            GameBoard {
-                id: gameBoard
-                anchors.centerIn: parent
-            }
-            Layout.minimumWidth: gameBoard.implicitWidth
-            Layout.minimumHeight: gameBoard.implicitHeight
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            //implicitHeight: gameBoard.implicitHeight
-            //implicitWidth: gameBoard.implicitWidth
-        }
-
-
-    }
-
-}
diff --git a/build/all/app/install/qml/build/tmp/QmlMahjongg.qmlproject b/build/all/app/install/qml/build/tmp/QmlMahjongg.qmlproject
deleted file mode 100644
index c3458b7..0000000
--- a/build/all/app/install/qml/build/tmp/QmlMahjongg.qmlproject
+++ /dev/null
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "QmlMahjongg.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/1.png b/build/all/app/install/qml/build/tmp/gamepieces/1.png
deleted file mode 100644
index 158100d..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/1.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/10.png b/build/all/app/install/qml/build/tmp/gamepieces/10.png
deleted file mode 100644
index 442fa0b..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/10.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/11.png b/build/all/app/install/qml/build/tmp/gamepieces/11.png
deleted file mode 100644
index e54f71a..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/11.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/12.png b/build/all/app/install/qml/build/tmp/gamepieces/12.png
deleted file mode 100644
index 94404a2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/12.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/13.png b/build/all/app/install/qml/build/tmp/gamepieces/13.png
deleted file mode 100644
index dedc52b..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/13.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/14.png b/build/all/app/install/qml/build/tmp/gamepieces/14.png
deleted file mode 100644
index 71b2dba..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/14.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/15.png b/build/all/app/install/qml/build/tmp/gamepieces/15.png
deleted file mode 100644
index c2d866f..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/15.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/16.png b/build/all/app/install/qml/build/tmp/gamepieces/16.png
deleted file mode 100644
index 785e0fb..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/16.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/17.png b/build/all/app/install/qml/build/tmp/gamepieces/17.png
deleted file mode 100644
index b6390d8..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/17.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/18.png b/build/all/app/install/qml/build/tmp/gamepieces/18.png
deleted file mode 100644
index 5815041..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/18.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/19.png b/build/all/app/install/qml/build/tmp/gamepieces/19.png
deleted file mode 100644
index 7b81061..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/19.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/2.png b/build/all/app/install/qml/build/tmp/gamepieces/2.png
deleted file mode 100644
index d247a6d..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/2.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/20.png b/build/all/app/install/qml/build/tmp/gamepieces/20.png
deleted file mode 100644
index a26bb75..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/20.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/21.png b/build/all/app/install/qml/build/tmp/gamepieces/21.png
deleted file mode 100644
index b3a60c1..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/21.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/22.png b/build/all/app/install/qml/build/tmp/gamepieces/22.png
deleted file mode 100644
index 30b2409..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/22.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/23.png b/build/all/app/install/qml/build/tmp/gamepieces/23.png
deleted file mode 100644
index 8a2f3d3..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/23.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/24.png b/build/all/app/install/qml/build/tmp/gamepieces/24.png
deleted file mode 100644
index 2e03a99..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/24.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/25.png b/build/all/app/install/qml/build/tmp/gamepieces/25.png
deleted file mode 100644
index 7960af8..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/25.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/26.png b/build/all/app/install/qml/build/tmp/gamepieces/26.png
deleted file mode 100644
index 6e95b23..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/26.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/27.png b/build/all/app/install/qml/build/tmp/gamepieces/27.png
deleted file mode 100644
index d6ee7b2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/27.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/28.png b/build/all/app/install/qml/build/tmp/gamepieces/28.png
deleted file mode 100644
index 2d121ab..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/28.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/29.png b/build/all/app/install/qml/build/tmp/gamepieces/29.png
deleted file mode 100644
index d98cf36..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/29.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/3.png b/build/all/app/install/qml/build/tmp/gamepieces/3.png
deleted file mode 100644
index f2242c2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/3.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/30.png b/build/all/app/install/qml/build/tmp/gamepieces/30.png
deleted file mode 100644
index b128824..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/30.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/31.png b/build/all/app/install/qml/build/tmp/gamepieces/31.png
deleted file mode 100644
index 97199df..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/31.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/32.png b/build/all/app/install/qml/build/tmp/gamepieces/32.png
deleted file mode 100644
index 08a64c2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/32.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/33.png b/build/all/app/install/qml/build/tmp/gamepieces/33.png
deleted file mode 100644
index 18f56e2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/33.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/34.png b/build/all/app/install/qml/build/tmp/gamepieces/34.png
deleted file mode 100644
index ffa8ac2..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/34.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/35.png b/build/all/app/install/qml/build/tmp/gamepieces/35.png
deleted file mode 100644
index 42094f9..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/35.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/36.png b/build/all/app/install/qml/build/tmp/gamepieces/36.png
deleted file mode 100644
index b9baaec..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/36.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/4.png b/build/all/app/install/qml/build/tmp/gamepieces/4.png
deleted file mode 100644
index 938be9b..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/4.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/4png.png b/build/all/app/install/qml/build/tmp/gamepieces/4png.png
deleted file mode 100644
index 938be9b..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/4png.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/5.png b/build/all/app/install/qml/build/tmp/gamepieces/5.png
deleted file mode 100644
index b49c31e..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/5.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/6.png b/build/all/app/install/qml/build/tmp/gamepieces/6.png
deleted file mode 100644
index 5862369..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/6.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/7.png b/build/all/app/install/qml/build/tmp/gamepieces/7.png
deleted file mode 100644
index 8c2bb4b..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/7.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/8.png b/build/all/app/install/qml/build/tmp/gamepieces/8.png
deleted file mode 100644
index 2827c6d..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/8.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/9.png b/build/all/app/install/qml/build/tmp/gamepieces/9.png
deleted file mode 100644
index 7c34bec..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/9.png and /dev/null differ
diff --git a/build/all/app/install/qml/build/tmp/gamepieces/Bevel.png b/build/all/app/install/qml/build/tmp/gamepieces/Bevel.png
deleted file mode 100644
index b8bb8fe..0000000
Binary files a/build/all/app/install/qml/build/tmp/gamepieces/Bevel.png and /dev/null differ
diff --git a/build/all/app/install/qmlmahjongg.apparmor b/build/all/app/install/qmlmahjongg.apparmor
index eeb782c..f859029 100644
--- a/build/all/app/install/qmlmahjongg.apparmor
+++ b/build/all/app/install/qmlmahjongg.apparmor
@@ -1,6 +1,3 @@
 {
- 
-    "policy_version": 16.04
-    
-}
-
+    "policy_version": 20.04
+}
\ No newline at end of file
diff --git a/build/all/app/install/sc.sh b/build/all/app/install/sc.sh
old mode 100644
new mode 100755
diff --git a/build/all/app/qmlmahjongg_0.2_all.click b/build/all/app/qmlmahjongg_0.2_all.click
deleted file mode 100644
index aa26caa..0000000
Binary files a/build/all/app/qmlmahjongg_0.2_all.click and /dev/null differ
diff --git a/build/all/app/qmlmahjongg_0.3_all.click b/build/all/app/qmlmahjongg_0.3_all.click
new file mode 100644
index 0000000..ae6ef72
Binary files /dev/null and b/build/all/app/qmlmahjongg_0.3_all.click differ
diff --git a/clickable.json b/clickable.json
new file mode 100644
index 0000000..3671b37
--- /dev/null
+++ b/clickable.json
@@ -0,0 +1,4 @@
+{
+  "clickable_minimum_required": "8.4",
+  "builder": "pure"
+}
diff --git a/manifest.json b/manifest.json
index 9ce6fe4..00afce2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,9 +9,9 @@
             "desktop":  "qmlmahjongg.desktop"
         }
     },
-    "version": "0.2",
+    "version": "0.3",
     "maintainer": "Mateo Salta <mateo_salta@yahoo.com>",
-    "framework" : "ubuntu-sdk-16.04.5",
-    "__commento_precedente_framework" : "ubuntu-sdk-16.04"
+    "framework" : "@CLICK_FRAMEWORK@",
+    "__commento_precedente_framework" : "@CLICK_FRAMEWORK@"
 }
 
diff --git a/qml/QmlMahjongg.qml b/qml/QmlMahjongg.qml
index 426f024..f38c409 100644
--- a/qml/QmlMahjongg.qml
+++ b/qml/QmlMahjongg.qml
@@ -6,8 +6,9 @@ import "GameLogic.js" as Logic
 ApplicationWindow {
     id: appWindow
     title: "Mahjongg"
-    width: root.width
-    height: root.height
+    width: units.gu(45)
+    height: units.gu(75)
+    property real margin: units.gu(2)
 
     //@bug Menu is not displayed? Why?
 
@@ -20,13 +21,6 @@ ApplicationWindow {
                 Logic.createBoard()
             
         }
-//        Button {
-//            id: test
-//            text: "Test"
-//            onClicked: {
-//                gameBoard.gameState=(gameBoard.gameState+1)%3
-//            }
-//        }
 
         Rectangle {
          Image {
@@ -73,8 +67,6 @@ ApplicationWindow {
             Layout.minimumHeight: gameBoard.implicitHeight
             Layout.fillWidth: true
             Layout.fillHeight: true
-            //implicitHeight: gameBoard.implicitHeight
-            //implicitWidth: gameBoard.implicitWidth
         }
 
 
diff --git a/qmlmahjongg.apparmor b/qmlmahjongg.apparmor
index eeb782c..867eeda 100644
--- a/qmlmahjongg.apparmor
+++ b/qmlmahjongg.apparmor
@@ -1,6 +1,6 @@
 {
  
-    "policy_version": 16.04
+    "policy_version": "@APPARMOR_POLICY@"
     
 }