diff --git a/TODO b/TODO
index 673be91..b930757 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,9 @@
-* Add a defeat screen (game over for now)
-* Add a victory screen, with looting
-* Add retreat from battle
-* Refactor the tooltip system to use it more
+* Floor movement power usage, and show it on the displayed line
+* Add auto-move to attack
+* Re-style cancel button and allow to cancel by clicking the action again
 * Flash ship icons that receive damage
+* Mobile: display tooltips on hold
+* Mobile: targetting in two times, using a draggable target indicator
+* Add a defeat screen (game over for now)
+* Add a victory screen, with loot display
+* Add retreat from battle
diff --git a/graphics/ui/brushedmetal.jpg b/graphics/ui/brushedmetal.jpg
deleted file mode 100644
index ab1b222..0000000
Binary files a/graphics/ui/brushedmetal.jpg and /dev/null differ
diff --git a/graphics/ui/frames.svg b/graphics/ui/frames.svg
deleted file mode 100644
index e324195..0000000
--- a/graphics/ui/frames.svg
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="frames.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="309.68086"
-     inkscape:cy="668.32729"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3776" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:11.506;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 123.4646,372.80142 0,171.17497 57.05832,57.05833 171.17498,0"
-       id="path3778"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3778"
-       id="use3780"
-       transform="matrix(-1,0,0,1,737.80216,0)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3778"
-       id="use3782"
-       transform="matrix(1,0,0,-1,0,709.17617)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use3780"
-       id="use3784"
-       transform="matrix(1,0,0,-1,0,709.17617)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 339.09137,134.7189 60,0 -30,30 z"
-       id="path3786"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#path3786"
-       id="use3788"
-       transform="matrix(1,0,0,-1,0,708.5583)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use3788"
-       id="use3790"
-       transform="matrix(0,1,-1,0,724.34913,-15.46522)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-filename="/home/michael/workspace/spacetac/graphics/ui/use3803.png"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use3790"
-       id="use3803"
-       transform="matrix(-1,0,0,1,738.21247,0)"
-       width="744.09448"
-       height="1052.3622"
-       inkscape:export-xdpi="11.47"
-       inkscape:export-ydpi="11.47" />
-  </g>
-</svg>
diff --git a/graphics/ui/ui.blend b/graphics/ui/ui.blend
deleted file mode 100644
index 7ef57b8..0000000
Binary files a/graphics/ui/ui.blend and /dev/null differ
diff --git a/graphics/weapons/gatlinggun.xcf b/graphics/weapons/gatlinggun.xcf
deleted file mode 100644
index 05c6e9a..0000000
Binary files a/graphics/weapons/gatlinggun.xcf and /dev/null differ