diff --git a/Code/edit.asm b/Code/edit.asm
index 12a61f3..b12a4f8 100644
--- a/Code/edit.asm
+++ b/Code/edit.asm
@@ -1,5 +1,6 @@
 INCLUDE "hardware.inc"
 INCLUDE "utils.inc"
+INCLUDE "automata.inc"
 
 SPRITE_ANIM_DELAY EQU 6
 REPEAT_START_DELAY EQU 16
@@ -16,9 +17,9 @@ SpriteDelay: ds 1
 EXPORT InitEdit
 SECTION "Init edit", ROM0
 InitEdit:
-	ld a, 20
+	ld a, TILE_WIDTH
 	ldh [SelectX], a
-	ld a, 18
+	ld a, TILE_HEIGHT
 	ldh [SelectY], a
 	xor a
 	ldh [Down], a
@@ -210,7 +211,7 @@ ToggleCell:
 	ldh a, [Video + 1]
 	xor a, %100
 	ld h, a
-	MoveToCell 32
+	MoveToCell SCRN_VX_B
 	
 	; toggle bit 
 	ld a, [hl]
@@ -222,7 +223,7 @@ ToggleCell:
 	ld l, a
 	ldh a, [Old]
 	ld h, a
-	MoveToCell 20
+	MoveToCell TILE_WIDTH
 	
 	; toggle bit 
 	ld a, [hl]
@@ -271,7 +272,7 @@ Clear:
 	ld [Rendered + 1], a
 		
 	; clear old buffer
-	ld bc, 20 * 18
+	ld bc, TILE_WIDTH * TILE_HEIGHT
 	ld d, 0
 	call MemorySet