diff --git a/games/lemm/hr_graphics/Makefile b/games/lemm/hr_graphics/Makefile
index 634ac19c..e007054f 100644
--- a/games/lemm/hr_graphics/Makefile
+++ b/games/lemm/hr_graphics/Makefile
@@ -9,7 +9,9 @@ all:	graphics_hr_level1.inc \
 	graphics_hr_level2.inc \
 	graphics_hr_level3.inc \
 	graphics_hr_level4.inc \
-	graphics_hr_level5.inc
+	graphics_hr_level5.inc \
+	graphics_hr_level6.inc \
+	graphics_hr_level7.inc
 
 
 ####
@@ -44,6 +46,19 @@ graphics_hr_level5.inc:	\
 	echo "hr_level5_lzsa: .incbin \"hr_level5.lzsa\"" > graphics_hr_level5.inc
 	echo "hr_level5_preview_lzsa: .incbin \"hr_level5_preview.lzsa\"" >> graphics_hr_level5.inc
 
+graphics_hr_level6.inc:	\
+	hr_level6.lzsa \
+	hr_level6_preview.lzsa
+	echo "hr_level6_lzsa: .incbin \"hr_level6.lzsa\"" > graphics_hr_level6.inc
+	echo "hr_level6_preview_lzsa: .incbin \"hr_level6_preview.lzsa\"" >> graphics_hr_level6.inc
+
+graphics_hr_level7.inc:	\
+	hr_level7.lzsa \
+	hr_level7_preview.lzsa
+	echo "hr_level7_lzsa: .incbin \"hr_level7.lzsa\"" > graphics_hr_level7.inc
+	echo "hr_level7_preview_lzsa: .incbin \"hr_level7_preview.lzsa\"" >> graphics_hr_level7.inc
+
+
 
 
 
@@ -130,6 +145,39 @@ hr_level5_preview.lzsa:	hr_level5_preview.hgr
 hr_level5_preview.hgr:	l5_preview.png
 	$(PNG2HGR) l5_preview.png > hr_level5_preview.hgr
 
+###
+
+hr_level6.lzsa:	hr_level6.hgr
+	$(LZSA) -r -f2 hr_level6.hgr hr_level6.lzsa
+
+hr_level6.hgr:	l6_rr.png
+	$(PNG2HGR) l6_rr.png > hr_level6.hgr
+
+###
+
+hr_level6_preview.lzsa:	hr_level6_preview.hgr
+	$(LZSA) -r -f2 hr_level6_preview.hgr hr_level6_preview.lzsa
+
+hr_level6_preview.hgr:	l6_preview.png
+	$(PNG2HGR) l6_preview.png > hr_level6_preview.hgr
+
+###
+
+hr_level7.lzsa:	hr_level7.hgr
+	$(LZSA) -r -f2 hr_level7.hgr hr_level7.lzsa
+
+hr_level7.hgr:	l7_floppy.png
+	$(PNG2HGR) l7_floppy.png > hr_level7.hgr
+
+###
+
+hr_level7_preview.lzsa:	hr_level7_preview.hgr
+	$(LZSA) -r -f2 hr_level7_preview.hgr hr_level7_preview.lzsa
+
+hr_level7_preview.hgr:	l7_preview.png
+	$(PNG2HGR) l7_preview.png > hr_level7_preview.hgr
+
+
 
 
 ###
diff --git a/games/lemm/hr_graphics/l6_preview.png b/games/lemm/hr_graphics/l6_preview.png
new file mode 100644
index 00000000..12432cbc
Binary files /dev/null and b/games/lemm/hr_graphics/l6_preview.png differ
diff --git a/games/lemm/hr_graphics/l6_rr.png b/games/lemm/hr_graphics/l6_rr.png
new file mode 100644
index 00000000..a1dcc08b
Binary files /dev/null and b/games/lemm/hr_graphics/l6_rr.png differ
diff --git a/games/lemm/hr_graphics/l7_floppy.png b/games/lemm/hr_graphics/l7_floppy.png
new file mode 100644
index 00000000..e32f2b60
Binary files /dev/null and b/games/lemm/hr_graphics/l7_floppy.png differ
diff --git a/games/lemm/hr_graphics/l7_preview.png b/games/lemm/hr_graphics/l7_preview.png
new file mode 100644
index 00000000..82e8e93f
Binary files /dev/null and b/games/lemm/hr_graphics/l7_preview.png differ
diff --git a/games/lemm/keyboard.s b/games/lemm/keyboard.s
index 9afb599a..d825b5fd 100644
--- a/games/lemm/keyboard.s
+++ b/games/lemm/keyboard.s
@@ -459,11 +459,22 @@ make_basher:
 	lda	BASHER_COUNT		; only if we have some left
 	beq	done_make_basher
 
-	; only do it if walking
+
+	; only do it if walking, digging, mining, building, bashing
 	lda	lemming_status,Y
 	cmp	#LEMMING_WALKING
+	beq	yes_make_basher
+	cmp	#LEMMING_DIGGING
+	beq	yes_make_basher
+	cmp	#LEMMING_MINING
+	beq	yes_make_basher
+	cmp	#LEMMING_BUILDING
+	beq	yes_make_basher
+	cmp	#LEMMING_BASHING
 	bne	done_make_basher
 
+yes_make_basher:
+
 	; see if level #9
 	lda	WHICH_LEVEL
 	cmp	#9
@@ -492,11 +503,21 @@ make_miner:
 	lda	MINER_COUNT		; only if we have some left
 	beq	done_make_miner
 
-	; only do it if walking
+	; only do it if walking, digging, mining, building, bashing
 	lda	lemming_status,Y
 	cmp	#LEMMING_WALKING
+	beq	yes_make_miner
+	cmp	#LEMMING_DIGGING
+	beq	yes_make_miner
+	cmp	#LEMMING_MINING
+	beq	yes_make_miner
+	cmp	#LEMMING_BUILDING
+	beq	yes_make_miner
+	cmp	#LEMMING_BASHING
 	bne	done_make_miner
 
+yes_make_miner:
+
 	lda	#LEMMING_MINING
 	sta	lemming_status,Y
 
@@ -515,11 +536,20 @@ make_digger:
 	lda	DIGGER_COUNT		; only if we have some left
 	beq	done_make_digger
 
-	; only do it if walking
+	; only do it if walking, digging, mining, building, bashing
 	lda	lemming_status,Y
 	cmp	#LEMMING_WALKING
+	beq	yes_make_digger
+	cmp	#LEMMING_DIGGING
+	beq	yes_make_digger
+	cmp	#LEMMING_MINING
+	beq	yes_make_digger
+	cmp	#LEMMING_BUILDING
+	beq	yes_make_digger
+	cmp	#LEMMING_BASHING
 	bne	done_make_digger
 
+yes_make_digger:
 	lda	#LEMMING_DIGGING
 	sta	lemming_status,Y