diff --git a/data/DataCache.scr b/data/DataCache.scr
index 9c6d4179a..236a1195a 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -468,6 +468,5 @@ actors/STOMPER.SBK
 
 { SYSTEM_CACHE 4
 }
-ui/uigfx.spr
 frontend/frontend.spr
 ingamefx/ingamefx.spr
diff --git a/data/Scripts/test.scr b/data/Scripts/test.scr
index 41662a7c5..9810dca7e 100644
--- a/data/Scripts/test.scr
+++ b/data/Scripts/test.scr
@@ -1,7 +1,7 @@
 #include	data/scripts/defs/defs.scr
 #include	data/scripts/defs/charanim.scr
 
-#include	out/usa/include/uigfx.h
+#include	out/usa/include/ingamefx.h
 
 
 /*
diff --git a/makefile.gfx b/makefile.gfx
index 78a7c911e..7e583f717 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -160,10 +160,6 @@ ACTOR_IN :=				*
 # $(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/bmp)
 ACTOR_OUT :=			$(foreach ACTOR,$(ACTOR_LIST),$(ACTOR_OUT_DIR)/$(ACTOR).Sbk)
 
-UI_GFX_TEX_OUT :=			$(UI_GFX_OUT_DIR)/UIGfx.Spr
-UI_GFX_REP_FILE :=			$(REPORT_DIR)/UIGfx.rep
-UI_GFX_HDR_FILE :=			$(INC_DIR)/UIGfx.h
-
 cleanactors :
 		@$(RM) -f $(ACTOR_OUT)
 		@$(ECHO) Actors Cleaned
@@ -225,12 +221,31 @@ cleantranslate:
 
 GFX_DATA_OUT +=	$(TRANS_OUT_DAT)
 
+
 #----------------------------------------------------------------------------
-#--- UI ---------------------------------------------------------------------
+# Ingame graphics and UI
 #----------------------------------------------------------------------------
+INGAMEFX_GFX_DIR :=			$(GRAF_DIR)/ingamefx
+INGAMEFX_GFX_OUT_DIR :=		$(DATA_OUT)/ingamefx
+
+####
+
+INGAMEFX_GFX_NONTRANS :=			
+INGAMEFX_GFX_NONTRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_NONTRANS_DIR)/$(FILE))
+
+PICKUP_GFX_DIR :=			$(GRAF_DIR)/pickups
+PICKUP_GFX :=				+spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+							+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \
+							+teeth +blower +net
+PICKUP_GFX_IN :=			$(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
+
+INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3
+INGAMEFX_GFX_TRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
+
+####
+
 UI_GFX_DIR :=				$(GRAF_DIR)/ui
 UI_FONT_DIR :=				$(GRAF_DIR)/font
-UI_GFX_OUT_DIR :=			$(DATA_OUT)/ui
 
 UI_GFX_FONT :=				smallfont/+33	smallfont/+34	smallfont/+37	smallfont/+39	smallfont/+40	\
 							smallfont/+41	smallfont/+42	smallfont/+43	smallfont/+44	smallfont/+45	\
@@ -273,59 +288,37 @@ UI_GFX_TRANS :=				+bambootopleft.bmp +bamboobotleft.bmp +bambootopright.bmp +ba
 							+butC.bmp +butS.bmp +butX.bmp +butT.bmp
 UI_GFX_TRANS_IN :=			$(foreach FILE,$(UI_GFX_TRANS),$(UI_GFX_DIR)/$(FILE))
 
-UI_GFX_TEX_IN :=			${UI_GFX_FONT_IN} ${UI_GFX_NONTRANS_IN} ${UI_GFX_TRANS_IN}
-UI_GFX_TEX_OUT :=			$(UI_GFX_OUT_DIR)/UIGfx.Spr
-UI_GFX_REP_FILE :=			$(REPORT_DIR)/UIGfx.rep
-UI_GFX_HDR_FILE :=			$(INC_DIR)/UIGfx.h
+####
 
-cleanui :
-		@$(RM) -f $(UI_GFX_TEX_OUT)
-		@$(ECHO) UI Gfx Cleaned
-
-ui: 		$(UI_GFX_TEX_IN)
-
-$(UI_GFX_TEX_OUT) :	$(UI_GFX_TEX_IN)
-		@parkgrab -c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} -c- -z- ${UI_GFX_NONTRANS_IN} -b+ -t:15,1,1 -l:$(REPORT_DIR)/ui.lbm -o:$(UI_GFX_TEX_OUT) -k:$(UI_GFX_REP_FILE)
-		@$(MV) -f $(UI_GFX_OUT_DIR)/uigfx.h $(UI_GFX_HDR_FILE)
-
-GFX_DATA_OUT +=	$(UI_GFX_TEX_OUT)
-
-#----------------------------------------------------------------------------
-# Ingame graphic effects
-# Also contins pickup graphics at the moment..
-#----------------------------------------------------------------------------
-INGAMEFX_GFX_DIR :=			$(GRAF_DIR)/ingamefx
-INGAMEFX_GFX_OUT_DIR :=		$(DATA_OUT)/ingamefx
-
-INGAMEFX_GFX_NONTRANS :=			
-INGAMEFX_GFX_NONTRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_NONTRANS_DIR)/$(FILE))
-
-PICKUP_GFX_DIR :=			$(GRAF_DIR)/pickups
-PICKUP_GFX :=				+spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
-							+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \
-							+teeth +blower +net
-PICKUP_GFX_IN :=			$(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
-
-INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3
-INGAMEFX_GFX_TRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_TRANS),$(INGAMEFX_GFX_DIR)/$(FILE).bmp)
-
-INGAMEFX_GFX_TEX_IN :=		${INGAMEFX_GFX_NONTRANS_IN} ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN}
+INGAMEFX_GFX_TEX_IN :=		${INGAMEFX_GFX_NONTRANS_IN} ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
+							${UI_GFX_FONT_IN} ${UI_GFX_NONTRANS_IN} ${UI_GFX_TRANS_IN}
 INGAMEFX_GFX_TEX_OUT :=		$(INGAMEFX_GFX_OUT_DIR)/ingamefx.Spr
 INGAMEFX_GFX_REP_FILE :=	$(REPORT_DIR)/ingamefx.rep
 INGAMEFX_GFX_HDR_FILE :=	$(INC_DIR)/ingamefx.h
 
+####
+
 cleaningamefx :
 		@$(RM) -f $(INGAMEFX_GFX_TEX_OUT)
 		@$(ECHO) InGame GFx Cleaned
 
 ingamefx:		$(INGAMEFX_GFX_TEX_IN)
 
+####
+
 $(INGAMEFX_GFX_TEX_OUT) :	$(INGAMEFX_GFX_TEX_IN)
-		@parkgrab -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ -t:13,1,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
+		@parkgrab	-z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
+					-z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ \
+					-c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} \
+					-c- -z- ${UI_GFX_NONTRANS_IN} \
+					-t:14,2,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)
 		@$(MV) -f $(INGAMEFX_GFX_OUT_DIR)/ingamefx.h $(INGAMEFX_GFX_HDR_FILE)
 
-GRAF_DIRS_TO_MAKE	+=		$(INGAMEFX_GFX_OUT_DIR)
-GFX_DATA_OUT		+=		$(INGAMEFX_GFX_TEX_OUT)
+####
+
+GFX_DATA_OUT		+=	$(UI_GFX_TEX_OUT)
+GRAF_DIRS_TO_MAKE	+=	$(INGAMEFX_GFX_OUT_DIR)
+GFX_DATA_OUT		+=	$(INGAMEFX_GFX_TEX_OUT)
 
 
 #----------------------------------------------------------------------------
@@ -355,7 +348,7 @@ cleanfrontend :
 frontend:	$(FRONTEND_GFX_TEX_IN)
 
 $(FRONTEND_GFX_TEX_OUT) :	$(FRONTEND_GFX_TEX_IN)
-		@parkgrab -r- -z+ ${FRONTEND_GFX_TRANS_NO_ROT_IN} -r+ ${FRONTEND_GFX_TRANS_IN} -z- ${FRONTEND_GFX_NONTRANS_IN} -b+ -t:14,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
+		@parkgrab -r- -z+ ${FRONTEND_GFX_TRANS_NO_ROT_IN} -r+ ${FRONTEND_GFX_TRANS_IN} -z- ${FRONTEND_GFX_NONTRANS_IN} -b+ -t:13,1,1 -l:$(REPORT_DIR)/frontend.lbm -o:$(FRONTEND_GFX_TEX_OUT) -k:$(FRONTEND_GFX_REP_FILE)
 		@$(MV) -f $(FRONTEND_GFX_OUT_DIR)/frontend.h $(FRONTEND_GFX_HDR_FILE)
 
 GRAF_DIRS_TO_MAKE	+=		$(FRONTEND_GFX_OUT_DIR)
@@ -534,7 +527,6 @@ GFX_DATA_OUT		+=	$(DEMO_ALL_OUT)
 #----------------------------------------------------------------------------
 
 GRAF_DIRS_TO_MAKE +=	$(TRANS_OUT_DIR) \
-						$(UI_GFX_OUT_DIR) \
 						$(ACTORS_DIRS_TO_MAKE) \
 						$(LEVELS_DIRS_TO_MAKE)
 
diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp
index 9a97b5b3a..24fc29ad5 100644
--- a/source/enemy/npc.cpp
+++ b/source/enemy/npc.cpp
@@ -21,10 +21,6 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
-#endif
-
 #ifndef __GAME_GAME_H__
 #include	"game\game.h"
 #endif
diff --git a/source/frontend/options.cpp b/source/frontend/options.cpp
index 5dc82c046..3945794c3 100644
--- a/source/frontend/options.cpp
+++ b/source/frontend/options.cpp
@@ -77,8 +77,8 @@
 #include <frontend.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 
diff --git a/source/game/convo.cpp b/source/game/convo.cpp
index ab827f653..103472343 100644
--- a/source/game/convo.cpp
+++ b/source/game/convo.cpp
@@ -57,8 +57,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 #ifndef __STRING_ENUMS__
@@ -135,7 +135,7 @@ void CConversation::init()
 		s_guiIcon->init(s_guiFrame);
 		s_guiIcon->setObjectXYWH(0,0,FRAME_HEIGHT,FRAME_HEIGHT);
 		s_guiIcon->setOt(OT_POS);
-		s_guiIcon->setSpriteBank(UI_UIGFX_SPR);
+		s_guiIcon->setSpriteBank(INGAMEFX_INGAMEFX_SPR);
 		s_guiIcon->setFrame(0);
 
 		s_guiText=new("Conversation Text") CGUITextBox();
diff --git a/source/gfx/fdata.cpp b/source/gfx/fdata.cpp
index f658ee81a..d5e521ee6 100644
--- a/source/gfx/fdata.cpp
+++ b/source/gfx/fdata.cpp
@@ -22,7 +22,7 @@
 #include	"biglump.h"
 #endif
 
-#include	<UiGfx.h>
+#include	<ingamefx.h>
 
 
 /*	Std Lib
@@ -84,7 +84,7 @@ s16	standardFontTab[]=
 	/* ð ñ ò ó ô õ ö ÷ */	      -1,      -1,FRM__242,FRM__243,FRM__244,FRM__245,FRM__246,      -1,
 	/* ø ù ú û ü ý þ ÿ */	      -1,FRM__249,FRM__250,FRM__251,FRM__252,FRM__253,      -1,FRM__255,
 };
-FontData	standardFont( UI_UIGFX_SPR,	standardFontTab,	13,	1,1, 4 );
+FontData	standardFont( INGAMEFX_INGAMEFX_SPR,	standardFontTab,	13,	1,1, 4 );
 
 /*----------------------------------------------------------------------
 	Function:
diff --git a/source/gui/greadout.cpp b/source/gui/greadout.cpp
index 636ea79bd..55c937b44 100644
--- a/source/gui/greadout.cpp
+++ b/source/gui/greadout.cpp
@@ -204,7 +204,7 @@ void CGUISpriteReadout::init(CGUIObject *_parent,GUIId _id)
 	m_lastValue=-1;
 	m_frame=0;
 	m_x=m_y=0;
-	setSpriteBank(UI_UIGFX_SPR);
+	setSpriteBank(INGAMEFX_INGAMEFX_SPR);
 }
 
 
diff --git a/source/gui/gui.cpp b/source/gui/gui.cpp
index 007fe683b..2530d0f9e 100644
--- a/source/gui/gui.cpp
+++ b/source/gui/gui.cpp
@@ -37,8 +37,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGMAEFX_H__
+#include <ingamefx.h>
 #endif
 
 
@@ -422,7 +422,7 @@ void initGUIStuff()
 	ASSERT(!s_uiSpriteBank);
 
 	s_uiSpriteBank=new ("UI Sprites") SpriteBank();
-	s_uiSpriteBank->load(UI_UIGFX_SPR);
+	s_uiSpriteBank->load(INGAMEFX_INGAMEFX_SPR);
 }
 
 
diff --git a/source/paul/paul.cpp b/source/paul/paul.cpp
index e0d4194e9..67fff755a 100644
--- a/source/paul/paul.cpp
+++ b/source/paul/paul.cpp
@@ -89,8 +89,8 @@
 /*	Data
 	---- */
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 
diff --git a/source/projectl/projectl.cpp b/source/projectl/projectl.cpp
index f719215c0..d2b7ceca7 100644
--- a/source/projectl/projectl.cpp
+++ b/source/projectl/projectl.cpp
@@ -27,8 +27,8 @@
 #include <biglump.h>
 #endif
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
+#ifndef __SPR_INGAMEFX_H__
+#include <ingamefx.h>
 #endif
 
 #ifndef __VID_HEADER_
@@ -51,7 +51,7 @@ void CProjectile::init()
 	CEnemyProjectileThing::init();
 
 	m_spriteBank=new ("projectile sprites") SpriteBank();
-	m_spriteBank->load(UI_UIGFX_SPR);
+	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
 
 	m_heading = 0;
 	m_lifetime = GameState::getOneSecondInFrames() * 2;
diff --git a/source/script/function.cpp b/source/script/function.cpp
index b5ad4b8de..b4550cd57 100644
--- a/source/script/function.cpp
+++ b/source/script/function.cpp
@@ -199,7 +199,7 @@ static signed short func_drawSprite(unsigned short *_args)
 	if(!sb)
 	{
 		sb=new ("sb") SpriteBank;
-		sb->load(UI_UIGFX_SPR);
+		sb->load(INGAMEFX_INGAMEFX_SPR);
 	}
 	fh=sb->getFrameHeader(_args[0]);
 	sb->printFT4(_args[0],_args[1]-(fh->W/2),_args[2]-(fh->H/2),0,0,_args[3]);
diff --git a/source/system/vid.cpp b/source/system/vid.cpp
index 7165679a8..8715c5172 100644
--- a/source/system/vid.cpp
+++ b/source/system/vid.cpp
@@ -7,10 +7,6 @@
 #include "gfx\prim.h"
 #include "fileio\fileio.h"
 
-#ifndef __SPR_UIGFX_H__
-#include <uigfx.h>
-#endif
-
 /*****************************************************************************/
 #define MaxVBFuncs 	4