diff --git a/ARES/hardware/controller/ctrl.lsl b/ARES/hardware/controller/ctrl.lsl
index 10696a0..40e47c0 100644
--- a/ARES/hardware/controller/ctrl.lsl
+++ b/ARES/hardware/controller/ctrl.lsl
@@ -83,6 +83,9 @@
 // #define POWER_OFF_BY_DEFAULT
 // default to power off state after compilation (for debugging)
 
+// #define TELEPORT_EFFECT_2
+// a more epilepsy-friendly teleport effect; ignores unit's color preferences
+
 // #define FORCE_INSERT
 // attempts to insert the battery when door closing fails
 // #define HOOK_POWER
@@ -651,61 +654,97 @@ default {
 				#else
 				llLinkPlaySound(4, HW_TP_SOUND, 1, SOUND_PLAY);
 			
-				llLinkParticleSystem(TP_SOURCE, [
-					PSYS_SRC_PATTERN,PSYS_SRC_PATTERN_EXPLODE,
-					PSYS_SRC_BURST_RADIUS,0.3,
-					PSYS_PART_START_COLOR,c1,
-					PSYS_PART_END_COLOR,<0.000000,0.000000,0.000000>,
-					PSYS_PART_START_ALPHA,1,
-					PSYS_PART_END_ALPHA,1,
-					PSYS_PART_START_GLOW,1,
-					PSYS_PART_END_GLOW,0,
-					PSYS_PART_BLEND_FUNC_SOURCE,PSYS_PART_BF_SOURCE_ALPHA,
-					PSYS_PART_BLEND_FUNC_DEST,PSYS_PART_BF_ONE,
-					PSYS_PART_START_SCALE,<0.0625,4.000000,0.000000>,
-					PSYS_PART_END_SCALE,<0.0625,2.000000,0.000000>,
-					PSYS_SRC_TEXTURE,"",
-					PSYS_SRC_MAX_AGE,0.5,
-					PSYS_PART_MAX_AGE,0.3,
-					PSYS_SRC_BURST_RATE,0,
-					PSYS_SRC_BURST_PART_COUNT,80,
-					PSYS_SRC_BURST_SPEED_MIN,0.1,
-					PSYS_SRC_BURST_SPEED_MAX,0.2,
-					PSYS_PART_FLAGS, 0x123
-						/*PSYS_PART_EMISSIVE_MASK |
-						PSYS_PART_FOLLOW_VELOCITY_MASK |
-						PSYS_PART_INTERP_COLOR_MASK |
-						PSYS_PART_INTERP_SCALE_MASK*/
-				]);
+				#ifdef TELEPORT_EFFECT_2
+					llLinkParticleSystem(TP_SOURCE, [
+						PSYS_SRC_PATTERN,PSYS_SRC_PATTERN_EXPLODE,
+						PSYS_SRC_BURST_RADIUS,0,
+						PSYS_SRC_ANGLE_BEGIN,0,
+						PSYS_SRC_ANGLE_END,0,
+						PSYS_SRC_TARGET_KEY,llGetKey(),
+						PSYS_PART_START_COLOR,<0.188235,0.788235,0.803922>,
+						PSYS_PART_END_COLOR,<0.200000,0.050980,0.411765>,
+						PSYS_PART_START_ALPHA,1,
+						PSYS_PART_END_ALPHA,0,
+						PSYS_PART_START_GLOW,0.1,
+						PSYS_PART_END_GLOW,0,
+						PSYS_PART_BLEND_FUNC_SOURCE,PSYS_PART_BF_SOURCE_ALPHA,
+						PSYS_PART_BLEND_FUNC_DEST,PSYS_PART_BF_ONE,
+						PSYS_PART_START_SCALE,<0.031250,1.000000,0.000000>,
+						PSYS_PART_END_SCALE,<4.000000,4.000000,0.000000>,
+						PSYS_SRC_TEXTURE,"e3cd351e-c29b-e8ba-58e4-f1781a266a12",
+						PSYS_SRC_MAX_AGE,0.5,
+						PSYS_PART_MAX_AGE,0.55,
+						PSYS_SRC_BURST_RATE,0,
+						PSYS_SRC_BURST_PART_COUNT,4,
+						PSYS_SRC_ACCEL,<0.000000,0.000000,0.000000>,
+						PSYS_SRC_OMEGA,<90.000000,90.000000,90.000000>,
+						PSYS_SRC_BURST_SPEED_MIN,0,
+						PSYS_SRC_BURST_SPEED_MAX,0.1,
+						PSYS_PART_FLAGS,
+							0x123
+							/* PSYS_PART_EMISSIVE_MASK |
+							PSYS_PART_FOLLOW_VELOCITY_MASK |
+							PSYS_PART_INTERP_COLOR_MASK |
+							PSYS_PART_INTERP_SCALE_MASK */
+					]);
+				#else
+					llLinkParticleSystem(TP_SOURCE, [
+						PSYS_SRC_PATTERN,PSYS_SRC_PATTERN_EXPLODE,
+						PSYS_SRC_BURST_RADIUS,0.3,
+						PSYS_PART_START_COLOR,c1,
+						PSYS_PART_END_COLOR,<0.000000,0.000000,0.000000>,
+						PSYS_PART_START_ALPHA,1,
+						PSYS_PART_END_ALPHA,1,
+						PSYS_PART_START_GLOW,1,
+						PSYS_PART_END_GLOW,0,
+						PSYS_PART_BLEND_FUNC_SOURCE,PSYS_PART_BF_SOURCE_ALPHA,
+						PSYS_PART_BLEND_FUNC_DEST,PSYS_PART_BF_ONE,
+						PSYS_PART_START_SCALE,<0.0625,4.000000,0.000000>,
+						PSYS_PART_END_SCALE,<0.0625,2.000000,0.000000>,
+						PSYS_SRC_TEXTURE,"",
+						PSYS_SRC_MAX_AGE,0.5,
+						PSYS_PART_MAX_AGE,0.3,
+						PSYS_SRC_BURST_RATE,0,
+						PSYS_SRC_BURST_PART_COUNT,80,
+						PSYS_SRC_BURST_SPEED_MIN,0.1,
+						PSYS_SRC_BURST_SPEED_MAX,0.2,
+						PSYS_PART_FLAGS, 0x123
+							/*PSYS_PART_EMISSIVE_MASK |
+							PSYS_PART_FOLLOW_VELOCITY_MASK |
+							PSYS_PART_INTERP_COLOR_MASK |
+							PSYS_PART_INTERP_SCALE_MASK*/
+					]);
 
-				llLinkParticleSystem(TP_SOURCE_2, [
-					PSYS_SRC_PATTERN,PSYS_SRC_PATTERN_EXPLODE,
-					PSYS_SRC_BURST_RADIUS,0.7,
-					PSYS_SRC_TARGET_KEY,llGetKey(),
-					PSYS_PART_START_COLOR,c1,
-					PSYS_PART_END_COLOR,<0.000000,0.000000,0.000000>,
-					PSYS_PART_START_ALPHA,1,
-					PSYS_PART_END_ALPHA,1,
-					PSYS_PART_START_GLOW,1,
-					PSYS_PART_END_GLOW,0,
-					PSYS_PART_BLEND_FUNC_SOURCE,PSYS_PART_BF_SOURCE_ALPHA,
-					PSYS_PART_BLEND_FUNC_DEST,PSYS_PART_BF_ONE,
-					PSYS_PART_START_SCALE,<2.000000,2.000000,0.000000>,
-					PSYS_PART_END_SCALE,<3.000000,3.000000,0.000000>,
-					PSYS_SRC_TEXTURE,"",
-					PSYS_SRC_MAX_AGE,0.3,
-					PSYS_PART_MAX_AGE,0.3,
-					PSYS_SRC_BURST_RATE,0,
-					PSYS_SRC_BURST_PART_COUNT,20,
-					PSYS_SRC_BURST_SPEED_MIN,24,
-					PSYS_SRC_BURST_SPEED_MAX,24,
-					PSYS_PART_FLAGS, 0x163
-						/* PSYS_PART_EMISSIVE_MASK |
-						PSYS_PART_FOLLOW_VELOCITY_MASK |
-						PSYS_PART_INTERP_COLOR_MASK |
-						PSYS_PART_INTERP_SCALE_MASK |
-						PSYS_PART_TARGET_POS_MASK */
-				]);
+					llLinkParticleSystem(TP_SOURCE_2, [
+						PSYS_SRC_PATTERN,PSYS_SRC_PATTERN_EXPLODE,
+						PSYS_SRC_BURST_RADIUS,0.7,
+						PSYS_SRC_TARGET_KEY,llGetKey(),
+						PSYS_PART_START_COLOR,c1,
+						PSYS_PART_END_COLOR,<0.000000,0.000000,0.000000>,
+						PSYS_PART_START_ALPHA,1,
+						PSYS_PART_END_ALPHA,1,
+						PSYS_PART_START_GLOW,1,
+						PSYS_PART_END_GLOW,0,
+						PSYS_PART_BLEND_FUNC_SOURCE,PSYS_PART_BF_SOURCE_ALPHA,
+						PSYS_PART_BLEND_FUNC_DEST,PSYS_PART_BF_ONE,
+						PSYS_PART_START_SCALE,<2.000000,2.000000,0.000000>,
+						PSYS_PART_END_SCALE,<3.000000,3.000000,0.000000>,
+						PSYS_SRC_TEXTURE,"",
+						PSYS_SRC_MAX_AGE,0.3,
+						PSYS_PART_MAX_AGE,0.3,
+						PSYS_SRC_BURST_RATE,0,
+						PSYS_SRC_BURST_PART_COUNT,20,
+						PSYS_SRC_BURST_SPEED_MIN,24,
+						PSYS_SRC_BURST_SPEED_MAX,24,
+						PSYS_PART_FLAGS, 0x163
+							/* PSYS_PART_EMISSIVE_MASK |
+							PSYS_PART_FOLLOW_VELOCITY_MASK |
+							PSYS_PART_INTERP_COLOR_MASK |
+							PSYS_PART_INTERP_SCALE_MASK |
+							PSYS_PART_TARGET_POS_MASK */
+					]);
+				
+				#endif
 				
 				timer_tp = 1;
 				if(next_timer < llGetTime() + 1) {