From 643cad5c9720673881d33f37d0c5b8499bb6816d Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Mon, 6 Mar 2017 19:27:43 -0300
Subject: [PATCH] Add basic implementation of slice tool (#721) to modify theme
 parts

It still need support to export to .aseprite-data as <slice> XML elements, and animation support.
---
 data/gui.xml                              |  14 +-
 data/pref.xml                             |   1 +
 data/strings/en.ini                       |  11 ++
 data/themes/default/sheet.aseprite-data   |   4 +
 data/themes/default/sheet.png             | Bin 13758 -> 13786 bytes
 data/themes/default/theme.xml             |   7 +-
 data/widgets/slice_properties.xml         |  50 +++++
 docs/ase-file-specs.md                    |  30 ++-
 src/app/CMakeLists.txt                    |   9 +
 src/app/app_menus.cpp                     |   2 +
 src/app/app_menus.h                       |   2 +
 src/app/cmd/add_slice.cpp                 |  64 +++++++
 src/app/cmd/add_slice.h                   |  43 +++++
 src/app/cmd/remove_slice.cpp              |  39 ++++
 src/app/cmd/remove_slice.h                |  30 +++
 src/app/cmd/set_slice_key.cpp             |  55 ++++++
 src/app/cmd/set_slice_key.h               |  43 +++++
 src/app/cmd/set_slice_name.cpp            |  41 +++++
 src/app/cmd/set_slice_name.h              |  40 ++++
 src/app/cmd/with_slice.cpp                |  31 ++++
 src/app/cmd/with_slice.h                  |  33 ++++
 src/app/commands/cmd_open_file.cpp        |   6 +-
 src/app/commands/cmd_remove_slice.cpp     | 114 ++++++++++++
 src/app/commands/cmd_show.cpp             |  29 ++-
 src/app/commands/cmd_slice_properties.cpp | 119 ++++++++++++
 src/app/commands/commands_list.h          |   3 +
 src/app/crash/read_document.cpp           |  19 +-
 src/app/crash/write_document.cpp          |  18 +-
 src/app/file/ase_format.cpp               | 135 +++++++++++++-
 src/app/file/file.cpp                     | 211 +++++++++++++++++++++-
 src/app/file/file.h                       |   6 +-
 src/app/tools/inks.h                      |  36 +++-
 src/app/tools/tool_loop.h                 |   6 +-
 src/app/tools/tool_loop_manager.cpp       |   6 +-
 src/app/ui/app_menuitem.cpp               |   3 -
 src/app/ui/editor/editor.cpp              | 109 ++++++++++-
 src/app/ui/editor/editor.h                |  12 +-
 src/app/ui/editor/editor_hit.h            |  48 +++++
 src/app/ui/editor/moving_cel_state.cpp    |   4 +-
 src/app/ui/editor/moving_cel_state.h      |   3 +-
 src/app/ui/editor/moving_slice_state.cpp  | 145 +++++++++++++++
 src/app/ui/editor/moving_slice_state.h    |  38 ++++
 src/app/ui/editor/standby_state.cpp       |  86 ++++++++-
 src/app/ui/editor/tool_loop_impl.cpp      |  11 +-
 src/app/ui/frame_tag_window.h             |   6 +-
 src/app/ui/slice_window.cpp               | 113 ++++++++++++
 src/app/ui/slice_window.h                 |  46 +++++
 src/app/ui/timeline.cpp                   |   1 +
 src/doc/CMakeLists.txt                    |   5 +-
 src/doc/LICENSE.txt                       |   2 +-
 src/doc/README.md                         |   2 +-
 src/doc/doc.h                             |   4 +-
 src/doc/keyframes.h                       | 189 +++++++++++++++++++
 src/doc/keyframes_tests.cpp               | 133 ++++++++++++++
 src/doc/object_type.h                     |   3 +-
 src/doc/slice.cpp                         |  83 +++++++++
 src/doc/slice.h                           |  88 +++++++++
 src/doc/slice_io.cpp                      |  84 +++++++++
 src/doc/slice_io.h                        |  26 +++
 src/doc/slices.cpp                        |  67 +++++++
 src/doc/slices.h                          |  57 ++++++
 src/doc/sprite.cpp                        |   3 +-
 src/doc/sprite.h                          |   7 +-
 src/doc/with_user_data.h                  |   3 +-
 64 files changed, 2577 insertions(+), 61 deletions(-)
 create mode 100644 data/themes/default/sheet.aseprite-data
 create mode 100644 data/widgets/slice_properties.xml
 create mode 100644 src/app/cmd/add_slice.cpp
 create mode 100644 src/app/cmd/add_slice.h
 create mode 100644 src/app/cmd/remove_slice.cpp
 create mode 100644 src/app/cmd/remove_slice.h
 create mode 100644 src/app/cmd/set_slice_key.cpp
 create mode 100644 src/app/cmd/set_slice_key.h
 create mode 100644 src/app/cmd/set_slice_name.cpp
 create mode 100644 src/app/cmd/set_slice_name.h
 create mode 100644 src/app/cmd/with_slice.cpp
 create mode 100644 src/app/cmd/with_slice.h
 create mode 100644 src/app/commands/cmd_remove_slice.cpp
 create mode 100644 src/app/commands/cmd_slice_properties.cpp
 create mode 100644 src/app/ui/editor/editor_hit.h
 create mode 100644 src/app/ui/editor/moving_slice_state.cpp
 create mode 100644 src/app/ui/editor/moving_slice_state.h
 create mode 100644 src/app/ui/slice_window.cpp
 create mode 100644 src/app/ui/slice_window.h
 create mode 100644 src/doc/keyframes.h
 create mode 100644 src/doc/keyframes_tests.cpp
 create mode 100644 src/doc/slice.cpp
 create mode 100644 src/doc/slice.h
 create mode 100644 src/doc/slice_io.cpp
 create mode 100644 src/doc/slice_io.h
 create mode 100644 src/doc/slices.cpp
 create mode 100644 src/doc/slices.h

diff --git a/data/gui.xml b/data/gui.xml
index 907c6aca7..a1fb6230e 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -445,8 +445,8 @@
       <key tool="eyedropper" shortcut="I" />
       <key tool="hand" shortcut="H" />
       <key tool="move" shortcut="V" />
+      <key tool="slice" shortcut="C" />
       <key tool="zoom" shortcut="Z" />
-      <!-- key tool="slice" shortcut="K" /-->
 
       <key tool="paint_bucket" shortcut="G" />
 
@@ -769,6 +769,7 @@
           <item command="ShowLayerEdges" text="&amp;Layer Edges" />
           <item command="ShowSelectionEdges" text="&amp;Selection Edges" />
           <item command="ShowGrid" text="&amp;Grid" />
+          <item command="ShowSlices" text="Sl&amp;ices" />
           <item command="ShowPixelGrid" text="&amp;Pixel Grid" />
           <separator />
           <item command="ShowBrushPreview" text="&amp;Brush Preview" />
@@ -915,6 +916,11 @@
       <item command="RemoveFrameTag" text="&amp;Remove Tag" />
     </menu>
 
+    <menu id="slice_popup">
+      <item command="SliceProperties" text="Slice &amp;Properties..." />
+      <item command="RemoveSlice" text="&amp;Remove Slice" />
+    </menu>
+
     <menu id="palette_popup">
       <item command="PaletteEditor" text="&amp;Palette Editor">
         <param name="switch" value="true" />
@@ -1118,15 +1124,15 @@
             ink="move"
             controller="freehand"
             />
-      <!-- tool id="slice"
+      <tool id="slice"
             text="Slice Tool"
-            fill="always"
+            fill="none"
             ink="slice"
             controller="two_points"
             pointshape="pixel"
             intertwine="as_rectangles"
             tracepolicy="last"
-            /-->
+            />
     </group>
 
     <group id="paint_bucket" text="Paint Bucket Tool">
diff --git a/data/pref.xml b/data/pref.xml
index a4dd00666..798cb015a 100644
--- a/data/pref.xml
+++ b/data/pref.xml
@@ -349,6 +349,7 @@
       <option id="grid" type="bool" default="false" migrate="grid.visible" />
       <option id="pixel_grid" type="bool" default="false" migrate="pixel_grid.visible" />
       <option id="brush_preview" type="bool" default="true" />
+      <option id="slices" type="bool" default="true" />
     </section>
   </document>
 
diff --git a/data/strings/en.ini b/data/strings/en.ini
index bbe6da586..35fc479b8 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -438,6 +438,17 @@ open_dmp_file = Open the following file to debug your compilation:
 do_it_later = Do it later
 delete_file = Delete file, I've already sent it
 
+[slice_properties]
+title = Slice Properties
+name = Slice Name:
+user_data_tooltip = User Data
+bounds = Bounds:
+center = 9-Slices
+x = X
+y = Y
+width = Width
+height = Height
+
 [sprite_properties]
 title = Sprite Properties
 filename = File name:
diff --git a/data/themes/default/sheet.aseprite-data b/data/themes/default/sheet.aseprite-data
new file mode 100644
index 000000000..b7c27ea2b
--- /dev/null
+++ b/data/themes/default/sheet.aseprite-data
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sprite>
+  <slices theme="theme.xml" />
+</sprite>
diff --git a/data/themes/default/sheet.png b/data/themes/default/sheet.png
index babc61f61a4d9b0e1e4c5c1f8513555794e0e41a..75a5d0d3927a903749998650d6e34d10d73ae728 100644
GIT binary patch
delta 13130
zcmX9^by!s0*Bwy08|e^~4rvML?i!FBKw3ZnVTemN0@5vALx*%X0@5W74vn-h#5eEn
zyU#Os{+V;0GyCql_Fil4PRC`(crHLQhGrpqy=yY9E%qIX?_X(tRI6vzR`#{$P;_l^
zy-#Og-q(rO%i#>nZZ89fQyTD85&|9S6juW{BOSS3XrcB4i90pdQ4P=g^6`!0O?dZG
zieg#bQ8WCKCa;mi1T#ixilTMV6q}7#7@oS!RaBLqtlMhs<&@u4+_bhHtaJf4r#GMg
z2Pd?pma&Nj<SmIE@3&m4M1tRpFM(o~>^lBUcg}wNl9K{o%!GNQ%KG)K)eH_uPVV1s
zTi1nI*6DA6AcPRakhCh0IbPG*X{IcdJ6T&>%g6&09-o+U_I(V*V7HfS`HYcTb-aID
z4j!`@QI*mp@nQPpxNj%W3%H93?owy{DBzrTY-8|Q`O?b?V#>eurOWd7^P??!nwi_U
zoO~Q${`a?!Ab1AYS2gdg=;|cNdOQoK>z-1~!PMwN2X*=0eDQMe=UBA+d@<&ZxPIdN
zID2*Fk;a{IN4Q9b>CvSOi+Vr=+2ng|_?iE{yA%6R|3XMe2or<A7^txTAECU%ZfOaS
z)2V^MV_WtMWB2_`5x2fy%{%U7;*WpO1FZ%*&WScJTB<&$*raKc%+q&7z`%uXA(e-y
zg$$R0xs&ig46Z+$hugs!LC8g@oe%$Jdh8b#%!O%n=%IP{Jh($LTF2SeM&#d8K55q%
zVX>teE*82{J+C_lWQY3C(yMT4V1(MWu?huM(e+Bt@#$1neCW&nVLIm~?7JVF=U7v1
zo_A+_i)KYZtONLHQEVjLI$mHuIZPBLor);m`Y_82nUHNT5Aty3T9*9j7X0Z+893r}
zblZUvu>MkE7-=OL(~k6IksIv~y0JP~DY=TK;+c~*)hJNM`8{GS$JFtKy9-o+O8QTk
z9+}}mv63<|!PvY|VG~Dap%J;>q{>+X^qBS~)6SdL>Di`SjS?B`WZ3m?bz#Xx*2+~^
z;{ETJ9qdK*@})M`1Qn9X&kqM<shi!l6}AO(e`B5EAHRWmxDLowyeTA9B2b_}*F@-l
z8$9D2Q&|Um*8ZAh#SN6dh(&XR?=@X0EQ+?`b^Fy13#1;&Qq+8QU-52NRVdKbzDm>&
zA|tCT*6$_NS6N8=A+~3h^25>`k?SODndU`>GY_Zt0=>=I22B_4msmvZyO+m3Ezz5D
zJh#U?9n+X$&pY+{C7b)>MS>1mV)%hSk+eiIwu2}zFgS=FZNP+Ff4RfgeWY>P)hhqt
z3B9?gByOo}i>TsPU;(Ssv13yMI&2$SXomuB+{E*!y+TKqI&$zy`7}}b`MW|vTTo8;
z;^N|WvcEO&U&&LaK!f+q!}ftW4WQB^F-Cz|jWv;BiZ3$E={-(*#<pYl8;0}DhJRAm
z&m{rKbHhe$?~{YWe<REU7)z30=0xoDAXJ=Gh}8o+^`Dg7APoIC!EkCON)L&5aM4Bt
z16IDxjo+uOsnW~(r5HM3Slmk9Rx;O0GIx7<E;V?jgerWumB_^0bvO03&^At6$={vy
zzdZpn`vN~ishxrC!PqE2hKb2JJ=ZmaOBWDRH|Jcq;S*9CGVtErFSn8IoJz<!r{3N>
zWvxCc{R8XiZQA9)4xC`EV_)#!=mUWaX5jcZk8HLoW_`F#`Br-IM}d><mKvWZ8MK!a
z)Op8_*6Z<opx)&C828B52B4sr>y0n_q}NaDBe9_5-ad9gUaCh!H*br^)!kQ<S!4i(
zrzYA`W`A*+pX^$9pzCa{Ji$>qnS}sVa!$gCwa!tl8Y|8jovt_7k3sLRiG<eFb)CGa
zvuT`@p#?#-vhpl1u7r@zPDh(7fum9JpI=Tw9O@!M&h<;Uyg0hd2;Ug8{nKaO5-(j;
zjm%C1C1&XHKbUYNR#!$Q%ke81bawz1H=W$GZbo4vlk(ym<~$3Z4b8s{_EBYbZ8hX(
zdCk5cQ1xHXX^;Ubb^80xlT8(mANG~SIZsYp6w2)7Gu_Qwn$91SP_K^6#e;rpES{{k
z9~ib9#&MOaG~)*8M<ny)%xKbiFD{ah-*v}Lm}8y%(U<2?Xm4fG7U!g9+|*BGKqm#d
zT(NuZkg@elc+x3|Fi09|w2t5M4vT^CV5Q<N)n%k|W6vd?U$<9C6(0D#aLsL1Kxvqu
z0=3^C=|=zjT%-jjt@>_P24NZUY1uMG2@C)Df*INnQubpN+Lc^v`5NK0Kj-k>OmK&N
zlejiN--ejO7HTKMQW5;A78ie<SPq!Iifo|})IKP5Xhvu7oE6dyCL`gh0E;SI8CDIs
zizRm?3~)Xx7N$I1U-WLN%@%e9_5b;kDvAohS%gNUnl$)A$ga}os58(UTS{l%PU!ch
z{1qgvz&lrcJ`Vrf{&2m5kf_ERP+3MPeY2mnA0Wm=+D8>2`PG=7rd+s4?*Rbm4cW2T
zQ>iN-Fq=Q!Eu3AixTOAmXoaBFgwNSJOdQ$uPkVtGH?^InF#lYLvc96jqY`nryNchE
zMR<*sN6bw#Rs?=yg$!IqGp`KA3g09gZ@c@QlAW;NvapIranPl>XqB?jrLc>KopCyd
zwRABVsP~O2^;9|%9L1T%y#V%4^6dq+Y?M9x;`QYA55}y2uQLTxz>>~tWR{g>wk_G7
zT}1f_O|n}D;!~&}7g-F(m=Q#_XIR|fSLjb_RRo&O5~pm1?R^&Kv?*+>q#B;0N|ScA
zMu?2;eOILS&UaUX8p&-=Q9%+=?o)z_&tS_j;bgoao32Nqp9{h6&cLL*=Ij=2mCy7S
z+#2DAdW+B*WQq+`%{RIWPLCNE)${%y?4x<-?NbF(nIa1cWpnrauHL*%4r8Jt_qHo~
zzRx>YKYcSW*oWOX$)h>#_!2(_^AOQ!u7WIcmQS6O(^nKN?}$JpU=%H%CL9xp$A3pt
zUr+t}MuhDkn@0*jBsDVL_MWhbyWI_RdJa&W!Q5@S+_ur1nwp}XY%+X58ne))e6@ef
z95JJ|BJ+r)DcCHs=-IWoy5O+KLuIh~b}QL@%!u7#QCa0K;NE&(Gy9Wmj6Y-iLy>yb
z>AV$BbVRAnM<Y+a+<RDSM<nN%(^~NyT|!RE$=nDY#zGe0WPgW9ZU}<<b!hX=oof2w
z)ySvV$Q$qa5vtG)kXuQ)@4T5uM}nOS<G0;q|ARm2mXmf`ICFg{y53$_O39Kw@*>~7
z5*gPg-Nnd8Tf>+HWI{+;XW~?Jr}!}~d6pIz37!9INzkS6E8++R%{Nn%EQ+wAo0ODp
zK)W=3m_R==$H&@JuiMUJN4hNz-~PC2#ua+~B35B>dAZk`-~MG2|4;njBBPM}Fa2J|
zGMGBTyEMJ2#U+#j<%1grO!=>C9kkT(1#u@V933mp3Xj3HqY{g+T?`Cb9LU}BYAhNf
zSdA6Fm<d%?WO6Gp+C$}ZYBMI`4vp*w&+Gc+0bp*b-0|*4?{>|1u5HRL=_Mpk76!|&
zyu^))|3i}>%sYaTuV1$1^F~Qcxkim5y>Et9`Uw)v^R~<U`$woC?@M(}*Qhyb{#q_K
z7xB0({+A)~(OS>Rn8xa+{WvP}nhy4mafzbDwyC(MucHjRgk72)P}Xr4AmNpG|K9H>
zaI>axsr_)*%!`$!zh{DXk{oiY<g)E)d83zWI+%}<N6-;soB^pn`f>d@C9Rpqqn`Wy
z*4J#wT9BnCO2;?%94apWHtfXEttR6nh+(8Zr>S1dJb6*s^E=ufKg2xP!VPpJ+zG!g
zdQvP%IQH>~)Gsn=ssoRaB{!QBYD+x_Q~@608Ohy6emqBBZ1OEA#$lBHhymn|o~yx7
zS*?$1hy2?Q|H%P=|CTamqxpVp#iqE5o3g|E<fpepFcjU^7p6f)Sc;Y|)NdigoMY;S
zM6XzKr+pp(W2T;II^u^-tUPyT2YfWwwP%=wjHd3yF$LJfm0=M5(GvNd@`$g%KB93I
zr{*__!y_xXXhx?qEGJ$$0yh{VI&;~!8o$sZS@CvDolbwBk}JW2g`wpgWfQ|}U;*A3
zgd>qp%5I_inkr4P#-i+>WCXWR6a7mgQvv7V%Y#{ZzeM}HMOW%jTs)HH;KKfT;?|Dp
zK)tHpTUdO$zHlgYv1M1yDt!=8^2c2RXDmv2%HD>|F_UmHWvkAct24m2*tgXf3mV@n
zhI=_qs!&|kfpV2Pe(QL8mXozMM+^nyZd=>y)lQz(e44%B8TYVFlh-LHZ>iA__Wb%$
z_%6N6-I-^ukJ|X_>{$(Em=R%a0%W%WD(?NqsfJ=2C3~<BLivFYrd$i05A=P*>lWfR
zU5Os`g710iK{1fU&@Y|GZ@(H|)yZweMudA-b7|9gS=5C@U%@5nu^rJ)b|p8sW6#UH
zv<zmS(GT@T_G5KF+hk(;;YE#eTATw1D{)e$PVAr7|Eqr@5`8ZXSQX&aA#&959U&aY
zk!2Ff35+&r=nbN`K+6PS#B5UUSQ@KpRdw}6RGXT>K}SE|9C<huxi^3M^T_xt+0xD*
zd2|GXoQdJiSFO9ZYTm<sG?jtMU#)iD%y8dnQF)jP){4m((JGPzG8eynv6gwAJer@X
zx;_+?O#TpEAu$adP7`Opt|M2q(2GI!%kI%4Z#j6=9hCfS)FCeM-rUC&Yidina!lC{
zk<6ZU-eI3BN2YeW)=)hg#<ESYk4W?4gf#M(sxubPg{OH&cC3Apx233~-5<VoJNGt7
z9FZIT01|Z`YS8?ItUPW4PkgCxp<|Bche%kJAmy61!qvqfuNX)qz*i8rpE@>Rcht-g
z<={TbVOoa)njt|GQy7uu_Xl$nQ39-gF1&5xOCv`j6<eZcG+a)}J~YEnEJ>iU;uTei
z3HX|TmSrGh`TLprT(}(`;}mOB16f=hGC5WRH^bA6u+&tOZc!-?x-N^gZ&Vq<-3(in
zd_QF<V->7!{rS^lj@fQR>-^f4J|oZRa`#RqrzFi@GH)!tQB|oyGdIm-Q9}N1-m@hY
zFaKcn#f;>Ff3c5VE&oGxK~(bo6MBf;UkN~o1_Z$qf3@UB>NIrKQ};PFk~4u8`IW6}
zd@e}B;VCG`aYdRTtv<p?mB21{4wz=CA=3OUNM5b@XNs^8R~kHbRA+tMSj}v{n18R1
z?ZrpnYG`R?wapZuD%6Mk+sCRdxn6o|nskm=C<$}Rh|W(Gpp6a!Ni>jymT7XLmGGP!
zI3#7IMkZ7a(<j&~reuIOx_FPJ9l2X9MksoJ)B)G4oX4911V$%T7O>ehFF~f9$4@J(
znoq{eF30>S(%?O^Dc9-Coh|g(w7o+H3HdN^GQ)Rzg|frT>RxMB#3f1-GBBP}7rB9D
zuj4aZ&l)Sdj@sh%u1$%3R!Qwfe)T)-_CpgAg9yRQP}JLy^0=V62I*B6V@?A#2Pjdu
zi~D2LRh}E|;TxUytA)<Q2SQCiJc-?s-AB34VS}*zQ7!ys^n8Gyw6Ui)gvQmyf`{^%
zNWs0!RR~Hz1p9s{;rwNuwb6%rlm>PGCVAdUIU4;Zz5#dJpnU<l6v9N){HYhf=!ati
zZZJ&DHm2_1yITPEN+^O1lr`drntbWOE9b;u*pDvJbg%uLRI0O-*#9qZqJCdd{jeft
zvz1w|wz@W59Ftj?sxQO#q5NMN>Z_YCd^$O2TX*^m+$Iiczj^tC*xF+%Ops8kJ1j%#
zSm!#|^3(E?aZ7fR@Rk>MyO#Wdmf55sW`8!!ospG+Dtn50VfPVz*P1fS{-=m*uA|fp
zmvjPARDaGeCRa+4kyknppQcx=PHXwdHZ@Tq*VW`y^_M@kw!aU%bFX-ko+^iRlfr}=
zb-2mHi2K84jHSQ9P;tMUK$BfCpWn;lkko|Dz)U@i&(dPPsf6qNMTjKKT;fe`#&0)F
zX2^`y%<`|*oBI~K&d9toH(CAl#meGh{80N`v+ppf2N6*%lZqS=po5F5<ob5IoOi-J
z7>X52=yUtI`iA&KkV`4^Ggf58-}8D+`Os7(m%&DEM<j!J#x_-bO1$;{s~7lR(%yJm
zh}W<y9qKjwacRwGlo8FgOCIqK7PMVG`JsLkLh}Codw$~38A%HETmMZ<6V;%i$Gz7B
z7CjIeC#vgJGgsh65ZiNA%s|eun#M*l>*m^8ZSn6qHBM$3guU!wtk<KtPbAC+0ZicY
z`mvkZprRcfT>It7;DMk47-gM5rB1BgVWND;xo*CB+YyRZ4y$P0gYq~Bf7RRZ4{t{6
zU=8CR>c4yPrkAvi9Oly*-V_y1e{9Uvesv6P@(wsCt~QiTn_lzCA#BsTR%^pGt2u{|
zLgb0~R*N=}3#VBpck6|*$OTaJZ|3getL}YXf-%R&l35G$g!KN#z|BG|_>cJ$F-gU6
zzUojL{H!lj`*Ylys7^|!9ol3`bno3V9kLd{iimGFwYQQl<v9-O{FDmCdgjlY_>;vc
zvBw8&n(w1s<ycg#zGojRu{I~7Ey?I^#1hkzGtX|-$L}t!WHcnd#XFd60!?fur2<x%
zHrY3~B3nNYO@3i{kdaCbCJkz2mLF^2f;9LT?k&hr@IEY;54Cc5IJ)m!Ryq{C#W8?c
zpsZ?)?-S3Y+7q*_c)Vxz0?WRFRavB$yXOTBBqb~;t^dp5i^L+Ta7z%0sr~fG*J^K8
zBO_;hwEV^S*6Wr3KbpP#frV)MKntK2HR!n`?#79{e*on?5~bN&mvcoPAW3{fy`Px3
zV~XfTyLqv-Z;}YNwBFUl9g^8d7h>}CEm}@SSxz%-?0H0rC|Wt?nIJKdTIy&famZoG
z2F`5-J*V`M$DJXW2hB!>qH%Vr{2R%BE4?rI)ctG#u|HxpJYhPx(_f(NZ4isp+K9v!
z(5!o`(&R{WKTCSud`Q|fJOOHs<;g%aUf|r{Ey1b_*FjFmQcsaDDB+DO7c$g|P)d3j
zSg0EGm9(mKAzBz3c(W3Y1@dpbL62swC%sH$BWDJxygwj#CB9sFh<~}dl4&Ma?-Zg%
zVOSCKU~IBmbE;K|A>yS|mAU2}={TCxXo+V}3?Otn^H$S=y+oYS7ZbJ>dsn<ZoE%}v
z#SEmg-5}OhOXn*;#4S&nFL-&;8Zv+B_gy%MjFQ%!_qFVcAbOohb|H2t@10G%TK3!-
zE@LT_)x@9VG(d1EF+Lg-yNAVVOB*Vni50?vRYv#deu}59nC5PstU-}O$Ox&0I9)2#
zgneE1p9`}qBFrSshs!vBDd!NYbvFI!(4*fgu$b~9@u^}?wjw+3S5s-L09gfTPQo@#
zY}IO1O?0zEo^S_YzTq*rg9yeVyC|ostaaG$9BDvO3!wH^xEZAw%_v0BMJK1bJvxx&
zy-}fBX$^tinVC9P5jTbNM(UMnwUm37g|q+bXP3`R>7Uz}fFy_TT~{YK>)wJf-QHum
z4L5N$?4Te!d{y}dnRsV)w$Oa;Je!d^&K)n^TFY9MN$1IV4sZ=L0(P<#!c=%BE+l0x
z*?C_K%#`s)rjW9)YlYFI+IB+*K$rwFc2sC9&^Qgx6Mj<w&OBPO_uRP^k7#OQ>evF2
zU9iF?Wxnlr^YePMcfycNZ|0zX(Nj<?$I=9b(mggQIp-mo)h^r>ikK(Zyn9P8zodlh
zwl=mL4c&+ggO3&A)pE&G@-wyWh_&%P=?egLuHlcB{kdft_nx}f3u+p(Fv~1C3HsXO
zGFeQq7dp=6j<)p+ar^d=iPe&Fwe`_HPI|t{(9ikxfo{U|BVQ%)qmkrteqo^!{o<B}
znwt9VUSxE_v`S8i_iXK+y!cgI*)^*h@f`=+qrl!SPRCx0sn+tlD5iyU&0$_yX+J<{
z<$74JhrQoHGWR_mav#3TaXoE@7YsawtBUB;Gjd}g?8ZHmqZC%c8ZV9IM!##9i(+Mn
zzSGFSPZuBO<YD27jL3qp7@3=g6QUv|q|K2xwr&sEaVoLDB~RW<g)o~VAeJs{hFk;{
zBGP7^uQa+S1smUC@_kiy`To*ibOI<1@Sk*|uM*6Vu<o?X{)}HkWOlO^Zt$oD$%!^)
zipppuITv@|we$#G`&;c}z$S)HK58crbYh8=Xe|)I3GhE_lHHu*mNSk&XP_oB3)eIX
z6s@*oo0eE(2pjTh4e*X{pCo1qUuz)yY^?+}Epzb<n>uUa^n~wn<c+kpJTSy1x&Qp7
z++HhTCFhtOe>&!oB0w16<DjWg<VPl$Ns$syd8$%Ok5P!DoES2JrdoYKM8tM@n{3v`
zzMXF;hSK6p&SuR2^QWCac|;0E2i5EEzYV~WQ&D%~G7;k`qqT%$6r9xMU=Pz2`CngZ
zzj4YmSkI!1&e;l3g+}Rbssn7OXb(RK#$Flo{XS_0sqY<|^y;6((uhOBBYSv69YF@Q
zs41RaShP!$C)B4U#cXRBi&tNf=eYUqKIxz@SHUy&!nZKTt5Vx{GRkgXN8dpigq;v{
z4=jn)`Oz%gn4yTvhE$z)1R(_()zfE3P(^qU+EMg3xyNey(_-sr`l8ePxjL|Z>6<l`
zi(+;JA8%Z*V#r>Ec;%hH>!iL*;u94oK>NFImWXd*L}=EESAcH&WywxIKFxT^-Y`EW
ziMVUh3)EnzNs@*2+tS)-8fF7x(bK=f3!Ng((c}U44*0y?)FDPHcBRf>M~{A1G}GNS
z1{FUvWP29(x}P1OO)3#g6M~^IC55f^{3iT){$Dqo&{f`s!D!O4$6^8zAr}Q^IL`C%
zlH)aQAJ_Wm3=qxBn85>TLdD?%{wq{#R!%Jme!Tr&3f86A<;O-H;b@L1X@ebuxLh2X
zD{h+6ZklJ2wWddMaNh|FJL8=T9K)Ol&(hxLX{wchs}4hSW@8f;6T(kK`ng*BYYE)%
z$|$sBM_w_R&m<9)ICC2?S>pg?P5SR%^qgd71RwfTFGA4=2>Y=udJb50D4o`(^9}qB
zE+R=et{!w^IZqk4?$$UU@I4`m$lcD*?(c;f+LrY&Hf!rF8l&9^%Lv#={UX)~wNsL|
zti=d$azl}D;=aF}bM>#t(PwyJmqy$XSx{y?UZf;Pfd_tWdSb~@a{y9f`|oOP>`_)_
zsZIKq<nyEEkcN&)Ytt*Wp(4Beq42>B)%5gb$^rHPnv<qKm$z~pAc@hEPM$yFtrF2G
z7>Qt%Zshj8@Ibx_#j<e*`mK+5>#B)Ge-IYA1%Mg<(VL~cQ+34U4Q`*D4zxyF7Y1sx
z5FpDWg_m)F3#K9fkk;ct9bX55#00Mz16iI7UM*_tO+0kVGBhjKNE&?=w7?v3<ZPh5
zAR<TV>kKY7>xgfvCiRBzIcptwJ6~%vH!)B1;}&S2)f{*kvS~{c387~|BdUl;1sF3+
z97Z_#?m3dfOmauvX$`{QX#8X7>%;a+{5|QGlwp>Xta$&Erhl03t%R=X&dxpte{q?{
zI9+SFj#-NLjBZg;i{o2;uRc-GWlO47ka)N#R9kZNdsk`3?_8eK6$wQSOZ2zP6lXnc
z!e>JO6q82^L7F4}S!np=|AjXB`@Z${USvg&ukalUtcFj`&lov$!InOjUGwAgJ*j<-
z0m9{xeq36X7wLcgmPYV@RvQx2EuiOVcW5(CLO5m`j!50#%BsN7bOuRaqO~@C&v*F#
z6Y)}1``rT`3*KY(L6l}hG=oLR98o#<9p)O@Q2(v|@W(8;Fl<LZ9d{w)SSy89SNjZT
zoM#VIkqq;4!*XWwu`SLDLpmt|&ORbV-2#HN7>Q2KG`fbg$=|b*=pL?)T!D5XWve#r
zM>om>Gz1*9a&p6lenLX$wnnV7KmYRBN=+4Hstlhy)J1;m3VQJ082o~FT{ErKAWKMO
z!su&5rMMzDjOXC@8d*VFmWeN}Wh?wrY}W2eX39?UW>=sP`mN$?56m;b-Pm5U?l(d5
zz8S6$nC<l{*x|@?hIM99yz;kf{nlH5q?MsC<aahLyH$3mYYQov7HFiW>~)oL<;g=M
zhvo2PYlNyN)p1@xg=hBlkc4l$cFJz2kwOMc;hm<&iqK4bHgh1HIPwzgZrwU%r{{F=
z_|?9WR=o?xY48DDlK~Vw$^=DZWvXqrGOFj3F&UJ1a2qp1iu@T8_x|-`2Y8fK`F3f#
zt6YcO_z_k%X{~e}G=x?@=LFlomU9%KGO7qJn0hU86vJ-J2Ps;PQ(*oHzj$4%BlT;3
zo*aZ!3OVFp-<SrXQZFHTQ3_vH{;`uFpNRhTIQ(McO#k9m9H{XMmZ24vPVfYSKxE0v
za?*NM7g=^<*~W3y)6w^h27$#hWu=Zd-|ezoK7DQ7i7x6j=&&(Jl&Sg8Zasa_UF@FJ
zd|Wu?Kvdly>Hq%6{3W<*%wHLEU*f%S;c%hY$MX5Qp~mH5j6L3f#a$gb^uG$IJ~^tx
zylR98eV!uIz%}0SlkqjOx@wnd?ICpmG*FL>Ro#=Y_uFy$Cws65_?!UfGUxix14$d0
ziVo)@AR-x0w4I15zE+p*ud(3!iMlUFr@wH0Ya?RPCplkWz1$<@%z7DK>WGlv$~>4s
zl)XcZz`<i4De(e<GL{hvE-UdJhIkioo#+`{eU|`M#fG&J>(C5Jn3v}#@YfQ<<{6((
zOmcFqU#Q2y1!c&j>6YqxRkibU*~TQrgpKdad^_=Qqla1?ivI&_ZVpcve&`W=^~PP9
zf5xOo?Aqg8Gt!NZl+1>k<GZhc2RCezj&|*4pnGcHJ?iMU4Ixog*F}OGGm|x(n>y59
zEE|9bWqK<@k?c-m@QPP8`gjw|uT(Ek$NX@yLcd(2zkJYSzO<#rRFRrZ-tjNm*##aq
z9@f^6ogRd*u%n^yMLyr^FXw?im0e3Lfr}b;eb_q$DJN&0?7M~pgUvG0eLD_1gOb?q
zjGG_CSd+tdq3a(WD+&2h1?{+<%q@CUWPvjr;dC{ad8^ZpXu`@t35_)cJPaL}Lqy7B
z&3t4ynZvpVkNGJS%UNG`$i(2(WU(`X9LM1Ex4}N0$-`SIm__L;<5s1Ci20yxORUL?
zxT@n7xzZJPF%Q8E9LDEKEma5e)Zm)C$YT^d|GypyQAAvsBB2omGhPNzajx7BZeX;Q
zX|?eo=nPBi^tnp7>`P%q({F60?-wZ`gM!>#h2eA8HH1W=A(6G}yg8Hb&U<AA@Gp7A
zNZVc5TKc)cwf@mAytd<RZ#gG27>xrj)UIW)U_{}|Iyhx<QNOs?-JU>?nM<ItQQn~@
z(zR5iV&Cah_V{pTou3VQ4&7z@1SIp)RtW{f3xyOx_|r+>llWW#BtqH|SMitSCbT}v
zF@C7SI|&Qf5|CcE$Ixh_kv?p!EnDohS6EnE3kw^5$XCe0;Vas@dh4uA5mcJbOeex`
zg)YTC;SdUjF3Ur~2QZ?I?@NqxpyQ@V`rvow#eZfQc1?O0`TOPYZPHQzwky4Gfwz}O
z_imx-;~z-JklrG?oKP*?4o{85n(XKG@)tx1=_L7bS$U)1Bg6k_Vm@m>)3ZH6q@?=O
zXv#($c7II07#BblOxGR1A5i6U3!PPc9b&5<n3F37BQ&+iiqeeq)VlUuYgUa=B`WzF
zxw=tJwB3J6s34KX2LwB)OLVIrb1hEn*H=6KAiU#+^|%KH@l2S?n9O?m;k=8nKugGO
zGhu^Y?$pMA3X7TkFs(C05-$sK@IDOWfc*I2B2%3lCg$gHOfF3yCb*|xTUx$UBInZj
zs2QjXGeLNi4kaq5#+OD{cr?Y^0EE47xHwKrYnxD%Eo(a1fo$WRT<t%mH}#jX$X<5Y
zzp$#Gq~BCV{H6SXZoV*58OiJ4RSkk}^DAqkF&MjMRMnZX#he!ua)(f#Td~BAEO3r7
zguKpvHT1r+pdH@H_Ni9@Diq+Je0GJ-^!7`-)BEAu<Q%f;M*=SMlG%uPi}tTv+9Qrr
zyW@4Re;O>_zzY?dx~sa-Wscl2{m$u!Kcfpa)v0-hYtqW};xL=AQX`ATm%>Vk+}E8$
zeJUHYOYL<Ex$o%{DMc^@X4kH7*>5swPANYVj9xmlWzcX&eU*<!tB_z9*0e^<#Sf?e
zV#XC1W9-?#4-9q-omZuQLa)YN7E1ag48f>k6(oITfE!5rdJ;-bUIJxQLzL1n{a&P9
zrPvxfqeT^Y>%@L3dYInZZ+az4jPnKt(hcQGgx;^yAknemf)=x?W_o3_4n}HoDvbo=
z)cX~#&e^GD%JCKhSp}AvWS7^`T5URk0tbr=M4YCuoq5A4e$(961>8rUk(=xTXT8n^
zmD=4~z^EoA)q>#g&q^1U(0CvJLy*v2kl<ALO%D}jN<$netd+n)2O?STADdxTkFV@`
z+UPr>;7V-(LUs+88@a27%QyesUxXJ4f7A(9&R1X7O*$9&8cjw*7gpMymHGQ}ufUm@
zL%<<jZ$&;ykgrpyL@Q5wfNkj^3!5AUatCV9k1?iwTl|PBk(Yvv9m(q3ZwOg5Td{0x
z-Pf7L(xh+mnT$Wt=*N5=yUa-Y!fo(Va*aL4m~2+q`)g;*gsFvN*SGi7$6#xQro?Xd
zud}-*yayf;9rUU<bz%yzfpdPMmn58h>XYW5#`Yv!)%!<(WeQuX^y(Vc+<DU9SOVvt
zPg`y?Z(`=UGP}I1y(V=(wlY??CR_soDuTb72?w>xD%$+!9Q{Y{yXa6$h1%Ee$9?jq
zs3?nZoNlhZ_l>1NKpqKSNFJYe|G2p6LjAiU2UiblFYfqP_dZCgBTg;X@I;vQ$I`Hs
zSn<8@ZP<=JMx(ETs9LqhG#_@IiV|Ry(m{BL4gYvKQ`^*HT22jL0S(?F_?C%aZ5Qgh
z+rIVM0>L{8REC>>>L2z(Jxhc;6!P+uN!h<V;fy)1y2qf~7+s4KN$|A2VQzxgK3NPd
zOXk`vT_|nO#d4kM*4ZyPUAAuW^A)ydNS1W2yVII%hs4k_MqaqcD7BdE{soeS<y%q?
z)+(4q)X^$x)U_U^dOEdYFK(P`?3dJ%`c*!vavB$Qe2M&;vu0aDheO7>-jaIu_7@{9
z=Lp;^EU=(!Akg9}|3L){iVjMa_Cj%oerAc8-dLf}EFQl<+^RqqmY_4GGb+*(u2VGP
zeP9q!USJ<%0Q<?NLFnheLqN^-csvAGJH#$D>|0sG-1Eg@t2=V&TH5(s(F8nJlunk>
zAURP~PPO_$M1wA=N*!F&`%lEx+#!s~xFV)foqf(x>9KC9=LIk>_=8tq*nGjV(+K$!
z%5G<8gqO5;z1<b{dl&O^Lmr(pwa-rwIJq&TSvU4Wtbs+(vh7SApge)vT;^;`p<Pp)
zn41}8(BE%so~dA0(0bZjE&OrH{n!%aT`hZ@$zPdR0d{$gxN?Wf_{;6`SFDpIIb9rb
zX5T45_d`_IlQ@hyRrXKqgj@FRQj+#FpYItLedqz4jU-E8L}KCNcS6k4E@(8njz_+r
zQZ;)V1|6i@P!Tc+$fTb<E;dOnbWhp5x-_dV(k0O=PXe(c1lmH)KIf?J4GHSyS6Y(B
zZY8Q_grwLr7$k4o2~D?`eQ%64mR!K}mB?1NbB2GWVET2)SNQf{GEx4eso3+%`ol^6
z-plwhs?<}Q)(Z5O2K?32U3ZpA6{5Af=U2p@U*$Ptm={fl010?~K7plOd=;^#DwpoU
z|HdJ(KiRWHwqwbpKv54AX|&D{N7v@$&3}x}e<2vV{%a`ynk&1Jo!a|WmIR|DF()NY
zE!+GHIqZ_u+$&fJ#yE8uc(xQycY3fK_O%|HR%$-nM{eiBToob47Kv_%_0X&^x$>2)
z>groG*-Ro})=R!;Bj}5_Nbkd!u9g!gn6k}(uy|vsra0le=!5M7Uoq07UUZfSA-*y!
z7d973%$gXotR#k>${X5Pq~$>l@YHUp-jmPP9FE;~V175_<oxb0&N)Xu#t7z~G7p;^
zx}={TR4?j0U6us&q{C>;iV5PeI49v&N6iX<OGE%VJ@j3F$L%#o#C?xzfsc&LU~e-o
zr#5{f_D?6Fiikf>LRM2wslUv6TZjDg&`+SfBmL9Yw~k~H60i?R{()LghQk6b6M}J7
z#+U>NyO#Hhoz%M3^hVd=S(6!EO`Z%y$@4FrR94_|JcKv~R_sAV$2gLj-G8{B<ILw{
zJ>&qoCG|^tHxONRI83|K+BKP%Q74AQv~A)igg3@QxMN;@q0~-7RFNNCLu`qu`2I+f
z(YSsIrhSX_@0fiCqa>TBuZ&;O79c&wu<25ZI6L{aL*!f%QY>qf|Btx&`DM#TpRIlg
z-dp-31oJFyaI|+;E}k^AuOIcfb@*Wk>`R2RNiob&n>d4u=xi4{6!jd`el!kwE{6>y
z=B^a*V;N`TI`@*M{6P-eu@E>~S@mV)jR!*r92;vwBedh}qY>mcY(zZ*nC+T4Z7Kxz
zc{pWN0pTosP-AfH<OC;rg`v%gjCdVrCA2`pA3eaBBn?CIHr+BzV<6K7hb0csFsTv*
z5ongoETFXi+L5b8O`2r(ZC1{a4a$s5OW{Lbd-D?Mp0j&0Uhmamyy4lflxq%&Z0f`L
z=jGS!fk(+IIFG1QE_e(5G>KhSDia}(Gfa&$5oc*Y%O)a3F!H7S^E_ynF4!)j)RoQg
z4-b#p>cCBJP~jWgX95I@tD=s83?@=iL<-`k`M8SkQ?`&OZrko>hi;<l>9RDL!~xo?
z_a(35Y%HcAY01(chJ4&Oznhz8q~|?shZI7%JFn3&YpcmFH#7fb^7!EZbZPrMAm7tI
zVaCo&E)b>Q&s?<VeLOaFxRBA+>#L28Vh-M-VoDL{{<4|&zy)K-cOcrB>tr(UHR9AB
zaeg1%uZWqjfBQylfskkk9o~60|9&9g=agNDi~mLD#KkNTc6t{ZkEpB2HF&kI0d11S
z1h-?~#<EqKR>JHRjdywb0o@^vxL}Fj^~x<dZ)vrQyO9JHbWSOyi(pMXceFQX4!<be
zMt`8Z;$VtjFLtN#5Rgqiy4;`XD5Lw7Ttlm3UVctno#J2w)|)HP)Mxf!Ra%*uHu0Vl
zoi90H^Z_4RWGoCo8h4ui3?do*_L6Nbo><&TdYHk8^<z`}e@g9c4Q<8ylqMv#&~%%u
zg6O->B@onAsKCN8&(S`_l+hjBW}bi3Ur)38R#g#h!lDMK?qf7vMCMD_XwMbQ>KDi-
zIVO1HHA0o-(qlf8kWQ*JqP#;!_w2d_FCgai*tL1^F-|5ocN&@w3V|iB!n@d_vG&Xq
zX8BI!OR)$UOJD*zI6)4{EM&;NW%m(QlMcDuK1r=7<2qySlB%GKFP~=T`nX@0hrCt%
zfee2<;EWta*p=%71swyHua$BD^1Af%Qyip(hbvn}=NSmn@;Sdi4sC*BS*4zhBR{K?
zEHBxGtLnjgWIB3zUSIQwLprSxjNz&Kez=TbMrc%QpVZ~QEW6MBqL8l6e}hlc>92;i
zQiHBzhSe?dr%(r+gdaxeGi_E0k6{}_Wn|>P4D&QC&6{4YPTwasFP;5$X=63E`ls|J
zW17NV9eyaASir+Vb&yaZpTV1+0y|YTqL7{m#fjqcQ$M2KnZ!-p;^70{@Lpb*^Oeg8
z&c|YJ`wfmhS@k_w)fu{!kKz?aWl8^S4MRH&unw9_keK;=DHNn|j4s#sO0Hb?8GGOJ
z!gpo$n?AE)^42aDpJ?AJ#B{L`<#yE=Qe0gwQY?sE3f6F{5onkEAq-e;eKmU8(0Y9X
zUV8?jL!2-V-bm#A()Mcs-Y^~bTL0CGbj^=m=N4>@zGIg!m+Ep;!)~Sg(x|3a&a|x3
zR^jURO@IIL24^&PU-UjPk=)R>zg!PF{jDc+oP4N1)+zmnTR%-oNB*>|*s~B>){Sz%
z4DVJ4kGmN)Zjhr7K5rY1mIY96m)kZIPH<=VOjwXM@c&e_utXxhcZ5Ie2DjaQsf*La
z#pbp-BJvU~`B;IfXj^7IPAB`eCVH``lE!@zgR+UG_L6vk5$s7^^qJO>R@)+a>L0pE
z*7um*lbl2TxEm~~d_<zhp@bTUl^-stM=tA~rgijjLmG&@Z$7d@af&xJAKB~)%GPwa
z<pz~6%fshtnt#4iZj3*O1Kl5;w4I`Zh8M=i$EOeBk~e@TsN1mXPQUx%Z=1h_-yA3t
z+1^O@>@EA3{SwcU9Uf4P(lhILTUfX<@JO)zf=R3}iUfx&5y>bI87pl*pSegyM*|2W
zP<Ql#WHd#!Uz0{l+9SgNJl_8urrTQz9+ZuyPfE}a;g{roGu~;t@He1$-D#jvVZwl}
zeu^kLbD-N?Cc7`wWgCBV3>Vj}`}iKv&r;iWktJcCQ;?#sH--^4(DgilHl&_O4W6ED
zw|`)rwZh06De;M2dA(@$bV4wIDEa!>lTc@F=WHPF;YC(+`L6?i<Fui09pox<dW&ET
zxVb3b{J<@DgSv}ZFO;+<+mWqyEi-Br4w2Jf15_)wRa#G<{c{9K5z5^Eb~WjcT-RF1
zVWdmRHFw@lT(BYYQC|2iT=zr)dZOrFw`1$V*l3LMbBz6aBMIdJZ9H(CZr7WySK~i!
z9&ch&=>Gj86Vavfg>Xvs*3tf75EJOY?VUYBN96fN3b&Gu(s{-<Bk0G@vnu=bxOkkR
zBH;H;zKMkXm<#bAb<nE|V3G~~;K=f%IeP(LC~B5$pnnGQI+dlUrsSImb$y*iy=wk!
zGSN2wdvIVrW6n?<sC}oDJcUj&ZOCm^$4viJ`TCtoLL%OsHXZr3{6+O;wxD<>{m$*v
z7s0320)7+kiXoF-n)CR0y^atm1>ZhI9AJvE-gWMOCOKXIDS05>R`UoWw2VUQ1lzkt
z9aV9z*2I8-V-nuvsfN$Z)p0jUtYy&KxtP&R(Ji|BaNJHK^(tSpaKW~jbzO_wa$kb9
z=Q2{Q6tiqU?2jqR{_{f?5Rc#e*$@bHTmAzs_iIO{GXz~0qyJGWdinZRq$2r6EAYLc
z(kWlzeS)eJsR><*WX2ln>)2m|QDjV+KcrC*5PdzYU4KU8%rQ;MLB<ai$}P4R<)y_v
zO;RC4ZO3mNMJR7{HtEmmfqT);+ou4)`^P}%HT&DL7jZ-RBeQ8$$KhZ55^ojOJ``b(
z2=8RxGeVVxa^UdWJWu?R@ML&3PvV6D39uk{863f%e8QEu(Y#zV>nNsIi~32kcv=^8
z<7p$#?1A2E132AuYYzs_CMEmfbPG;jRt^}g!y=3Lmf5#D&AQ{wWL`V#M=j_I%&Vfz
zQa>i2J44I^RLtDu*1q|mv{!c-KL6*(a?G`R@6tV^YR4X3S!*hl0x0OiVip1|71FX;
zk9oXLGx*wL8kn8w3Nn=F;y9~4%&f5^_7JzXUG(uy#Je)96c$giErLAWH}}BG8_Uls
Spt~3l@=})9kgJlh2>L(5Gw7KB

delta 13117
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
B!Ycp(

diff --git a/data/themes/default/theme.xml b/data/themes/default/theme.xml
index 95d58f08e..ba1e9644b 100644
--- a/data/themes/default/theme.xml
+++ b/data/themes/default/theme.xml
@@ -282,12 +282,6 @@
     <part id="target_frames"                    x="176" y="224" w="32" h="16" />
     <part id="target_layers"                    x="208" y="224" w="32" h="16" />
     <part id="target_frames_layers"             x="240" y="224" w="32" h="16" />
-    <part id="brush_circle"                     x="144" y="144" w="7" h="8" />
-    <part id="brush_circle_selected"            x="144" y="152" w="7" h="8" />
-    <part id="brush_square"                     x="160" y="144" w="7" h="8" />
-    <part id="brush_square_selected"            x="160" y="152" w="7" h="8" />
-    <part id="brush_line"                       x="176" y="144" w="6" h="6" />
-    <part id="brush_line_selected"              x="176" y="152" w="6" h="6" />
     <part id="selection_replace"                x="176" y="160" w="7" h="7" />
     <part id="selection_replace_selected"       x="176" y="168" w="7" h="7" />
     <part id="selection_add"                    x="192" y="160" w="7" h="7" />
@@ -412,6 +406,7 @@
     <part id="icon_grid"                        x="224" y="264" w="8" h="8" />
     <part id="icon_save"                        x="232" y="264" w="8" h="8" />
     <part id="icon_save_small"                  x="240" y="264" w="8" h="8" />
+    <part id="icon_slice"                       x="248" y="264" w="8" h="8" />
   </parts>
 
   <stylesheet>
diff --git a/data/widgets/slice_properties.xml b/data/widgets/slice_properties.xml
new file mode 100644
index 000000000..3e4f9a791
--- /dev/null
+++ b/data/widgets/slice_properties.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Aseprite -->
+<!-- Copyright (C) 2017 by David Capello -->
+<gui>
+<window id="slice_properties" text="@.title">
+  <grid columns="2">
+    <label text="@.name" />
+    <hbox>
+      <entry maxsize="256" id="name" magnet="true" expansive="true" />
+      <button id="user_data" icon="icon_user_data" tooltip="@.user_data_tooltip" />
+    </hbox>
+
+    <separator horizontal="true" cell_hspan="2" />
+
+    <box />
+    <hbox homogeneous="true">
+      <label text="@.x" />
+      <label text="@.y" />
+      <label text="@.width" />
+      <label text="@.height" />
+    </hbox>
+
+    <label text="@.bounds" />
+    <hbox homogeneous="true">
+      <entry maxsize="8" id="bounds_x" />
+      <entry maxsize="8" id="bounds_y" />
+      <entry maxsize="8" id="bounds_w" />
+      <entry maxsize="8" id="bounds_h" />
+    </hbox>
+
+    <check text="@.center" id="center" />
+    <hbox homogeneous="true">
+      <entry maxsize="8" id="center_x" />
+      <entry maxsize="8" id="center_y" />
+      <entry maxsize="8" id="center_w" />
+      <entry maxsize="8" id="center_h" />
+    </hbox>
+
+    <separator horizontal="true" cell_hspan="2" />
+
+    <hbox cell_hspan="2">
+      <boxfiller />
+      <hbox homogeneous="true">
+        <button text="@general.ok" closewindow="true" id="ok" magnet="true" minwidth="60" />
+        <button text="@general.cancel" closewindow="true" />
+      </hbox>
+    </hbox>
+  </grid>
+</window>
+</gui>
diff --git a/docs/ase-file-specs.md b/docs/ase-file-specs.md
index 870a33a7c..fd8b15275 100644
--- a/docs/ase-file-specs.md
+++ b/docs/ase-file-specs.md
@@ -291,15 +291,41 @@ belongs to that cel, etc.
   DWORD         Flags
                    1 = Has text
                    2 = Has color
-  + If flags has bit 1:
+  + If flags have bit 1:
     STRING        Text
-  + If flags has bit 2:
+  + If flags have bit 2:
     BYTE          Color Red (0-255)
     BYTE          Color Green (0-255)
     BYTE          Color Blue (0-255)
     BYTE          Color Alpha (0-255)
 ```
 
+### Slices Chunk (0x2021)
+
+Field       | Details                          |
+----------- | -------------------------------- |
+DWORD       | Number of slices
+BYTE[8]     | Reserved
+For each slice... |
+DWORD       | Number of "slice keys"
+DWORD       | Flags
+            | 1 - It's a 9-patches slice
+DWORD       | Reserved
+STRING      | Name
+For each slice key ... |
+DWORD       | Frame number (this slice is valid from
+            | this frame to the end of the animation)
+SIGNED WORD | Slice X position
+SIGNED WORD | Slice Y position
+WORD        | Slice Width (can be 0 if this slice hidden in the
+            | animation from the given frame)
+WORD        | Slice Height
+If flags have bit 1 |
+SIGNED WORD | Center X position (relative to slice bounds)
+SIGNED WORD | Center Y position
+WORD        | Center Width
+WORD        | Center Height
+
 ### Notes
 
 #### NOTE.1
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 470251f5a..e32cf970a 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -162,6 +162,7 @@ add_library(app-lib
   cmd/add_frame_tag.cpp
   cmd/add_layer.cpp
   cmd/add_palette.cpp
+  cmd/add_slice.cpp
   cmd/background_from_layer.cpp
   cmd/clear_cel.cpp
   cmd/clear_image.cpp
@@ -188,6 +189,7 @@ add_library(app-lib
   cmd/remove_frame_tag.cpp
   cmd/remove_layer.cpp
   cmd/remove_palette.cpp
+  cmd/remove_slice.cpp
   cmd/replace_image.cpp
   cmd/reselect_mask.cpp
   cmd/set_cel_bounds.cpp
@@ -209,6 +211,8 @@ add_library(app-lib
   cmd/set_palette.cpp
   cmd/set_pixel_format.cpp
   cmd/set_pixel_ratio.cpp
+  cmd/set_slice_key.cpp
+  cmd/set_slice_name.cpp
   cmd/set_sprite_size.cpp
   cmd/set_total_frames.cpp
   cmd/set_transparent_color.cpp
@@ -221,6 +225,7 @@ add_library(app-lib
   cmd/with_frame_tag.cpp
   cmd/with_image.cpp
   cmd/with_layer.cpp
+  cmd/with_slice.cpp
   cmd/with_sprite.cpp
   cmd_sequence.cpp
   cmd_transaction.cpp
@@ -307,6 +312,7 @@ add_library(app-lib
   commands/cmd_remove_frame.cpp
   commands/cmd_remove_frame_tag.cpp
   commands/cmd_remove_layer.cpp
+  commands/cmd_remove_slice.cpp
   commands/cmd_repeat_last_export.cpp
   commands/cmd_reselect_mask.cpp
   commands/cmd_reverse_frames.cpp
@@ -324,6 +330,7 @@ add_library(app-lib
   commands/cmd_set_palette_entry_size.cpp
   commands/cmd_set_same_ink.cpp
   commands/cmd_show.cpp
+  commands/cmd_slice_properties.cpp
   commands/cmd_sprite_properties.cpp
   commands/cmd_sprite_size.cpp
   commands/cmd_switch_colors.cpp
@@ -433,6 +440,7 @@ add_library(app-lib
   ui/editor/editor_view.cpp
   ui/editor/moving_cel_state.cpp
   ui/editor/moving_pixels_state.cpp
+  ui/editor/moving_slice_state.cpp
   ui/editor/moving_symmetry_state.cpp
   ui/editor/navigate_state.cpp
   ui/editor/pivot_helpers.cpp
@@ -478,6 +486,7 @@ add_library(app-lib
   ui/skin/skin_theme.cpp
   ui/skin/style.cpp
   ui/skin/style_sheet.cpp
+  ui/slice_window.cpp
   ui/status_bar.cpp
   ui/styled_button.cpp
   ui/tabs.cpp
diff --git a/src/app/app_menus.cpp b/src/app/app_menus.cpp
index ffbb14444..5acd6a8a8 100644
--- a/src/app/app_menus.cpp
+++ b/src/app/app_menus.cpp
@@ -89,6 +89,7 @@ void AppMenus::reload()
   m_celPopupMenu.reset(loadMenuById(handle, "cel_popup"));
   m_celMovementPopupMenu.reset(loadMenuById(handle, "cel_movement_popup"));
   m_frameTagPopupMenu.reset(loadMenuById(handle, "frame_tag_popup"));
+  m_slicePopupMenu.reset(loadMenuById(handle, "slice_popup"));
   m_palettePopupMenu.reset(loadMenuById(handle, "palette_popup"));
   m_inkPopupMenu.reset(loadMenuById(handle, "ink_popup"));
 
@@ -284,6 +285,7 @@ void AppMenus::applyShortcutToMenuitemsWithCommand(Command* command, const Param
     m_celPopupMenu,
     m_celMovementPopupMenu,
     m_frameTagPopupMenu,
+    m_slicePopupMenu,
     m_palettePopupMenu,
     m_inkPopupMenu
   };
diff --git a/src/app/app_menus.h b/src/app/app_menus.h
index 5e53d5c88..770632e10 100644
--- a/src/app/app_menus.h
+++ b/src/app/app_menus.h
@@ -46,6 +46,7 @@ namespace app {
     Menu* getCelPopupMenu() { return m_celPopupMenu; }
     Menu* getCelMovementPopupMenu() { return m_celMovementPopupMenu; }
     Menu* getFrameTagPopupMenu() { return m_frameTagPopupMenu; }
+    Menu* getSlicePopupMenu() { return m_slicePopupMenu; }
     Menu* getPalettePopupMenu() { return m_palettePopupMenu; }
     Menu* getInkPopupMenu() { return m_inkPopupMenu; }
 
@@ -67,6 +68,7 @@ namespace app {
     base::UniquePtr<Menu> m_celPopupMenu;
     base::UniquePtr<Menu> m_celMovementPopupMenu;
     base::UniquePtr<Menu> m_frameTagPopupMenu;
+    base::UniquePtr<Menu> m_slicePopupMenu;
     base::UniquePtr<Menu> m_palettePopupMenu;
     base::UniquePtr<Menu> m_inkPopupMenu;
     obs::scoped_connection m_recentFilesConn;
diff --git a/src/app/cmd/add_slice.cpp b/src/app/cmd/add_slice.cpp
new file mode 100644
index 000000000..27f8ec75e
--- /dev/null
+++ b/src/app/cmd/add_slice.cpp
@@ -0,0 +1,64 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/add_slice.h"
+
+#include "doc/slice.h"
+#include "doc/slice_io.h"
+#include "doc/sprite.h"
+
+namespace app {
+namespace cmd {
+
+using namespace doc;
+
+AddSlice::AddSlice(Sprite* sprite, Slice* slice)
+  : WithSprite(sprite)
+  , WithSlice(slice)
+  , m_size(0)
+{
+}
+
+void AddSlice::onExecute()
+{
+  Sprite* sprite = this->sprite();
+  Slice* slice = this->slice();
+
+  sprite->slices().add(slice);
+  sprite->incrementVersion();
+}
+
+void AddSlice::onUndo()
+{
+  Sprite* sprite = this->sprite();
+  Slice* slice = this->slice();
+  write_slice(m_stream, slice);
+  m_size = size_t(m_stream.tellp());
+
+  sprite->slices().remove(slice);
+  sprite->incrementVersion();
+  delete slice;
+}
+
+void AddSlice::onRedo()
+{
+  Sprite* sprite = this->sprite();
+  Slice* slice = read_slice(m_stream);
+
+  sprite->slices().add(slice);
+  sprite->incrementVersion();
+
+  m_stream.str(std::string());
+  m_stream.clear();
+  m_size = 0;
+}
+
+} // namespace cmd
+} // namespace app
diff --git a/src/app/cmd/add_slice.h b/src/app/cmd/add_slice.h
new file mode 100644
index 000000000..f81b1dc37
--- /dev/null
+++ b/src/app/cmd/add_slice.h
@@ -0,0 +1,43 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_CMD_ADD_SLICE_H_INCLUDED
+#define APP_CMD_ADD_SLICE_H_INCLUDED
+#pragma once
+
+#include "app/cmd.h"
+#include "app/cmd/with_slice.h"
+#include "app/cmd/with_sprite.h"
+
+#include <sstream>
+
+namespace app {
+namespace cmd {
+  using namespace doc;
+
+  class AddSlice : public Cmd
+                 , public WithSprite
+                 , public WithSlice {
+  public:
+    AddSlice(Sprite* sprite, Slice* slice);
+
+  protected:
+    void onExecute() override;
+    void onUndo() override;
+    void onRedo() override;
+    size_t onMemSize() const override {
+      return sizeof(*this) + m_size;
+    }
+
+  private:
+    size_t m_size;
+    std::stringstream m_stream;
+  };
+
+} // namespace cmd
+} // namespace app
+
+#endif
diff --git a/src/app/cmd/remove_slice.cpp b/src/app/cmd/remove_slice.cpp
new file mode 100644
index 000000000..26a69bff9
--- /dev/null
+++ b/src/app/cmd/remove_slice.cpp
@@ -0,0 +1,39 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/remove_slice.h"
+
+namespace app {
+namespace cmd {
+
+using namespace doc;
+
+RemoveSlice::RemoveSlice(Sprite* sprite, Slice* slice)
+  : AddSlice(sprite, slice)
+{
+}
+
+void RemoveSlice::onExecute()
+{
+  AddSlice::onUndo();
+}
+
+void RemoveSlice::onUndo()
+{
+  AddSlice::onRedo();
+}
+
+void RemoveSlice::onRedo()
+{
+  AddSlice::onUndo();
+}
+
+} // namespace cmd
+} // namespace app
diff --git a/src/app/cmd/remove_slice.h b/src/app/cmd/remove_slice.h
new file mode 100644
index 000000000..5a56cb80b
--- /dev/null
+++ b/src/app/cmd/remove_slice.h
@@ -0,0 +1,30 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_CMD_REMOVE_SLICE_H_INCLUDED
+#define APP_CMD_REMOVE_SLICE_H_INCLUDED
+#pragma once
+
+#include "app/cmd/add_slice.h"
+
+namespace app {
+namespace cmd {
+  using namespace doc;
+
+  class RemoveSlice : public AddSlice {
+  public:
+    RemoveSlice(Sprite* sprite, Slice* slice);
+
+  protected:
+    void onExecute() override;
+    void onUndo() override;
+    void onRedo() override;
+  };
+
+} // namespace cmd
+} // namespace app
+
+#endif
diff --git a/src/app/cmd/set_slice_key.cpp b/src/app/cmd/set_slice_key.cpp
new file mode 100644
index 000000000..d14d840c5
--- /dev/null
+++ b/src/app/cmd/set_slice_key.cpp
@@ -0,0 +1,55 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/set_slice_key.h"
+
+#include "doc/slice.h"
+#include "doc/slices.h"
+#include "doc/sprite.h"
+
+namespace app {
+namespace cmd {
+
+SetSliceKey::SetSliceKey(Slice* slice,
+                         const doc::frame_t frame,
+                         const doc::SliceKey& sliceKey)
+  : WithSlice(slice)
+  , m_frame(frame)
+  , m_newSliceKey(sliceKey)
+{
+  auto it = slice->getIteratorByFrame(frame);
+  if (it != slice->end() && it->frame() == frame)
+    m_oldSliceKey = *it->value();
+}
+
+void SetSliceKey::onExecute()
+{
+  if (!m_newSliceKey.isEmpty())
+    slice()->insert(m_frame, m_newSliceKey);
+  else
+    slice()->remove(m_frame);
+
+  slice()->incrementVersion();
+  slice()->owner()->sprite()->incrementVersion();
+}
+
+void SetSliceKey::onUndo()
+{
+  if (!m_oldSliceKey.isEmpty())
+    slice()->insert(m_frame, m_oldSliceKey);
+  else
+    slice()->remove(m_frame);
+
+  slice()->incrementVersion();
+  slice()->owner()->sprite()->incrementVersion();
+}
+
+} // namespace cmd
+} // namespace app
diff --git a/src/app/cmd/set_slice_key.h b/src/app/cmd/set_slice_key.h
new file mode 100644
index 000000000..c97e0925b
--- /dev/null
+++ b/src/app/cmd/set_slice_key.h
@@ -0,0 +1,43 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_CMD_SET_SLICE_KEY_H_INCLUDED
+#define APP_CMD_SET_SLICE_KEY_H_INCLUDED
+#pragma once
+
+#include "app/cmd.h"
+#include "app/cmd/with_slice.h"
+#include "doc/frame.h"
+#include "doc/slice.h"
+
+namespace app {
+namespace cmd {
+  using namespace doc;
+
+  class SetSliceKey : public Cmd
+                       , public WithSlice {
+  public:
+    SetSliceKey(Slice* slice,
+                const doc::frame_t frame,
+                const doc::SliceKey& sliceKey);
+
+  protected:
+    void onExecute() override;
+    void onUndo() override;
+    size_t onMemSize() const override {
+      return sizeof(*this);
+    }
+
+  private:
+    doc::frame_t m_frame;
+    doc::SliceKey m_oldSliceKey;
+    doc::SliceKey m_newSliceKey;
+  };
+
+} // namespace cmd
+} // namespace app
+
+#endif
diff --git a/src/app/cmd/set_slice_name.cpp b/src/app/cmd/set_slice_name.cpp
new file mode 100644
index 000000000..a4351c589
--- /dev/null
+++ b/src/app/cmd/set_slice_name.cpp
@@ -0,0 +1,41 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/set_slice_name.h"
+
+#include "doc/document.h"
+#include "doc/document_event.h"
+#include "doc/slice.h"
+#include "doc/sprite.h"
+
+namespace app {
+namespace cmd {
+
+SetSliceName::SetSliceName(Slice* slice, const std::string& name)
+  : WithSlice(slice)
+  , m_oldName(slice->name())
+  , m_newName(name)
+{
+}
+
+void SetSliceName::onExecute()
+{
+  slice()->setName(m_newName);
+  slice()->incrementVersion();
+}
+
+void SetSliceName::onUndo()
+{
+  slice()->setName(m_oldName);
+  slice()->incrementVersion();
+}
+
+} // namespace cmd
+} // namespace app
diff --git a/src/app/cmd/set_slice_name.h b/src/app/cmd/set_slice_name.h
new file mode 100644
index 000000000..6e7d14c8d
--- /dev/null
+++ b/src/app/cmd/set_slice_name.h
@@ -0,0 +1,40 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_CMD_SET_SLICE_NAME_H_INCLUDED
+#define APP_CMD_SET_SLICE_NAME_H_INCLUDED
+#pragma once
+
+#include "app/cmd.h"
+#include "app/cmd/with_slice.h"
+
+#include <string>
+
+namespace app {
+namespace cmd {
+  using namespace doc;
+
+  class SetSliceName : public Cmd
+                     , public WithSlice {
+  public:
+    SetSliceName(Slice* slice, const std::string& name);
+
+  protected:
+    void onExecute() override;
+    void onUndo() override;
+    size_t onMemSize() const override {
+      return sizeof(*this);
+    }
+
+  private:
+    std::string m_oldName;
+    std::string m_newName;
+  };
+
+} // namespace cmd
+} // namespace app
+
+#endif
diff --git a/src/app/cmd/with_slice.cpp b/src/app/cmd/with_slice.cpp
new file mode 100644
index 000000000..69c2cb61b
--- /dev/null
+++ b/src/app/cmd/with_slice.cpp
@@ -0,0 +1,31 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/with_slice.h"
+
+#include "doc/slice.h"
+
+namespace app {
+namespace cmd {
+
+using namespace doc;
+
+WithSlice::WithSlice(Slice* slice)
+  : m_sliceId(slice->id())
+{
+}
+
+Slice* WithSlice::slice()
+{
+  return get<Slice>(m_sliceId);
+}
+
+} // namespace cmd
+} // namespace app
diff --git a/src/app/cmd/with_slice.h b/src/app/cmd/with_slice.h
new file mode 100644
index 000000000..1a5b52127
--- /dev/null
+++ b/src/app/cmd/with_slice.h
@@ -0,0 +1,33 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_CMD_WITH_SLICE_H_INCLUDED
+#define APP_CMD_WITH_SLICE_H_INCLUDED
+#pragma once
+
+#include "doc/object_id.h"
+
+namespace doc {
+  class Slice;
+}
+
+namespace app {
+namespace cmd {
+  using namespace doc;
+
+  class WithSlice {
+  public:
+    WithSlice(Slice* slice);
+    Slice* slice();
+
+  private:
+    ObjectId m_sliceId;
+  };
+
+} // namespace cmd
+} // namespace app
+
+#endif
diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp
index 1d6516880..1ed6b606f 100644
--- a/src/app/commands/cmd_open_file.cpp
+++ b/src/app/commands/cmd_open_file.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -124,7 +124,9 @@ void OpenFileCommand::onExecute(Context* context)
   if (m_filename.empty())
     return;
 
-  int flags = (m_repeatCheckbox ? FILE_LOAD_SEQUENCE_ASK_CHECKBOX: 0);
+  int flags =
+    FILE_LOAD_DATA_FILE |
+    (m_repeatCheckbox ? FILE_LOAD_SEQUENCE_ASK_CHECKBOX: 0);
 
   switch (m_seqDecision) {
     case SequenceDecision::Ask:
diff --git a/src/app/commands/cmd_remove_slice.cpp b/src/app/commands/cmd_remove_slice.cpp
new file mode 100644
index 000000000..af3fbe8f8
--- /dev/null
+++ b/src/app/commands/cmd_remove_slice.cpp
@@ -0,0 +1,114 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/app.h"
+#include "app/cmd/remove_slice.h"
+#include "app/cmd/set_slice_key.h"
+#include "app/commands/command.h"
+#include "app/context_access.h"
+#include "app/document_api.h"
+#include "app/modules/gui.h"
+#include "app/ui/status_bar.h"
+#include "app/transaction.h"
+#include "base/convert_to.h"
+#include "doc/slice.h"
+#include "doc/sprite.h"
+#include "ui/alert.h"
+#include "ui/widget.h"
+
+namespace app {
+
+class RemoveSliceCommand : public Command {
+public:
+  RemoveSliceCommand();
+  Command* clone() const override { return new RemoveSliceCommand(*this); }
+
+protected:
+  void onLoadParams(const Params& params) override;
+  bool onEnabled(Context* context) override;
+  void onExecute(Context* context) override;
+
+private:
+  std::string m_sliceName;
+  ObjectId m_sliceId;
+};
+
+RemoveSliceCommand::RemoveSliceCommand()
+  : Command("RemoveSlice",
+            "Remove Slice",
+            CmdRecordableFlag)
+{
+}
+
+void RemoveSliceCommand::onLoadParams(const Params& params)
+{
+  m_sliceName = params.get("name");
+
+  std::string id = params.get("id");
+  if (!id.empty())
+    m_sliceId = ObjectId(base::convert_to<doc::ObjectId>(id));
+  else
+    m_sliceId = NullId;
+}
+
+bool RemoveSliceCommand::onEnabled(Context* context)
+{
+  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable |
+                             ContextFlags::HasActiveSprite |
+                             ContextFlags::HasActiveLayer);
+}
+
+void RemoveSliceCommand::onExecute(Context* context)
+{
+  const ContextReader reader(context);
+  const Sprite* sprite = reader.sprite();
+  frame_t frame = reader.frame();
+  const Slice* foundSlice = nullptr;
+
+  if (!m_sliceName.empty())
+    foundSlice = sprite->slices().getByName(m_sliceName);
+  else if (m_sliceId != NullId)
+    foundSlice = sprite->slices().getById(m_sliceId);
+
+  if (!foundSlice)
+    return;
+
+  std::string sliceName = foundSlice->name();
+
+  {
+    ContextWriter writer(reader, 500);
+    Document* document(writer.document());
+    Sprite* sprite(writer.sprite());
+    Transaction transaction(writer.context(), "Remove Slice");
+    Slice* slice = const_cast<Slice*>(foundSlice);
+    
+    if (slice->size() > 1) {
+      transaction.execute(new cmd::SetSliceKey(slice, frame, SliceKey()));
+    }
+    else {
+      transaction.execute(new cmd::RemoveSlice(sprite, slice));
+    }
+    transaction.commit();
+    document->notifyGeneralUpdate();
+  }
+
+  StatusBar::instance()->invalidate();
+  if (!sliceName.empty())
+    StatusBar::instance()->showTip(1000, "Slice '%s' removed", sliceName.c_str());
+  else
+    StatusBar::instance()->showTip(1000, "Slice removed");
+}
+
+Command* CommandFactory::createRemoveSliceCommand()
+{
+  return new RemoveSliceCommand;
+}
+
+} // namespace app
diff --git a/src/app/commands/cmd_show.cpp b/src/app/commands/cmd_show.cpp
index 0140e5bf2..880af0276 100644
--- a/src/app/commands/cmd_show.cpp
+++ b/src/app/commands/cmd_show.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -171,6 +171,28 @@ protected:
   }
 };
 
+class ShowSlicesCommand : public Command {
+public:
+  ShowSlicesCommand()
+    : Command("ShowSlices",
+              "Show Slices",
+              CmdUIOnlyFlag) {
+  }
+
+  Command* clone() const override { return new ShowSlicesCommand(*this); }
+
+protected:
+  bool onChecked(Context* ctx) override {
+    DocumentPreferences& docPref = Preferences::instance().document(ctx->activeDocument());
+    return docPref.show.slices();
+  }
+
+  void onExecute(Context* ctx) override {
+    DocumentPreferences& docPref = Preferences::instance().document(ctx->activeDocument());
+    docPref.show.slices(!docPref.show.slices());
+  }
+};
+
 Command* CommandFactory::createShowExtrasCommand()
 {
   return new ShowExtrasCommand;
@@ -201,4 +223,9 @@ Command* CommandFactory::createShowBrushPreviewCommand()
   return new ShowBrushPreviewCommand;
 }
 
+Command* CommandFactory::createShowSlicesCommand()
+{
+  return new ShowSlicesCommand;
+}
+
 } // namespace app
diff --git a/src/app/commands/cmd_slice_properties.cpp b/src/app/commands/cmd_slice_properties.cpp
new file mode 100644
index 000000000..1a8271209
--- /dev/null
+++ b/src/app/commands/cmd_slice_properties.cpp
@@ -0,0 +1,119 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/cmd/set_slice_key.h"
+#include "app/cmd/set_slice_name.h"
+#include "app/cmd/set_user_data.h"
+#include "app/commands/command.h"
+#include "app/context_access.h"
+#include "app/transaction.h"
+#include "app/ui/slice_window.h"
+#include "base/convert_to.h"
+#include "doc/slice.h"
+#include "doc/sprite.h"
+
+namespace app {
+
+using namespace ui;
+
+class SlicePropertiesCommand : public Command {
+public:
+  SlicePropertiesCommand();
+  Command* clone() const override { return new SlicePropertiesCommand(*this); }
+
+protected:
+  void onLoadParams(const Params& params) override;
+  bool onEnabled(Context* context) override;
+  void onExecute(Context* context) override;
+
+private:
+  std::string m_sliceName;
+  ObjectId m_sliceId;
+};
+
+SlicePropertiesCommand::SlicePropertiesCommand()
+  : Command("SliceProperties",
+            "Slice Properties",
+            CmdUIOnlyFlag)
+  , m_sliceId(NullId)
+{
+}
+
+void SlicePropertiesCommand::onLoadParams(const Params& params)
+{
+  m_sliceName = params.get("name");
+
+  std::string id = params.get("id");
+  if (!id.empty())
+    m_sliceId = ObjectId(base::convert_to<doc::ObjectId>(id));
+  else
+    m_sliceId = NullId;
+}
+
+bool SlicePropertiesCommand::onEnabled(Context* context)
+{
+  return context->checkFlags(ContextFlags::ActiveDocumentIsWritable);
+}
+
+void SlicePropertiesCommand::onExecute(Context* context)
+{
+  const ContextReader reader(context);
+  const Sprite* sprite = reader.sprite();
+  frame_t frame = reader.frame();
+  const Slice* foundSlice = nullptr;
+
+  if (!m_sliceName.empty())
+    foundSlice = sprite->slices().getByName(m_sliceName);
+  else if (m_sliceId != NullId)
+    foundSlice = sprite->slices().getById(m_sliceId);
+
+  if (!foundSlice)
+    return;
+
+  const doc::SliceKey* key = foundSlice->getByFrame(frame);
+  if (!key)
+    return;
+
+  SliceWindow window(sprite, foundSlice, frame);
+  if (!window.show())
+    return;
+
+  {
+    ContextWriter writer(reader, 500);
+    Transaction transaction(writer.context(), "Slice Properties");
+    Slice* slice = const_cast<Slice*>(foundSlice);
+
+    std::string name = window.nameValue();
+
+    if (slice->name() != name)
+      transaction.execute(new cmd::SetSliceName(slice, name));
+
+    if (slice->userData() != window.userDataValue())
+      transaction.execute(new cmd::SetUserData(slice, window.userDataValue()));
+
+    if (key->bounds() != window.boundsValue() ||
+        key->center() != window.centerValue()) {
+      SliceKey newKey = *key;
+      newKey.setBounds(window.boundsValue());
+      newKey.setCenter(window.centerValue());
+      transaction.execute(new cmd::SetSliceKey(slice, frame, newKey));
+    }
+
+    transaction.commit();
+    writer.document()->notifyGeneralUpdate();
+  }
+}
+
+Command* CommandFactory::createSlicePropertiesCommand()
+{
+  return new SlicePropertiesCommand;
+}
+
+} // namespace app
diff --git a/src/app/commands/commands_list.h b/src/app/commands/commands_list.h
index 197506152..43956d98f 100644
--- a/src/app/commands/commands_list.h
+++ b/src/app/commands/commands_list.h
@@ -98,6 +98,7 @@ FOR_EACH_COMMAND(Refresh)
 FOR_EACH_COMMAND(RemoveFrame)
 FOR_EACH_COMMAND(RemoveFrameTag)
 FOR_EACH_COMMAND(RemoveLayer)
+FOR_EACH_COMMAND(RemoveSlice)
 FOR_EACH_COMMAND(RepeatLastExport)
 FOR_EACH_COMMAND(ReplaceColor)
 FOR_EACH_COMMAND(ReselectMask)
@@ -125,6 +126,8 @@ FOR_EACH_COMMAND(ShowLayerEdges)
 FOR_EACH_COMMAND(ShowOnionSkin)
 FOR_EACH_COMMAND(ShowPixelGrid)
 FOR_EACH_COMMAND(ShowSelectionEdges)
+FOR_EACH_COMMAND(ShowSlices)
+FOR_EACH_COMMAND(SliceProperties)
 FOR_EACH_COMMAND(SnapToGrid)
 FOR_EACH_COMMAND(SpriteProperties)
 FOR_EACH_COMMAND(SpriteSize)
diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp
index 696dbe19f..ac29f6bf8 100644
--- a/src/app/crash/read_document.cpp
+++ b/src/app/crash/read_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -31,6 +31,8 @@
 #include "doc/layer.h"
 #include "doc/palette.h"
 #include "doc/palette_io.h"
+#include "doc/slice.h"
+#include "doc/slice_io.h"
 #include "doc/sprite.h"
 #include "doc/string_io.h"
 #include "doc/subobjects_io.h"
@@ -286,6 +288,17 @@ private:
       }
     }
 
+    // Read slices
+    int nslices = read32(s);
+    if (nslices >= 1 && nslices < 0xffffff) {
+      for (int i = 0; i < nslices; ++i) {
+        ObjectId sliceId = read32(s);
+        Slice* slice = loadObject<Slice*>("slice", sliceId, &Reader::readSlice);
+        if (slice)
+          spr->slices().add(slice);
+      }
+    }
+
     return spr.release();
   }
 
@@ -350,6 +363,10 @@ private:
     return read_frame_tag(s, false);
   }
 
+  Slice* readSlice(std::ifstream& s) {
+    return read_slice(s, false);
+  }
+
   // Fix issues that the restoration process could produce.
   void fixUndetectedDocumentIssues(app::Document* doc) {
     Sprite* spr = doc->sprite();
diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp
index fbe3b92aa..77280c357 100644
--- a/src/app/crash/write_document.cpp
+++ b/src/app/crash/write_document.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -30,6 +30,8 @@
 #include "doc/layer.h"
 #include "doc/palette.h"
 #include "doc/palette_io.h"
+#include "doc/slice.h"
+#include "doc/slice_io.h"
 #include "doc/sprite.h"
 #include "doc/string_io.h"
 
@@ -72,6 +74,10 @@ public:
       if (!saveObject("frtag", frtag, &Writer::writeFrameTag))
         return false;
 
+    for (Slice* slice : spr->slices())
+      if (!saveObject("slice", slice, &Writer::writeSlice))
+        return false;
+
     // Get all layers (visible, hidden, subchildren, etc.)
     LayerList layers = spr->allLayers();
 
@@ -155,6 +161,11 @@ private:
     for (FrameTag* frtag : spr->frameTags())
       write32(s, frtag->id());
 
+    // IDs of all slices
+    write32(s, spr->slices().size());
+    for (const Slice* slice : spr->slices())
+      write32(s, slice->id());
+
     return true;
   }
 
@@ -220,6 +231,11 @@ private:
     return true;
   }
 
+  bool writeSlice(std::ofstream& s, Slice* slice) {
+    write_slice(s, slice);
+    return true;
+  }
+
   template<typename T>
   bool saveObject(const char* prefix, T* obj, bool (Writer::*writeMember)(std::ofstream&, T*)) {
     if (isCanceled())
diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp
index bfe4d56b1..da92408e4 100644
--- a/src/app/file/ase_format.cpp
+++ b/src/app/file/ase_format.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -39,6 +39,7 @@
 #define ASE_FILE_CHUNK_FRAME_TAGS           0x2018
 #define ASE_FILE_CHUNK_PALETTE              0x2019
 #define ASE_FILE_CHUNK_USER_DATA            0x2020
+#define ASE_FILE_CHUNK_SLICES               0x2021
 
 #define ASE_FILE_LAYER_IMAGE                0
 #define ASE_FILE_LAYER_GROUP                1
@@ -54,6 +55,8 @@
 
 #define ASE_CEL_EXTRA_FLAG_PRECISE_BOUNDS   1
 
+#define ASE_SLICE_FLAG_HAS_CENTER_BOUNDS    1
+
 namespace app {
 
 using namespace base;
@@ -139,6 +142,9 @@ static void ase_file_write_mask_chunk(FILE* f, ASE_FrameHeader* frame_header, Ma
 static void ase_file_read_frame_tags_chunk(FILE* f, FrameTags* frameTags);
 static void ase_file_write_frame_tags_chunk(FILE* f, ASE_FrameHeader* frame_header, const FrameTags* frameTags,
                                             const frame_t fromFrame, const frame_t toFrame);
+static void ase_file_read_slices_chunk(FILE* f, Slices* slices);
+static void ase_file_write_slices_chunk(FILE* f, ASE_FrameHeader* frame_header, const Slices* slices,
+                                        const frame_t fromFrame, const frame_t toFrame);
 static void ase_file_read_user_data_chunk(FILE* f, UserData* userData);
 static void ase_file_write_user_data_chunk(FILE* f, ASE_FrameHeader* frame_header, const UserData* userData);
 static bool ase_has_groups(LayerGroup* group);
@@ -325,6 +331,10 @@ bool AseFormat::onLoad(FileOp* fop)
             ase_file_read_frame_tags_chunk(f, &sprite->frameTags());
             break;
 
+          case ASE_FILE_CHUNK_SLICES:
+            ase_file_read_slices_chunk(f, &sprite->slices());
+            break;
+
           case ASE_FILE_CHUNK_USER_DATA: {
             UserData userData;
             ase_file_read_user_data_chunk(f, &userData);
@@ -455,6 +465,13 @@ bool AseFormat::onSave(FileOp* fop)
         ase_file_write_frame_tags_chunk(f, &frame_header, &sprite->frameTags(),
                                         fop->roi().fromFrame(),
                                         fop->roi().toFrame());
+
+      // Writer slice chunks
+      if (sprite->slices().size() > 0)
+        ase_file_write_slices_chunk(f, &frame_header,
+                                    &sprite->slices(),
+                                    fop->roi().fromFrame(),
+                                    fop->roi().toFrame());
     }
 
     // Write cel chunks
@@ -1593,7 +1610,7 @@ static void ase_file_write_frame_tags_chunk(FILE* f, ASE_FrameHeader* frame_head
 
   int tags = 0;
   for (const FrameTag* tag : *frameTags) {
-    // Skip tags that are outside the given ROI
+    // Skip tags that are outside of the given ROI
     if (tag->fromFrame() > toFrame ||
         tag->toFrame() < fromFrame)
       continue;
@@ -1668,6 +1685,120 @@ static void ase_file_write_user_data_chunk(FILE* f, ASE_FrameHeader* frame_heade
   }
 }
 
+static void ase_file_read_slices_chunk(FILE* f, Slices* slices)
+{
+  size_t nslices = fgetl(f);    // Number of slices
+  fgetl(f);                     // 8 bytes reserved
+  fgetl(f);
+
+  for (size_t i=0; i<nslices; ++i) {
+    size_t nkeys = fgetl(f);       // Number of keys
+    int flags = fgetl(f);       // Flags
+    fgetl(f);                   // 4 bytes reserved
+    std::string name = ase_file_read_string(f); // Name
+
+    base::UniquePtr<Slice> slice(new Slice);
+    slice->setName(name);
+
+    // For each key
+    for (size_t j=0; j<nkeys; ++j) {
+      frame_t frame = fgetl(f);
+      gfx::Rect bounds, center;
+      bounds.x = fgetl(f);
+      bounds.y = fgetl(f);
+      bounds.w = fgetl(f);
+      bounds.h = fgetl(f);
+
+      if (flags & ASE_SLICE_FLAG_HAS_CENTER_BOUNDS) {
+        center.x = fgetl(f);
+        center.y = fgetl(f);
+        center.w = fgetl(f);
+        center.h = fgetl(f);
+      }
+
+      slice->insert(frame, SliceKey(bounds, center));
+    }
+
+    slices->add(slice);
+    slice.release();
+  }
+}
+
+static void ase_file_write_slices_chunk(FILE* f, ASE_FrameHeader* frame_header,
+                                        const Slices* slices,
+                                        const frame_t fromFrame,
+                                        const frame_t toFrame)
+{
+  ChunkWriter chunk(f, frame_header, ASE_FILE_CHUNK_SLICES);
+
+  size_t nslices = 0;
+  for (Slice* slice : *slices) {
+    // Skip slices that are outside of the given ROI
+    if (slice->range(fromFrame, toFrame).empty())
+      continue;
+
+    ++nslices;
+  }
+
+  fputl(nslices, f);
+  fputl(0, f);  // 8 reserved bytes
+  fputl(0, f);
+
+  for (Slice* slice : *slices) {
+    // Skip slices that are outside of the given ROI
+    auto range = slice->range(fromFrame, toFrame);
+    if (range.empty())
+      continue;
+
+    int flags = 0;
+    for (auto key : range) {
+      if (key && !key->center().isEmpty()) {
+        flags |= ASE_SLICE_FLAG_HAS_CENTER_BOUNDS;
+        break;
+      }
+    }
+
+    fputl(range.countKeys(), f);             // number of keys
+    fputl(flags, f);                         // flags
+    fputl(0, f);                             // 4 bytes reserved
+    ase_file_write_string(f, slice->name()); // slice name
+
+    frame_t frame = fromFrame;
+    const SliceKey* oldKey = nullptr;
+    for (auto key : range) {
+      if (frame == fromFrame || key != oldKey) {
+        fputl(frame, f);
+        fputl(key ? key->bounds().x: 0, f);
+        fputl(key ? key->bounds().y: 0, f);
+        fputl(key ? key->bounds().w: 0, f);
+        fputl(key ? key->bounds().h: 0, f);
+
+        if (flags & ASE_SLICE_FLAG_HAS_CENTER_BOUNDS) {
+          if (key && !key->center().isEmpty()) {
+            fputl(key->center().x, f);
+            fputl(key->center().y, f);
+            fputl(key->center().w, f);
+            fputl(key->center().h, f);
+          }
+          else {
+            fputl(0, f);
+            fputl(0, f);
+            fputl(key ? key->bounds().w: 0, f);
+            fputl(key ? key->bounds().h: 0, f);
+          }
+        }
+
+        oldKey = key;
+      }
+      ++frame;
+    }
+
+    --nslices;
+  }
+
+  ASSERT(nslices == 0);
+}
+
 static bool ase_has_groups(LayerGroup* group)
 {
   for (Layer* child : group->layers()) {
diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp
index f4705655f..01af2f288 100644
--- a/src/app/file/file.cpp
+++ b/src/app/file/file.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -21,12 +21,14 @@
 #include "app/modules/gui.h"
 #include "app/modules/palettes.h"
 #include "app/ui/status_bar.h"
+#include "app/xml_document.h"
 #include "base/fs.h"
 #include "base/mutex.h"
 #include "base/scoped_lock.h"
 #include "base/shared_ptr.h"
 #include "base/string.h"
 #include "doc/doc.h"
+#include "doc/slice.h"          // TODO add this header file in doc.h
 #include "docio/detect_format.h"
 #include "render/quantization.h"
 #include "render/render.h"
@@ -41,6 +43,36 @@ namespace app {
 
 using namespace base;
 
+namespace {
+
+void updateXmlPartFromSliceKey(const SliceKey* key, TiXmlElement* xmlPart)
+{
+  xmlPart->SetAttribute("x", key->bounds().x);
+  xmlPart->SetAttribute("y", key->bounds().y);
+  if (key->center().isEmpty()) {
+    xmlPart->SetAttribute("w", key->bounds().w);
+    xmlPart->SetAttribute("h", key->bounds().h);
+    if (xmlPart->Attribute("w1")) xmlPart->RemoveAttribute("w1");
+    if (xmlPart->Attribute("w2")) xmlPart->RemoveAttribute("w2");
+    if (xmlPart->Attribute("w3")) xmlPart->RemoveAttribute("w3");
+    if (xmlPart->Attribute("h1")) xmlPart->RemoveAttribute("h1");
+    if (xmlPart->Attribute("h2")) xmlPart->RemoveAttribute("h2");
+    if (xmlPart->Attribute("h3")) xmlPart->RemoveAttribute("h3");
+  }
+  else {
+    xmlPart->SetAttribute("w1", key->center().x);
+    xmlPart->SetAttribute("w2", key->center().w);
+    xmlPart->SetAttribute("w3", key->bounds().w - key->center().x2());
+    xmlPart->SetAttribute("h1", key->center().y);
+    xmlPart->SetAttribute("h2", key->center().h);
+    xmlPart->SetAttribute("h3", key->bounds().h - key->center().y2());
+    if (xmlPart->Attribute("w")) xmlPart->RemoveAttribute("w");
+    if (xmlPart->Attribute("h")) xmlPart->RemoveAttribute("h");
+  }
+}
+
+} // anonymous namespace
+
 std::string get_readable_extensions()
 {
   std::string buf;
@@ -285,13 +317,21 @@ FileOp* FileOp::createLoadDocumentOperation(Context* context, const char* filena
       }
     }
   }
-  else
+  else {
     fop->m_filename = filename;
+  }
 
-  /* load just one frame */
+  // Load just one frame
   if (flags & FILE_LOAD_ONE_FRAME)
     fop->m_oneframe = true;
 
+  // Does data file exist?
+  if (flags & FILE_LOAD_DATA_FILE) {
+    std::string dataFilename = base::replace_extension(filename, "aseprite-data");
+    if (base::is_file(dataFilename))
+      fop->m_dataFilename = dataFilename;
+  }
+
 done:;
   return fop.release();
 }
@@ -520,6 +560,11 @@ FileOp* FileOp::createSaveDocumentOperation(const Context* context,
     fop->m_document->setFormatOptions(opts);
   }
 
+  // Does data file exist?
+  std::string dataFilename = base::replace_extension(filename, "aseprite-data");
+  if (base::is_file(dataFilename))
+    fop->m_dataFilename = dataFilename;
+
   return fop.release();
 }
 
@@ -650,9 +695,17 @@ void FileOp::operate(IFileOpProgress* progress)
     // Direct load from one file.
     else {
       // Call the "load" procedure.
-      if (!m_format->load(this))
+      if (!m_format->load(this)) {
         setError("Error loading sprite from file \"%s\"\n",
                  m_filename.c_str());
+      }
+    }
+
+    // Load special data from .aseprite-data file
+    if (m_document &&
+        m_document->sprite()  &&
+        !m_dataFilename.empty()) {
+      loadData();
     }
   }
   // Save //////////////////////////////////////////////////////////////////////
@@ -707,9 +760,18 @@ void FileOp::operate(IFileOpProgress* progress)
     // Direct save to a file.
     else {
       // Call the "save" procedure.
-      if (!m_format->save(this))
+      if (!m_format->save(this)) {
         setError("Error saving the sprite in the file \"%s\"\n",
                  m_filename.c_str());
+      }
+    }
+
+    // Save special data from .aseprite-data file
+    if (m_document &&
+        m_document->sprite() &&
+        !hasError() &&
+        !m_dataFilename.empty()) {
+      saveData();
     }
 #else
     setError(
@@ -896,7 +958,7 @@ Image* FileOp::sequenceImage(PixelFormat pixelFormat, int w, int h)
 
 void FileOp::setError(const char *format, ...)
 {
-  char buf_error[4096];
+  char buf_error[4096];         // TODO possible stack overflow
   va_list ap;
   va_start(ap, format);
   vsnprintf(buf_error, sizeof(buf_error), format, ap);
@@ -995,4 +1057,141 @@ void FileOp::prepareForSequence()
   m_formatOptions.reset();
 }
 
+void FileOp::loadData()
+{
+  try {
+    XmlDocumentRef xmlDoc = open_xml(m_dataFilename);
+    TiXmlHandle handle(xmlDoc.get());
+
+    TiXmlElement* xmlSlices = handle
+      .FirstChild("sprite")
+      .FirstChild("slices").ToElement();
+
+    // Update theme.xml file
+    if (xmlSlices &&
+        xmlSlices->Attribute("theme")) {
+      std::string themeFileName = xmlSlices->Attribute("theme");
+
+      // Open theme XML file
+      XmlDocumentRef xmlThemeDoc = open_xml(
+        base::join_path(base::get_file_path(m_dataFilename), themeFileName));
+      TiXmlHandle themeHandle(xmlThemeDoc.get());
+      for (TiXmlElement* xmlPart = themeHandle
+             .FirstChild("theme")
+             .FirstChild("parts")
+             .FirstChild("part").ToElement();
+           xmlPart;
+           xmlPart=xmlPart->NextSiblingElement()) {
+        const char* partId = xmlPart->Attribute("id");
+        if (!partId)
+          continue;
+
+        auto slice = new doc::Slice();
+        slice->setName(partId);
+
+        doc::SliceKey key;
+
+        int x = strtol(xmlPart->Attribute("x"), NULL, 10);
+        int y = strtol(xmlPart->Attribute("y"), NULL, 10);
+
+        if (xmlPart->Attribute("w1")) {
+          int w1 = xmlPart->Attribute("w1") ? strtol(xmlPart->Attribute("w1"), NULL, 10): 0;
+          int w2 = xmlPart->Attribute("w2") ? strtol(xmlPart->Attribute("w2"), NULL, 10): 0;
+          int w3 = xmlPart->Attribute("w3") ? strtol(xmlPart->Attribute("w3"), NULL, 10): 0;
+          int h1 = xmlPart->Attribute("h1") ? strtol(xmlPart->Attribute("h1"), NULL, 10): 0;
+          int h2 = xmlPart->Attribute("h2") ? strtol(xmlPart->Attribute("h2"), NULL, 10): 0;
+          int h3 = xmlPart->Attribute("h3") ? strtol(xmlPart->Attribute("h3"), NULL, 10): 0;
+
+          key.setBounds(gfx::Rect(x, y, w1+w2+w3, h1+h2+h3));
+          key.setCenter(gfx::Rect(w1, h1, w2, h2));
+        }
+        else if (xmlPart->Attribute("w")) {
+          int w = xmlPart->Attribute("w") ? strtol(xmlPart->Attribute("w"), NULL, 10): 0;
+          int h = xmlPart->Attribute("h") ? strtol(xmlPart->Attribute("h"), NULL, 10): 0;
+          key.setBounds(gfx::Rect(x, y, w, h));
+        }
+
+        slice->insert(0, key);
+        m_document->sprite()->slices().add(slice);
+      }
+    }
+  }
+  catch (const std::exception& ex) {
+    setError("Error loading data file: %s\n", ex.what());
+  }
+}
+
+void FileOp::saveData()
+{
+  try {
+    XmlDocumentRef xmlDoc = open_xml(m_dataFilename);
+    TiXmlHandle handle(xmlDoc.get());
+
+    TiXmlElement* xmlSlices = handle
+      .FirstChild("sprite")
+      .FirstChild("slices").ToElement();
+
+    if (xmlSlices &&
+        xmlSlices->Attribute("theme")) {
+      // Open theme XML file
+      std::string themeFileName = base::join_path(
+          base::get_file_path(m_dataFilename), xmlSlices->Attribute("theme"));
+      XmlDocumentRef xmlThemeDoc = open_xml(themeFileName);
+
+      TiXmlHandle themeHandle(xmlThemeDoc.get());
+      TiXmlElement* xmlNext = nullptr;
+      std::set<std::string> existent;
+
+      TiXmlElement* xmlParts =
+        themeHandle
+        .FirstChild("theme")
+        .FirstChild("parts").ToElement();
+
+      for (TiXmlElement* xmlPart=(TiXmlElement*)xmlParts->FirstChild("part");
+           xmlPart;
+           xmlPart=xmlNext) {
+        xmlNext = xmlPart->NextSiblingElement();
+
+        const char* partId = xmlPart->Attribute("id");
+        if (!partId)
+          continue;
+
+        bool found = false;
+        for (auto slice : m_document->sprite()->slices()) {
+          const SliceKey* key;
+          if ((slice->name() == partId) &&
+              (key = slice->getByFrame(0))) {
+            existent.insert(slice->name());
+            updateXmlPartFromSliceKey(key, xmlPart);
+            found = true;
+            break;
+          }
+        }
+
+        // Delete this <part> element (as the slice was removed)
+        if (!found)
+          xmlPart->Parent()->RemoveChild(xmlPart);
+      }
+
+      for (auto slice : m_document->sprite()->slices()) {
+        const SliceKey* key;
+        if (existent.find(slice->name()) == existent.end() &&
+            (key = slice->getByFrame(0))) {
+
+          TiXmlElement xmlPart("part");
+          xmlPart.SetAttribute("id", slice->name().c_str());
+          updateXmlPartFromSliceKey(key, &xmlPart);
+
+          xmlParts->InsertAfterChild(xmlParts->LastChild(), xmlPart);
+        }
+      }
+
+      save_xml(xmlThemeDoc, themeFileName);
+    }
+  }
+  catch (const std::exception& ex) {
+    setError("Error loading data file: %s\n", ex.what());
+  }
+}
+
 } // namespace app
diff --git a/src/app/file/file.h b/src/app/file/file.h
index 8514a2bc6..96f7e4ea9 100644
--- a/src/app/file/file.h
+++ b/src/app/file/file.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -25,6 +25,7 @@
 #define FILE_LOAD_SEQUENCE_ASK_CHECKBOX 0x00000004
 #define FILE_LOAD_SEQUENCE_YES          0x00000008
 #define FILE_LOAD_ONE_FRAME             0x00000010
+#define FILE_LOAD_DATA_FILE             0x00000020
 
 namespace doc {
   class Document;
@@ -173,6 +174,7 @@ namespace app {
     //      releaseDocument() member function)
     Document* m_document;       // Loaded document, or document to be saved.
     std::string m_filename;     // File-name to load/save.
+    std::string m_dataFilename; // File-name for a special XML .aseprite-data where extra sprite data can be stored
     FileOpROI m_roi;
 
     // Shared fields between threads.
@@ -206,6 +208,8 @@ namespace app {
     } m_seq;
 
     void prepareForSequence();
+    void loadData();
+    void saveData();
   };
 
   // Available extensions for each load/save operation.
diff --git a/src/app/tools/inks.h b/src/app/tools/inks.h
index 85163872d..a50078a61 100644
--- a/src/app/tools/inks.h
+++ b/src/app/tools/inks.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -13,6 +13,7 @@
 #include "app/document_undo.h"
 #include "app/tools/pick_ink.h"
 #include "doc/mask.h"
+#include "doc/slice.h"
 #include "gfx/region.h"
 
 namespace app {
@@ -168,16 +169,42 @@ public:
 
 
 class SliceInk : public Ink {
+  AlgoHLine m_proc;
+  bool m_createSlice;
+  gfx::Rect m_maxBounds;
+
 public:
+  SliceInk() {
+    m_createSlice = false;
+  }
+
   Ink* clone() override { return new SliceInk(*this); }
 
   bool isSlice() const override { return true; }
   bool needsCelCoordinates() const override { return false; }
 
-  void prepareInk(ToolLoop* loop) override { }
+  void prepareInk(ToolLoop* loop) override {
+    m_proc = get_ink_proc<XorInkProcessing>(loop->sprite()->pixelFormat());
+  }
+
   void inkHline(int x1, int y, int x2, ToolLoop* loop) override {
-    // TODO show the selection-preview with a XOR color or something like that
-    draw_hline(loop->getDstImage(), x1, y, x2, loop->getPrimaryColor());
+    if (m_createSlice)
+      m_maxBounds |= gfx::Rect(x1, y, x2-x1+1, 1);
+    else
+      (*m_proc)(x1, y, x2, loop);
+  }
+
+  void setFinalStep(ToolLoop* loop, bool state) override {
+    m_createSlice = state;
+    if (state) {
+      m_maxBounds = gfx::Rect(0, 0, 0, 0);
+    }
+    else if (loop->getMouseButton() == ToolLoop::Left) {
+      Slice* slice = new Slice;
+      SliceKey key(m_maxBounds);
+      slice->insert(loop->getFrame(), key);
+      loop->addSlice(slice);
+    }
   }
 };
 
@@ -345,7 +372,6 @@ public:
 
       m_maxBounds |= gfx::Rect(x1, y, x2-x1+1, 1);
     }
-    // TODO show the selection-preview with a XOR color or something like that
     else {
       (*m_proc)(x1, y, x2, loop);
     }
diff --git a/src/app/tools/tool_loop.h b/src/app/tools/tool_loop.h
index ae890ef62..7dcaa4828 100644
--- a/src/app/tools/tool_loop.h
+++ b/src/app/tools/tool_loop.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -26,6 +26,7 @@ namespace doc {
   class Mask;
   class Remap;
   class RgbMap;
+  class Slice;
   class Sprite;
 }
 
@@ -117,6 +118,9 @@ namespace app {
       virtual Mask* getMask() = 0;
       virtual void setMask(Mask* newMask) = 0;
 
+      // Adds a new slice (only for slice ink)
+      virtual void addSlice(doc::Slice* newSlice) = 0;
+
       // Gets mask X,Y origin coordinates
       virtual gfx::Point getMaskOrigin() = 0;
 
diff --git a/src/app/tools/tool_loop_manager.cpp b/src/app/tools/tool_loop_manager.cpp
index 7acc39690..1876ea86d 100644
--- a/src/app/tools/tool_loop_manager.cpp
+++ b/src/app/tools/tool_loop_manager.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -109,7 +109,9 @@ bool ToolLoopManager::releaseButton(const Pointer& pointer)
 
   bool res = m_toolLoop->getController()->releaseButton(m_stroke, spritePoint);
 
-  if (!res && (m_toolLoop->getInk()->isSelection() || m_toolLoop->getFilled())) {
+  if (!res && (m_toolLoop->getInk()->isSelection() ||
+               m_toolLoop->getInk()->isSlice() ||
+               m_toolLoop->getFilled())) {
     m_toolLoop->getInk()->setFinalStep(m_toolLoop, true);
     doLoopStep(true);
     m_toolLoop->getInk()->setFinalStep(m_toolLoop, false);
diff --git a/src/app/ui/app_menuitem.cpp b/src/app/ui/app_menuitem.cpp
index 8e759f1c4..5c21f5aa2 100644
--- a/src/app/ui/app_menuitem.cpp
+++ b/src/app/ui/app_menuitem.cpp
@@ -53,9 +53,6 @@ bool AppMenuItem::onProcessMessage(Message* msg)
     case kCloseMessage:
       // disable the menu (the keyboard shortcuts are processed by "manager_msg_proc")
       setEnabled(false);
-
-      if (!s_contextParams.empty())
-        s_contextParams.clear();
       break;
 
     default:
diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp
index fdd21a1a0..847284d5a 100644
--- a/src/app/ui/editor/editor.cpp
+++ b/src/app/ui/editor/editor.cpp
@@ -52,6 +52,7 @@
 #include "doc/doc.h"
 #include "doc/document_event.h"
 #include "doc/mask_boundaries.h"
+#include "doc/slice.h"
 #include "she/surface.h"
 #include "she/system.h"
 #include "ui/ui.h"
@@ -703,7 +704,7 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
     g->fillRegion(theme->colors.editorFace(), outside);
   }
 
-  // Grids
+  // Grids & slices
   {
     // Clipping
     gfx::Rect cliprc = editorToScreen(rc).offset(-bounds().origin());
@@ -743,6 +744,10 @@ void Editor::drawSpriteUnclippedRect(ui::Graphics* g, const gfx::Rect& _rc)
               m_docPref.grid.color(), alpha);
         }
       }
+
+      // Draw slices
+      if (m_docPref.show.slices())
+        drawSlices(g);
     }
   }
 
@@ -954,6 +959,51 @@ void Editor::drawGrid(Graphics* g, const gfx::Rect& spriteBounds, const Rect& gr
     g->drawVLine(grid_color, c, y1, spriteBounds.h);
 }
 
+void Editor::drawSlices(ui::Graphics* g)
+{
+  if ((m_flags & kShowSlices) == 0)
+    return;
+
+  if (!isVisible() || !m_document)
+    return;
+
+  for (auto slice : m_sprite->slices()) {
+    auto key = slice->getByFrame(m_frame);
+    if (!key)
+      continue;
+
+    doc::color_t docColor = slice->userData().color();
+    gfx::Color color = gfx::rgba(doc::rgba_getr(docColor),
+                                 doc::rgba_getg(docColor),
+                                 doc::rgba_getb(docColor),
+                                 doc::rgba_geta(docColor));
+    gfx::Rect out =
+      editorToScreen(key->bounds())
+               .offset(-bounds().origin());
+
+    if (!key->center().isEmpty()) {
+      gfx::Rect in =
+        editorToScreen(gfx::Rect(key->center()).offset(key->bounds().origin()))
+        .offset(-bounds().origin());
+
+      auto in_color = gfx::rgba(gfx::getr(color),
+                                gfx::getg(color),
+                                gfx::getb(color),
+                                doc::rgba_geta(docColor)/4);
+      if (in.y > out.y && in.y < out.y2())
+        g->drawHLine(in_color, out.x, in.y, out.w);
+      if (in.y2() > out.y && in.y2() < out.y2())
+        g->drawHLine(in_color, out.x, in.y2(), out.w);
+      if (in.x > out.x && in.x < out.x2())
+        g->drawVLine(in_color, in.x, out.y, out.h);
+      if (in.x2() > out.x && in.x2() < out.x2())
+        g->drawVLine(in_color, in.x2(), out.y, out.h);
+    }
+
+    g->drawRect(color, out);
+  }
+}
+
 void Editor::flashCurrentLayer()
 {
   if (!Preferences::instance().experimental.flashLayer())
@@ -1621,6 +1671,63 @@ bool Editor::isInsideSelection()
     m_document->mask()->containsPoint(spritePos.x, spritePos.y);
 }
 
+EditorHit Editor::calcHit(const gfx::Point& mouseScreenPos)
+{
+  tools::Ink* ink = getCurrentEditorInk();
+
+  if (ink) {
+    // Check if we can transform slices
+    if (ink->isSlice()) {
+      if (m_docPref.show.slices()) {
+        for (auto slice : m_sprite->slices()) {
+          auto key = slice->getByFrame(m_frame);
+          if (key) {
+            gfx::Rect bounds = editorToScreen(key->bounds());
+            gfx::Rect center = key->center();
+
+            if (bounds.contains(mouseScreenPos) &&
+                !bounds.shrink(5*guiscale()).contains(mouseScreenPos)) {
+              int border =
+                (mouseScreenPos.x <= bounds.x ? LEFT: 0) |
+                (mouseScreenPos.y <= bounds.y ? TOP: 0) |
+                (mouseScreenPos.x >= bounds.x2() ? RIGHT: 0) |
+                (mouseScreenPos.y >= bounds.y2() ? BOTTOM: 0);
+
+              EditorHit hit(EditorHit::SliceBounds);
+              hit.setBorder(border);
+              hit.setSlice(slice);
+              return hit;
+            }
+            else if (!center.isEmpty()) {
+              center = editorToScreen(
+                center.offset(key->bounds().origin()));
+
+              bool horz1 = gfx::Rect(bounds.x, center.y-2*guiscale(), bounds.w, 5*guiscale()).contains(mouseScreenPos);
+              bool horz2 = gfx::Rect(bounds.x, center.y2()-2*guiscale(), bounds.w, 5*guiscale()).contains(mouseScreenPos);
+              bool vert1 = gfx::Rect(center.x-2*guiscale(), bounds.y, 5*guiscale(), bounds.h).contains(mouseScreenPos);
+              bool vert2 = gfx::Rect(center.x2()-2*guiscale(), bounds.y, 5*guiscale(), bounds.h).contains(mouseScreenPos);
+
+              if (horz1 || horz2 || vert1 || vert2) {
+                int border =
+                  (horz1 ? TOP: 0) |
+                  (horz2 ? BOTTOM: 0) |
+                  (vert1 ? LEFT: 0) |
+                  (vert2 ? RIGHT: 0);
+                EditorHit hit(EditorHit::SliceCenter);
+                hit.setBorder(border);
+                hit.setSlice(slice);
+              return hit;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return EditorHit(EditorHit::None);
+}
+
 void Editor::setZoomAndCenterInMouse(const Zoom& zoom,
                                      const gfx::Point& mousePos,
                                      ZoomBehavior zoomBehavior)
diff --git a/src/app/ui/editor/editor.h b/src/app/ui/editor/editor.h
index 701c198e2..56ee98879 100644
--- a/src/app/ui/editor/editor.h
+++ b/src/app/ui/editor/editor.h
@@ -16,6 +16,7 @@
 #include "app/tools/tool_loop_modifiers.h"
 #include "app/ui/color_source.h"
 #include "app/ui/editor/brush_preview.h"
+#include "app/ui/editor/editor_hit.h"
 #include "app/ui/editor/editor_observers.h"
 #include "app/ui/editor/editor_state.h"
 #include "app/ui/editor/editor_states_history.h"
@@ -74,13 +75,15 @@ namespace app {
       kShowOutside = 8,
       kShowDecorators = 16,
       kShowSymmetryLine = 32,
-      kUseNonactiveLayersOpacityWhenEnabled = 64,
+      kShowSlices = 64,
+      kUseNonactiveLayersOpacityWhenEnabled = 128,
       kDefaultEditorFlags = (kShowGrid |
                              kShowMask |
                              kShowOnionskin |
                              kShowOutside |
                              kShowDecorators |
                              kShowSymmetryLine |
+                             kShowSlices |
                              kUseNonactiveLayersOpacityWhenEnabled)
     };
 
@@ -195,6 +198,10 @@ namespace app {
     // Returns true if the cursor is inside the active mask/selection.
     bool isInsideSelection();
 
+    // Returns the element that will be modified if the mouse is used
+    // in the given position.
+    EditorHit calcHit(const gfx::Point& mouseScreenPos);
+
     void setZoomAndCenterInMouse(const render::Zoom& zoom,
       const gfx::Point& mousePos, ZoomBehavior zoomBehavior);
 
@@ -271,7 +278,8 @@ namespace app {
     void drawMaskSafe();
     void drawMask(ui::Graphics* g);
     void drawGrid(ui::Graphics* g, const gfx::Rect& spriteBounds, const gfx::Rect& gridBounds,
-      const app::Color& color, int alpha);
+                  const app::Color& color, int alpha);
+    void drawSlices(ui::Graphics* g);
 
     void setCursor(const gfx::Point& mouseScreenPos);
 
diff --git a/src/app/ui/editor/editor_hit.h b/src/app/ui/editor/editor_hit.h
new file mode 100644
index 000000000..56e69e7a4
--- /dev/null
+++ b/src/app/ui/editor/editor_hit.h
@@ -0,0 +1,48 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_EDITOR_HIT_H_INCLUDED
+#define APP_UI_EDITOR_HIT_H_INCLUDED
+#pragma once
+
+namespace doc {
+  class Slice;
+}
+
+namespace app {
+
+  // TODO Complete this class to calculate if the mouse hit any Editor
+  //      element/decorator
+  class EditorHit {
+  public:
+    enum Type {
+      None,
+      SliceBounds,
+      SliceCenter,
+    };
+
+    EditorHit(Type type)
+      : m_type(type)
+      , m_border(0)
+      , m_slice(nullptr) {
+    }
+
+    Type type() const { return m_type; }
+    int border() const { return m_border; }
+    doc::Slice* slice() const { return m_slice; }
+
+    void setBorder(int border) { m_border = border; }
+    void setSlice(doc::Slice* slice) { m_slice = slice; }
+
+  private:
+    Type m_type;
+    int m_border;
+    doc::Slice* m_slice;
+  };
+
+} // namespace app
+
+#endif  // APP_UI_EDITOR_HIT_H_INCLUDED
diff --git a/src/app/ui/editor/moving_cel_state.cpp b/src/app/ui/editor/moving_cel_state.cpp
index 4d868d186..15c71685e 100644
--- a/src/app/ui/editor/moving_cel_state.cpp
+++ b/src/app/ui/editor/moving_cel_state.cpp
@@ -82,7 +82,6 @@ MovingCelState::MovingCelState(Editor* editor,
   , m_celList(collect.celList())
   , m_celOffset(0.0, 0.0)
   , m_celScale(1.0, 1.0)
-  , m_canceled(false)
   , m_hasReference(false)
   , m_scaled(false)
   , m_handle(handle)
@@ -147,8 +146,7 @@ bool MovingCelState::onMouseUp(Editor* editor, MouseMessage* msg)
   }
 
   if (modified) {
-    // If the user didn't cancel the operation...
-    if (!m_canceled) {
+    {
       ContextWriter writer(m_reader, 1000);
       Transaction transaction(writer.context(), "Cel Movement", ModifyDocument);
       DocumentApi api = document->getApi(transaction);
diff --git a/src/app/ui/editor/moving_cel_state.h b/src/app/ui/editor/moving_cel_state.h
index fc9aee679..aad6b8cbc 100644
--- a/src/app/ui/editor/moving_cel_state.h
+++ b/src/app/ui/editor/moving_cel_state.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -61,7 +61,6 @@ namespace app {
     gfx::PointF m_celOffset;
     gfx::SizeF m_celMainSize;
     gfx::SizeF m_celScale;
-    bool m_canceled;
     bool m_maskVisible;
     bool m_hasReference;
     bool m_scaled;
diff --git a/src/app/ui/editor/moving_slice_state.cpp b/src/app/ui/editor/moving_slice_state.cpp
new file mode 100644
index 000000000..dc4ca5b54
--- /dev/null
+++ b/src/app/ui/editor/moving_slice_state.cpp
@@ -0,0 +1,145 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/ui/editor/moving_slice_state.h"
+
+#include "app/cmd/set_slice_key.h"
+#include "app/context_access.h"
+#include "app/transaction.h"
+#include "app/ui/editor/editor.h"
+#include "app/ui/status_bar.h"
+#include "app/ui_context.h"
+#include "doc/slice.h"
+#include "ui/message.h"
+
+#include <cmath>
+
+namespace app {
+
+using namespace ui;
+
+MovingSliceState::MovingSliceState(Editor* editor, MouseMessage* msg,
+                                   const EditorHit& hit)
+  : m_hit(hit)
+{
+  m_mouseStart = editor->screenToEditor(msg->position());
+
+  auto keyPtr = m_hit.slice()->getByFrame(editor->frame());
+  ASSERT(keyPtr);
+  if (keyPtr)
+    m_keyStart = m_key = *keyPtr;
+
+  editor->captureMouse();
+}
+
+bool MovingSliceState::onMouseUp(Editor* editor, MouseMessage* msg)
+{
+  {
+    ContextWriter writer(UIContext::instance(), 1000);
+    Transaction transaction(writer.context(), "Slice Movement", ModifyDocument);
+
+    doc::SliceKey newKey = m_key;
+    m_hit.slice()->insert(editor->frame(), m_keyStart);
+
+    transaction.execute(new cmd::SetSliceKey(m_hit.slice(),
+                                             editor->frame(),
+                                             newKey));
+    transaction.commit();
+  }
+
+  editor->backToPreviousState();
+  editor->releaseMouse();
+  return true;
+}
+
+bool MovingSliceState::onMouseMove(Editor* editor, MouseMessage* msg)
+{
+  gfx::Point newCursorPos = editor->screenToEditor(msg->position());
+  gfx::Point delta = newCursorPos - m_mouseStart;
+
+  m_key = m_keyStart;
+  gfx::Rect rc =
+    (m_hit.type() == EditorHit::SliceCenter ? m_key.center():
+                                              m_key.bounds());
+
+  if (m_hit.border() & LEFT) {
+    rc.x += delta.x;
+    rc.w -= delta.x;
+    if (rc.w < 1) {
+      rc.x += rc.w-1;
+      rc.w = 1;
+    }
+  }
+  if (m_hit.border() & TOP) {
+    rc.y += delta.y;
+    rc.h -= delta.y;
+    if (rc.h < 1) {
+      rc.y += rc.h-1;
+      rc.h = 1;
+    }
+  }
+  if (m_hit.border() & RIGHT) {
+    rc.w += delta.x;
+    if (rc.w < 1)
+      rc.w = 1;
+  }
+  if (m_hit.border() & BOTTOM) {
+    rc.h += delta.y;
+    if (rc.h < 1)
+      rc.h = 1;
+  }
+
+  if (m_hit.type() == EditorHit::SliceCenter)
+    m_key.setCenter(rc);
+  else
+    m_key.setBounds(rc);
+
+  // Update the slice key
+  m_hit.slice()->insert(editor->frame(), m_key);
+
+  // Redraw the editor.
+  editor->invalidate();
+
+  // Use StandbyState implementation
+  return StandbyState::onMouseMove(editor, msg);
+}
+
+bool MovingSliceState::onSetCursor(Editor* editor, const gfx::Point& mouseScreenPos)
+{
+  switch (m_hit.border()) {
+    case TOP | LEFT:
+      editor->showMouseCursor(kSizeNWCursor);
+      break;
+    case TOP:
+      editor->showMouseCursor(kSizeNCursor);
+      break;
+    case TOP | RIGHT:
+      editor->showMouseCursor(kSizeNECursor);
+      break;
+    case LEFT:
+      editor->showMouseCursor(kSizeWCursor);
+      break;
+    case RIGHT:
+      editor->showMouseCursor(kSizeECursor);
+      break;
+    case BOTTOM | LEFT:
+      editor->showMouseCursor(kSizeSWCursor);
+      break;
+    case BOTTOM:
+      editor->showMouseCursor(kSizeSCursor);
+      break;
+    case BOTTOM | RIGHT:
+      editor->showMouseCursor(kSizeSECursor);
+      break;
+  }
+  return true;
+}
+
+} // namespace app
diff --git a/src/app/ui/editor/moving_slice_state.h b/src/app/ui/editor/moving_slice_state.h
new file mode 100644
index 000000000..86e762b61
--- /dev/null
+++ b/src/app/ui/editor/moving_slice_state.h
@@ -0,0 +1,38 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_EDITOR_MOVING_SLICE_STATE_H_INCLUDED
+#define APP_UI_EDITOR_MOVING_SLICE_STATE_H_INCLUDED
+#pragma once
+
+#include "app/ui/editor/editor_hit.h"
+#include "app/ui/editor/standby_state.h"
+#include "doc/slice.h"
+
+namespace app {
+  class Editor;
+
+  class MovingSliceState : public StandbyState {
+  public:
+    MovingSliceState(Editor* editor, ui::MouseMessage* msg,
+                     const EditorHit& hit);
+
+    bool onMouseUp(Editor* editor, ui::MouseMessage* msg) override;
+    bool onMouseMove(Editor* editor, ui::MouseMessage* msg) override;
+    bool onSetCursor(Editor* editor, const gfx::Point& mouseScreenPos) override;
+
+    bool requireBrushPreview() override { return false; }
+
+  private:
+    EditorHit m_hit;
+    gfx::Point m_mouseStart;
+    doc::SliceKey m_keyStart;
+    doc::SliceKey m_key;
+  };
+
+} // namespace app
+
+#endif
diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index a7e7570b6..4a4fe3397 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -11,6 +11,7 @@
 #include "app/ui/editor/standby_state.h"
 
 #include "app/app.h"
+#include "app/app_menus.h"
 #include "app/color_picker.h"
 #include "app/commands/cmd_eyedropper.h"
 #include "app/commands/commands.h"
@@ -22,6 +23,7 @@
 #include "app/tools/ink.h"
 #include "app/tools/pick_ink.h"
 #include "app/tools/tool.h"
+#include "app/ui/app_menuitem.h"
 #include "app/ui/document_view.h"
 #include "app/ui/editor/drawing_state.h"
 #include "app/ui/editor/editor.h"
@@ -29,6 +31,7 @@
 #include "app/ui/editor/handle_type.h"
 #include "app/ui/editor/moving_cel_state.h"
 #include "app/ui/editor/moving_pixels_state.h"
+#include "app/ui/editor/moving_slice_state.h"
 #include "app/ui/editor/moving_symmetry_state.h"
 #include "app/ui/editor/pivot_helpers.h"
 #include "app/ui/editor/pixels_movement.h"
@@ -46,6 +49,7 @@
 #include "base/pi.h"
 #include "doc/layer.h"
 #include "doc/mask.h"
+#include "doc/slice.h"
 #include "doc/sprite.h"
 #include "fixmath/fixmath.h"
 #include "gfx/rect.h"
@@ -217,6 +221,29 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
     return true;
   }
 
+  if (clickedInk->isSlice()) {
+    EditorHit hit = editor->calcHit(msg->position());
+    switch (hit.type()) {
+      case EditorHit::SliceBounds:
+      case EditorHit::SliceCenter:
+        if (msg->left()) {
+          MovingSliceState* newState = new MovingSliceState(editor, msg, hit);
+          editor->setState(EditorStatePtr(newState));
+        }
+        else {
+          Menu* popupMenu = AppMenus::instance()->getSlicePopupMenu();
+          if (popupMenu) {
+            Params params;
+            params.set("id", base::convert_to<std::string>(hit.slice()->id()).c_str());
+            AppMenuItem::setContextParams(params);
+            popupMenu->showPopup(msg->position());
+            AppMenuItem::setContextParams(Params());
+          }
+        }
+        return true;
+    }
+  }
+
   // Only if the selected tool or quick tool is selection, we give the
   // possibility to transform/move the selection. In other case,
   // e.g. when selection is used with right-click mode, the
@@ -409,8 +436,41 @@ bool StandbyState::onSetCursor(Editor* editor, const gfx::Point& mouseScreenPos)
       return true;
     }
     else if (ink->isSlice()) {
-      editor->showBrushPreview(mouseScreenPos);
-      return true;
+      EditorHit hit = editor->calcHit(mouseScreenPos);
+      switch (hit.type()) {
+        case EditorHit::None:
+          // Do nothing, continue
+          break;
+        case EditorHit::SliceBounds:
+        case EditorHit::SliceCenter:
+          switch (hit.border()) {
+            case TOP | LEFT:
+              editor->showMouseCursor(kSizeNWCursor);
+              break;
+            case TOP:
+              editor->showMouseCursor(kSizeNCursor);
+              break;
+            case TOP | RIGHT:
+              editor->showMouseCursor(kSizeNECursor);
+              break;
+            case LEFT:
+              editor->showMouseCursor(kSizeWCursor);
+              break;
+            case RIGHT:
+              editor->showMouseCursor(kSizeECursor);
+              break;
+            case BOTTOM | LEFT:
+              editor->showMouseCursor(kSizeSWCursor);
+              break;
+            case BOTTOM:
+              editor->showMouseCursor(kSizeSCursor);
+              break;
+            case BOTTOM | RIGHT:
+              editor->showMouseCursor(kSizeSECursor);
+              break;
+          }
+          return true;
+      }
     }
   }
 
@@ -490,6 +550,27 @@ bool StandbyState::onUpdateStatusBar(Editor* editor)
         buf+std::strlen(buf), " :grid: %d %d", col, row);
     }
 
+    if (editor->docPref().show.slices()) {
+      int count = 0;
+      for (auto slice : editor->document()->sprite()->slices()) {
+        auto key = slice->getByFrame(editor->frame());
+        if (key &&
+            key->bounds().contains(
+              int(std::floor(spritePos.x)),
+              int(std::floor(spritePos.y)))) {
+          if (++count == 3) {
+            sprintf(
+              buf+std::strlen(buf), " :slice: ...");
+            break;
+          }
+
+          sprintf(
+            buf+std::strlen(buf), " :slice: %s",
+            slice->name().c_str());
+        }
+      }
+    }
+
     StatusBar::instance()->setStatusText(0, buf);
   }
 
@@ -700,6 +781,7 @@ bool StandbyState::Decorator::onSetCursor(tools::Ink* ink, Editor* editor, const
     return true;
   }
 
+  // Move symmetry
   gfx::Rect box1, box2;
   if (getSymmetryHandles(editor, box1, box2) &&
       (box1.contains(mouseScreenPos) ||
diff --git a/src/app/ui/editor/tool_loop_impl.cpp b/src/app/ui/editor/tool_loop_impl.cpp
index 1bf471103..79c03e6ce 100644
--- a/src/app/ui/editor/tool_loop_impl.cpp
+++ b/src/app/ui/editor/tool_loop_impl.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -11,6 +11,7 @@
 #include "app/ui/editor/tool_loop_impl.h"
 
 #include "app/app.h"
+#include "app/cmd/add_slice.h"
 #include "app/cmd/set_mask.h"
 #include "app/color.h"
 #include "app/color_utils.h"
@@ -415,6 +416,10 @@ public:
         // Show selection edges
         m_docPref.show.selectionEdges(true);
       }
+      // Slice ink
+      else if (getInk()->isSlice()) {
+        redraw = true;
+      }
 
       m_transaction.commit();
     }
@@ -461,6 +466,9 @@ public:
   void setMask(Mask* newMask) override {
     m_transaction.execute(new cmd::SetMask(m_document, newMask));
   }
+  void addSlice(Slice* newSlice) override {
+    m_transaction.execute(new cmd::AddSlice(m_sprite, newSlice));
+  }
   gfx::Point getMaskOrigin() override { return m_maskOrigin; }
   bool getFilled() override { return m_filled; }
   bool getPreviewFilled() override { return m_previewFilled; }
@@ -603,6 +611,7 @@ public:
   bool useMask() override { return false; }
   Mask* getMask() override { return nullptr; }
   void setMask(Mask* newMask) override { }
+  void addSlice(Slice* newSlice) override { }
   gfx::Point getMaskOrigin() override { return gfx::Point(0, 0); }
   bool getFilled() override { return false; }
   bool getPreviewFilled() override { return false; }
diff --git a/src/app/ui/frame_tag_window.h b/src/app/ui/frame_tag_window.h
index a66f21d90..98ed80050 100644
--- a/src/app/ui/frame_tag_window.h
+++ b/src/app/ui/frame_tag_window.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2016  David Capello
+// Copyright (C) 2001-2017  David Capello
 //
 // This program is distributed under the terms of
 // the End-User License Agreement for Aseprite.
@@ -19,10 +19,6 @@ namespace doc {
   class Sprite;
 }
 
-namespace ui {
-  class Splitter;
-}
-
 namespace app {
 
   class FrameTagWindow : protected app::gen::FrameTagProperties {
diff --git a/src/app/ui/slice_window.cpp b/src/app/ui/slice_window.cpp
new file mode 100644
index 000000000..77b82eb34
--- /dev/null
+++ b/src/app/ui/slice_window.cpp
@@ -0,0 +1,113 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "app/ui/slice_window.h"
+
+#include "app/document.h"
+#include "app/ui/user_data_popup.h"
+#include "base/bind.h"
+#include "doc/slice.h"
+#include "doc/sprite.h"
+
+#include <algorithm>
+
+namespace app {
+
+SliceWindow::SliceWindow(const doc::Sprite* sprite,
+                         const doc::Slice* slice,
+                         const doc::frame_t frameNum)
+  : m_userData(slice->userData())
+{
+  name()->setText(slice->name());
+
+  const doc::SliceKey* key = slice->getByFrame(frameNum);
+  ASSERT(key);
+  if (!key)
+    return;
+
+  userData()->Click.connect(base::Bind<void>(&SliceWindow::onPopupUserData, this));
+
+  boundsX()->setTextf("%d", key->bounds().x);
+  boundsY()->setTextf("%d", key->bounds().y);
+  boundsW()->setTextf("%d", key->bounds().w);
+  boundsH()->setTextf("%d", key->bounds().h);
+
+  center()->Click.connect(base::Bind<void>(&SliceWindow::onCenterChange, this));
+
+  if (!key->center().isEmpty()) {
+    center()->setSelected(true);
+    centerX()->setTextf("%d", key->center().x);
+    centerY()->setTextf("%d", key->center().y);
+    centerW()->setTextf("%d", key->center().w);
+    centerH()->setTextf("%d", key->center().h);
+  }
+  else
+    onCenterChange();
+}
+
+bool SliceWindow::show()
+{
+  openWindowInForeground();
+  return (closer() == ok());
+}
+
+std::string SliceWindow::nameValue() const
+{
+  return name()->text();
+}
+
+gfx::Rect SliceWindow::boundsValue() const
+{
+  gfx::Rect rc(boundsX()->textInt(),
+               boundsY()->textInt(),
+               boundsW()->textInt(),
+               boundsH()->textInt());
+  if (rc.w < 1) rc.w = 1;
+  if (rc.h < 1) rc.h = 1;
+  return rc;
+}
+
+gfx::Rect SliceWindow::centerValue() const
+{
+  if (!center()->isSelected())
+    return gfx::Rect(0, 0, 0, 0);
+
+  gfx::Rect rc(centerX()->textInt(),
+               centerY()->textInt(),
+               centerW()->textInt(),
+               centerH()->textInt());
+  if (rc.w < 1) rc.w = 1;
+  if (rc.h < 1) rc.h = 1;
+  return rc;
+}
+
+void SliceWindow::onCenterChange()
+{
+  bool state = center()->isSelected();
+
+  centerX()->setEnabled(state);
+  centerY()->setEnabled(state);
+  centerW()->setEnabled(state);
+  centerH()->setEnabled(state);
+
+  if (state) {
+    centerX()->setText("1");
+    centerY()->setText("1");
+    centerW()->setTextf("%d", std::max(1, boundsW()->textInt()-2));
+    centerH()->setTextf("%d", std::max(1, boundsH()->textInt()-2));
+  }
+}
+
+void SliceWindow::onPopupUserData()
+{
+  show_user_data_popup(userData()->bounds(), m_userData);
+}
+
+} // namespace app
diff --git a/src/app/ui/slice_window.h b/src/app/ui/slice_window.h
new file mode 100644
index 000000000..25b3985e0
--- /dev/null
+++ b/src/app/ui/slice_window.h
@@ -0,0 +1,46 @@
+// Aseprite
+// Copyright (C) 2017  David Capello
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#ifndef APP_UI_SLICE_WINDOW_H_INCLUDED
+#define APP_UI_SLICE_WINDOW_H_INCLUDED
+#pragma once
+
+#include "doc/anidir.h"
+#include "doc/frame.h"
+#include "doc/user_data.h"
+
+#include "slice_properties.xml.h"
+
+namespace doc {
+  class Slice;
+  class Sprite;
+}
+
+namespace app {
+
+  class SliceWindow : protected app::gen::SliceProperties {
+  public:
+    SliceWindow(const doc::Sprite* sprite,
+                const doc::Slice* slice,
+                const doc::frame_t frame);
+
+    bool show();
+
+    std::string nameValue() const;
+    gfx::Rect boundsValue() const;
+    gfx::Rect centerValue() const;
+    const doc::UserData& userDataValue() { return m_userData; }
+
+  private:
+    void onCenterChange();
+    void onPopupUserData();
+
+    doc::UserData m_userData;
+  };
+
+}
+
+#endif
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 0c643a9c9..6d534a199 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -936,6 +936,7 @@ bool Timeline::onProcessMessage(Message* msg)
                 if (popupMenu) {
                   AppMenuItem::setContextParams(params);
                   popupMenu->showPopup(mouseMsg->position());
+                  AppMenuItem::setContextParams(Params());
 
                   m_state = STATE_STANDBY;
                   invalidate();
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 4207e0d91..b3a1a8129 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Aseprite Document Library
-# Copyright (C) 2001-2016 David Capello
+# Copyright (C) 2001-2017 David Capello
 
 if(WIN32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -58,6 +58,9 @@ add_library(doc-lib
   selected_frames.cpp
   selected_layers.cpp
   site.cpp
+  slice.cpp
+  slice_io.cpp
+  slices.cpp
   sort_palette.cpp
   sprite.cpp
   sprites.cpp
diff --git a/src/doc/LICENSE.txt b/src/doc/LICENSE.txt
index 0d2d81fd4..dce2ee200 100644
--- a/src/doc/LICENSE.txt
+++ b/src/doc/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2016 David Capello
+Copyright (c) 2001-2017 David Capello
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/src/doc/README.md b/src/doc/README.md
index 6c5409397..a351bb430 100644
--- a/src/doc/README.md
+++ b/src/doc/README.md
@@ -1,4 +1,4 @@
 # Aseprite Document Library
-*Copyright (C) 2001-2016 David Capello*
+*Copyright (C) 2001-2017 David Capello*
 
 > Distributed under [MIT license](LICENSE.txt)
diff --git a/src/doc/doc.h b/src/doc/doc.h
index 73c5a3184..79cf3efe5 100644
--- a/src/doc/doc.h
+++ b/src/doc/doc.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -34,6 +34,8 @@
 #include "doc/remap.h"
 #include "doc/rgbmap.h"
 #include "doc/site.h"
+#include "doc/slice.h"
+#include "doc/slices.h"
 #include "doc/sprite.h"
 
 #endif
diff --git a/src/doc/keyframes.h b/src/doc/keyframes.h
new file mode 100644
index 000000000..40406670f
--- /dev/null
+++ b/src/doc/keyframes.h
@@ -0,0 +1,189 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_KEYFRAMES_H_INCLUDED
+#define DOC_KEYFRAMES_H_INCLUDED
+#pragma once
+
+#include "base/disable_copying.h"
+#include "doc/frame.h"
+
+#include <vector>
+
+namespace doc {
+
+  template<typename T>
+  class Keyframes {
+  public:
+    class Key {
+    public:
+      Key(const frame_t frame, T* value) : m_frame(frame), m_value(value) { }
+      frame_t frame() const { return m_frame; }
+      T* value() const { return m_value; }
+      void setFrame(const frame_t frame) { m_frame = frame; }
+      void setValue(T* value) { m_value = value; }
+    private:
+      frame_t m_frame;
+      T* m_value;
+    };
+
+    typedef std::vector<Key> List;
+    typedef typename List::iterator iterator;
+    typedef typename List::const_iterator const_iterator;
+
+    class Range {
+    public:
+      class RangeIterator {
+      public:
+        RangeIterator(const iterator& it,
+                      const iterator& end, const frame_t frame)
+          : m_it(it), m_end(end), m_frame(frame) {
+          if (it != end) {
+            m_next = it;
+            ++m_next;
+          }
+          else
+            m_next = end;
+        }
+        RangeIterator& operator++() {
+          ++m_frame;
+          if (m_next != m_end &&
+              m_next->frame() == m_frame) {
+            m_it = m_next;
+            ++m_next;
+          }
+          return *this;
+        }
+        bool operator!=(const RangeIterator& other) {
+          return (m_frame != other.m_frame+1);
+        }
+        T* operator*() {
+          if (m_it != m_end)
+            return m_it->value();
+          else
+            return nullptr;
+        }
+      private:
+        iterator m_it, m_next;
+        const iterator m_end;
+        frame_t m_frame;
+      };
+      Range(const iterator& fromIt,
+            const iterator& endIt,
+            const frame_t from,
+            const frame_t to)
+        : m_fromIt(fromIt), m_endIt(endIt)
+        , m_from(from), m_to(to) {
+      }
+      RangeIterator begin() const {
+        return RangeIterator(m_fromIt, m_endIt, m_from);
+      }
+      RangeIterator end() const {
+        return RangeIterator(m_fromIt, m_endIt, m_to);
+      }
+      bool empty() const {
+        return (m_fromIt == m_endIt);
+      }
+      size_t countKeys() const {
+        size_t count = 0;
+        auto it = m_fromIt;
+        for (; it!=m_endIt; ++it) {
+          if (it->frame() > m_to)
+            break;
+          ++count;
+        }
+        return count;
+      }
+    private:
+      const iterator m_fromIt, m_endIt;
+      const frame_t m_from, m_to;
+    };
+
+    Keyframes() { }
+
+    void insert(const frame_t frame, T* value) {
+      auto it = getIterator(frame);
+      if (it == end())
+        m_keys.push_back(Key(frame, value));
+      else if (it->frame() == frame)
+        it->setValue(value);
+      else {
+        ++it;
+        m_keys.insert(it, Key(frame, value));
+      }
+    }
+
+    T* remove(const frame_t frame) {
+      auto it = getIterator(frame);
+      if (it != end()) {
+        T* value = it->value();
+        m_keys.erase(it);
+        return value;
+      }
+      else
+        return nullptr;
+    }
+
+    T* operator[](const frame_t frame) {
+      auto it = getIterator(frame);
+      if (it != end() && it->value())
+        return it->value();
+      else
+        return nullptr;
+    }
+
+    iterator begin() { return m_keys.begin(); }
+    iterator end() { return m_keys.end(); }
+    const_iterator begin() const { return m_keys.begin(); }
+    const_iterator end() const { return m_keys.end(); }
+
+    std::size_t size() const { return m_keys.size(); }
+    bool empty() const { return m_keys.empty(); }
+
+    iterator getIterator(const frame_t frame) {
+      auto
+        it = m_keys.begin(),
+        end = m_keys.end();
+      auto next = it;
+      for (; it != end; it=next) {
+        ++next;
+        if ((frame >= it->frame()) &&
+            (next == end || frame < next->frame())) {
+          return it;
+        }
+      }
+      return end;
+    }
+
+    frame_t fromFrame() const {
+      if (!m_keys.empty())
+        return m_keys.front().frame();
+      else
+        return -1;
+    }
+
+    frame_t toFrame() const {
+      if (!m_keys.empty())
+        return m_keys.back().frame();
+      else
+        return -1;
+    }
+
+    Range range(const frame_t from,
+                const frame_t to) {
+      return Range(getIterator(from), end(), from, to);
+    }
+
+  private:
+    List m_keys;
+
+    // Disable operator=
+    DISABLE_COPYING(Keyframes);
+  };
+
+} // namespace doc
+
+#endif
diff --git a/src/doc/keyframes_tests.cpp b/src/doc/keyframes_tests.cpp
new file mode 100644
index 000000000..1207b8b0e
--- /dev/null
+++ b/src/doc/keyframes_tests.cpp
@@ -0,0 +1,133 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gtest/gtest.h>
+
+#include "doc/keyframes.h"
+
+using namespace doc;
+
+TEST(Keyframes, Operations)
+{
+  Keyframes<int> k;
+
+  EXPECT_TRUE(k.empty());
+  EXPECT_EQ(0, k.size());
+
+  k.insert(0, new int(5));
+  EXPECT_FALSE(k.empty());
+  EXPECT_EQ(1, k.size());
+  EXPECT_EQ(0, k.fromFrame());
+  EXPECT_EQ(0, k.toFrame());
+  EXPECT_EQ(nullptr, k[-1]);
+  EXPECT_EQ(5, *k[0]);
+  EXPECT_EQ(5, *k[1]);
+  EXPECT_EQ(5, *k[2]);
+
+  k.insert(2, new int(6));
+  EXPECT_EQ(2, k.size());
+  EXPECT_EQ(0, k.fromFrame());
+  EXPECT_EQ(2, k.toFrame());
+  EXPECT_EQ(nullptr, k[-1]);
+  EXPECT_EQ(5, *k[0]);
+  EXPECT_EQ(5, *k[1]);
+  EXPECT_EQ(6, *k[2]);
+  EXPECT_EQ(6, *k[3]);
+
+  k.insert(1, new int(3));
+  EXPECT_EQ(3, k.size());
+  EXPECT_EQ(0, k.fromFrame());
+  EXPECT_EQ(2, k.toFrame());
+  EXPECT_EQ(5, *k[0]);
+  EXPECT_EQ(3, *k[1]);
+  EXPECT_EQ(6, *k[2]);
+  EXPECT_EQ(6, *k[3]);
+
+  k.remove(0);
+  EXPECT_EQ(2, k.size());
+  EXPECT_EQ(1, k.fromFrame());
+  EXPECT_EQ(2, k.toFrame());
+  EXPECT_EQ(nullptr, k[0]);
+  EXPECT_EQ(3, *k[1]);
+  EXPECT_EQ(6, *k[2]);
+  EXPECT_EQ(6, *k[3]);
+
+  k.remove(3);
+  EXPECT_EQ(1, k.size());
+  EXPECT_EQ(1, k.fromFrame());
+  EXPECT_EQ(1, k.toFrame());
+  EXPECT_EQ(nullptr, k[0]);
+  EXPECT_EQ(3, *k[1]);
+  EXPECT_EQ(3, *k[2]);
+  EXPECT_EQ(3, *k[3]);
+}
+
+TEST(Keyframes, Range)
+{
+  Keyframes<int> k;
+  k.insert(0, new int(5));
+  k.insert(2, nullptr);
+  k.insert(4, new int(8));
+  k.insert(6, new int(2));
+
+  EXPECT_EQ(0, k.fromFrame());
+  EXPECT_EQ(6, k.toFrame());
+
+  EXPECT_EQ(5, *k[0]);
+  EXPECT_EQ(5, *k[1]);
+  EXPECT_EQ(nullptr, k[2]);
+  EXPECT_EQ(nullptr, k[3]);
+  EXPECT_EQ(8, *k[4]);
+  EXPECT_EQ(8, *k[5]);
+  EXPECT_EQ(2, *k[6]);
+  EXPECT_EQ(2, *k[7]);
+
+  int pass = 0;
+  for (int* value : k.range(0, 0)) {
+    EXPECT_EQ(5, *value);
+    ++pass;
+  }
+  EXPECT_EQ(1, pass);
+
+  frame_t f = 1;
+  for (int* value : k.range(1, 5)) {
+    switch (f) {
+      case 1: EXPECT_EQ(5, *value); break;
+      case 2: EXPECT_EQ(nullptr, value); break;
+      case 3: EXPECT_EQ(nullptr, value); break;
+      case 4: EXPECT_EQ(8, *value); break;
+      case 5: EXPECT_EQ(8, *value); break;
+      default:
+        ASSERT_TRUE(false);
+    }
+    ++f;
+  }
+  EXPECT_EQ(f, 6);
+
+  EXPECT_TRUE(k.range(-3, -1).empty());
+  EXPECT_FALSE(k.range(0, 1).empty());
+  EXPECT_FALSE(k.range(2, 3).empty());
+  EXPECT_FALSE(k.range(7, 7).empty());
+
+  EXPECT_EQ(1, k.range(0, 0).countKeys());
+  EXPECT_EQ(1, k.range(0, 1).countKeys());
+  EXPECT_EQ(2, k.range(0, 2).countKeys());
+  EXPECT_EQ(4, k.range(0, 7).countKeys());
+  EXPECT_EQ(1, k.range(2, 3).countKeys());
+  EXPECT_EQ(2, k.range(2, 4).countKeys());
+  EXPECT_EQ(3, k.range(3, 7).countKeys());
+  EXPECT_EQ(1, k.range(7, 7).countKeys());
+}
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/src/doc/object_type.h b/src/doc/object_type.h
index 60cb53f4f..b48a929ad 100644
--- a/src/doc/object_type.h
+++ b/src/doc/object_type.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -24,6 +24,7 @@ namespace doc {
     Sprite,
     Document,
     FrameTag,
+    Slice,
   };
 
 } // namespace doc
diff --git a/src/doc/slice.cpp b/src/doc/slice.cpp
new file mode 100644
index 000000000..441811092
--- /dev/null
+++ b/src/doc/slice.cpp
@@ -0,0 +1,83 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/slice.h"
+
+#include "base/debug.h"
+#include "doc/slices.h"
+
+namespace doc {
+
+SliceKey::SliceKey()
+{
+}
+
+SliceKey::SliceKey(// const frame_t frame,
+                   const gfx::Rect& bounds,
+                   const gfx::Rect& center)
+  : m_bounds(bounds)
+  , m_center(center)
+{
+}
+
+Slice::Slice()
+  : WithUserData(ObjectType::Slice)
+  , m_owner(nullptr)
+  , m_name("Slice")
+{
+  // TODO default color should be configurable
+  userData().setColor(doc::rgba(0, 0, 255, 255));
+}
+
+Slice::~Slice()
+{
+  ASSERT(!m_owner);
+}
+
+int Slice::getMemSize() const
+{
+  return sizeof(*this) + sizeof(SliceKey)*m_keys.size();
+}
+
+void Slice::insert(const frame_t frame, const SliceKey& key)
+{
+  m_keys.insert(frame, new SliceKey(key));
+}
+
+void Slice::remove(const frame_t frame)
+{
+  delete m_keys.remove(frame);
+}
+
+const SliceKey* Slice::getByFrame(const frame_t frame) const
+{
+  auto it = const_cast<Slice*>(this)->m_keys.getIterator(frame);
+  if (it != m_keys.end())
+    return it->value();
+  else
+    return nullptr;
+}
+
+Slice::iterator Slice::getIteratorByFrame(const frame_t frame) const
+{
+  return const_cast<Slice*>(this)->m_keys.getIterator(frame);
+}
+
+void Slice::setOwner(Slices* owner)
+{
+  m_owner = owner;
+}
+
+void Slice::setName(const std::string& name)
+{
+  m_name = name;
+}
+
+} // namespace doc
diff --git a/src/doc/slice.h b/src/doc/slice.h
new file mode 100644
index 000000000..6e299ccbe
--- /dev/null
+++ b/src/doc/slice.h
@@ -0,0 +1,88 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_SLICE_H_INCLUDED
+#define DOC_SLICE_H_INCLUDED
+#pragma once
+
+#include "doc/frame.h"
+#include "doc/keyframes.h"
+#include "doc/with_user_data.h"
+#include "gfx/rect.h"
+
+#include <string>
+
+namespace doc {
+  class Slices;
+
+  class SliceKey {
+  public:
+    SliceKey();
+    SliceKey(const gfx::Rect& bounds,
+             const gfx::Rect& center = gfx::Rect());
+
+    bool isEmpty() const { return m_bounds.isEmpty(); }
+
+    const gfx::Rect& bounds() const { return m_bounds; }
+    const gfx::Rect& center() const { return m_center; }
+
+    void setBounds(const gfx::Rect& bounds) { m_bounds = bounds; }
+    void setCenter(const gfx::Rect& center) { m_center = center; }
+
+  private:
+    gfx::Rect m_bounds;
+    gfx::Rect m_center;
+  };
+
+  class Slice : public WithUserData {
+    typedef Keyframes<SliceKey> List;
+
+  public:
+    typedef List::iterator iterator;
+    typedef List::const_iterator const_iterator;
+
+    Slice();
+    ~Slice();
+
+    int getMemSize() const override;
+
+    void insert(const frame_t frame, const SliceKey& key);
+    void remove(const frame_t frame);
+
+    const SliceKey* getByFrame(const frame_t frame) const;
+    iterator getIteratorByFrame(const frame_t frame) const;
+
+    iterator begin() { return m_keys.begin(); }
+    iterator end() { return m_keys.end(); }
+    const_iterator begin() const { return m_keys.begin(); }
+    const_iterator end() const { return m_keys.end(); }
+
+    std::size_t size() const { return m_keys.size(); }
+    bool empty() const { return m_keys.empty(); }
+
+    Slices* owner() const { return m_owner; }
+    frame_t fromFrame() const { return m_keys.fromFrame(); }
+    frame_t toFrame() const { return m_keys.toFrame(); }
+    const std::string& name() const { return m_name; }
+
+    void setOwner(Slices* owner);
+    void setName(const std::string& name);
+
+    List::Range range(const frame_t from, const frame_t to) {
+      return m_keys.range(from, to);
+    }
+
+  private:
+    Slices* m_owner;
+    std::string m_name;
+    List m_keys;
+
+    DISABLE_COPYING(Slice);
+  };
+
+} // namespace doc
+
+#endif
diff --git a/src/doc/slice_io.cpp b/src/doc/slice_io.cpp
new file mode 100644
index 000000000..d36a2a738
--- /dev/null
+++ b/src/doc/slice_io.cpp
@@ -0,0 +1,84 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/slice_io.h"
+
+#include "base/serialization.h"
+#include "base/unique_ptr.h"
+#include "doc/slice.h"
+#include "doc/string_io.h"
+#include "doc/user_data_io.h"
+
+#include <iostream>
+
+namespace doc {
+
+using namespace base::serialization;
+using namespace base::serialization::little_endian;
+
+void write_slice(std::ostream& os, const Slice* slice)
+{
+  write32(os, slice->id());
+  write_string(os, slice->name());
+  write_user_data(os, slice->userData());
+
+  // Number of keys
+  write32(os, slice->size());
+  for (const auto& key : *slice) {
+    write32(os, key.frame());
+    write_slicekey(os, *key.value());
+  }
+}
+
+Slice* read_slice(std::istream& is, bool setId)
+{
+  ObjectId id = read32(is);
+  std::string name = read_string(is);
+  UserData userData = read_user_data(is);
+  size_t nkeys = read32(is);
+
+  base::UniquePtr<Slice> slice(new Slice);
+  slice->setName(name);
+  while (nkeys--) {
+    frame_t fr = read32(is);
+    slice->insert(fr, read_slicekey(is));
+  }
+  if (setId)
+    slice->setId(id);
+  return slice.release();
+}
+
+void write_slicekey(std::ostream& os, const SliceKey& sliceKey)
+{
+  write32(os, sliceKey.bounds().x);
+  write32(os, sliceKey.bounds().y);
+  write32(os, sliceKey.bounds().w);
+  write32(os, sliceKey.bounds().h);
+  write32(os, sliceKey.center().x);
+  write32(os, sliceKey.center().y);
+  write32(os, sliceKey.center().w);
+  write32(os, sliceKey.center().h);
+}
+
+SliceKey read_slicekey(std::istream& is)
+{
+  gfx::Rect bounds, center;
+  bounds.x = read32(is);
+  bounds.y = read32(is);
+  bounds.w = read32(is);
+  bounds.h = read32(is);
+  center.x = read32(is);
+  center.y = read32(is);
+  center.w = read32(is);
+  center.h = read32(is);
+  return SliceKey(bounds, center);
+}
+
+}
diff --git a/src/doc/slice_io.h b/src/doc/slice_io.h
new file mode 100644
index 000000000..f550e25d6
--- /dev/null
+++ b/src/doc/slice_io.h
@@ -0,0 +1,26 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_SLICE_IO_H_INCLUDED
+#define DOC_SLICE_IO_H_INCLUDED
+#pragma once
+
+#include <iosfwd>
+
+namespace doc {
+
+  class Slice;
+  class SliceKey;
+
+  void write_slice(std::ostream& os, const Slice* slice);
+  Slice* read_slice(std::istream& is, bool setId = true);
+
+  void write_slicekey(std::ostream& os, const SliceKey& sliceKey);
+  SliceKey read_slicekey(std::istream& is);
+
+} // namespace doc
+
+#endif
diff --git a/src/doc/slices.cpp b/src/doc/slices.cpp
new file mode 100644
index 000000000..bc6a09474
--- /dev/null
+++ b/src/doc/slices.cpp
@@ -0,0 +1,67 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "doc/slices.h"
+
+#include "base/debug.h"
+#include "doc/slice.h"
+
+#include <algorithm>
+
+namespace doc {
+
+Slices::Slices(Sprite* sprite)
+  : m_sprite(sprite)
+{
+}
+
+Slices::~Slices()
+{
+  for (Slice* slice : m_slices) {
+    slice->setOwner(nullptr);
+    delete slice;
+  }
+}
+
+void Slices::add(Slice* slice)
+{
+  m_slices.push_back(slice);
+  slice->setOwner(this);
+}
+
+void Slices::remove(Slice* slice)
+{
+  auto it = std::find(m_slices.begin(), m_slices.end(), slice);
+  ASSERT(it != m_slices.end());
+  if (it != m_slices.end())
+    m_slices.erase(it);
+
+  slice->setOwner(nullptr);
+}
+
+Slice* Slices::getByName(const std::string& name) const
+{
+  for (Slice* slice : *this) {
+    if (slice->name() == name)
+      return slice;
+  }
+  return nullptr;
+}
+
+Slice* Slices::getById(ObjectId id) const
+{
+  for (Slice* slice : *this) {
+    if (slice->id() == id)
+      return slice;
+  }
+  return nullptr;
+}
+
+} // namespace doc
diff --git a/src/doc/slices.h b/src/doc/slices.h
new file mode 100644
index 000000000..58a4b7593
--- /dev/null
+++ b/src/doc/slices.h
@@ -0,0 +1,57 @@
+// Aseprite Document Library
+// Copyright (c) 2017 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef DOC_SLICES_H_INCLUDED
+#define DOC_SLICES_H_INCLUDED
+#pragma once
+
+#include "base/disable_copying.h"
+#include "doc/object_id.h"
+
+#include <string>
+#include <vector>
+
+namespace doc {
+
+  class Slice;
+  class Sprite;
+
+  class Slices {
+    typedef std::vector<Slice*> List;
+
+  public:
+    typedef List::iterator iterator;
+    typedef List::const_iterator const_iterator;
+
+    Slices(Sprite* sprite);
+    ~Slices();
+
+    Sprite* sprite() { return m_sprite; }
+
+    void add(Slice* slice);
+    void remove(Slice* slice);
+
+    Slice* getByName(const std::string& name) const;
+    Slice* getById(const ObjectId id) const;
+
+    iterator begin() { return m_slices.begin(); }
+    iterator end() { return m_slices.end(); }
+    const_iterator begin() const { return m_slices.begin(); }
+    const_iterator end() const { return m_slices.end(); }
+
+    std::size_t size() const { return m_slices.size(); }
+    bool empty() const { return m_slices.empty(); }
+
+  private:
+    Sprite* m_sprite;
+    List m_slices;
+
+    DISABLE_COPYING(Slices);
+  };
+
+} // namespace doc
+
+#endif
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index d0b20f9ac..ddb39b9d4 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -39,6 +39,7 @@ Sprite::Sprite(PixelFormat format, int width, int height, int ncolors)
   , m_pixelRatio(1, 1)
   , m_frames(1)
   , m_frameTags(this)
+  , m_slices(this)
 {
   ASSERT(width > 0 && height > 0);
 
diff --git a/src/doc/sprite.h b/src/doc/sprite.h
index 47ca1f0c3..14b86a796 100644
--- a/src/doc/sprite.h
+++ b/src/doc/sprite.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2016 David Capello
+// Copyright (c) 2001-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -19,6 +19,7 @@
 #include "doc/object.h"
 #include "doc/pixel_format.h"
 #include "doc/pixel_ratio.h"
+#include "doc/slices.h"
 #include "doc/sprite_position.h"
 #include "gfx/rect.h"
 
@@ -128,6 +129,9 @@ namespace doc {
     const FrameTags& frameTags() const { return m_frameTags; }
     FrameTags& frameTags() { return m_frameTags; }
 
+    const Slices& slices() const { return m_slices; }
+    Slices& slices() { return m_slices; }
+
     ////////////////////////////////////////
     // Shared Images and CelData (for linked Cels)
 
@@ -173,6 +177,7 @@ namespace doc {
     mutable RgbMap* m_rgbMap;
 
     FrameTags m_frameTags;
+    Slices m_slices;
 
     // Disable default constructor and copying
     Sprite();
diff --git a/src/doc/with_user_data.h b/src/doc/with_user_data.h
index e6acfcea9..97aa0d07f 100644
--- a/src/doc/with_user_data.h
+++ b/src/doc/with_user_data.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2017 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -19,6 +19,7 @@ namespace doc {
     }
 
     const UserData& userData() const { return m_userData; }
+    UserData& userData() { return m_userData; }
 
     void setUserData(const UserData& userData) {
       m_userData = userData;