diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 07dcbad40ee..e1e08ebfa9b 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -1,6 +1,9 @@
 ///DREAMS
+
+
 /mob/living/carbon/proc/dream()
 	var/list/dreams = dream_strings.Copy()
+	dreams = custom_dreams(dreams, src)
 
 	for(var/obj/item/weapon/bedsheet/sheet in loc)
 		dreams += sheet.dream_messages
@@ -12,6 +15,14 @@
 		addtimer(src, "experience_dream", ((i - 1) * rand(30,60)), FALSE, dream_images[i], FALSE)
 	return TRUE
 
+
+/mob/living/carbon/proc/custom_dreams(list/dreamlist, mob/user)
+	var/list/newlist = dreamlist.Copy()
+	for(var/i in 1 to newlist.len)
+		newlist[i] = replacetext(newlist[i], "\[DREAMER\]", "[user.name]")
+	return dreamlist
+
+
 //NIGHTMARES
 /mob/living/carbon/proc/nightmare()
 	var/list/nightmares = nightmare_strings.Copy()
@@ -29,14 +40,12 @@
 /mob/living/carbon/proc/handle_dreams()
 	if(client && !dreaming && prob(5))
 		dream()
-	else if(client && !nightmare && prob(40))
+	else if(client && !nightmare && prob(2))
 		nightmare()
 		if(ishuman(src))
-			Stuttering(1)
-			Jitter(20)
-			Dizzy(20)
-			if(prob(4))
-				AdjustHallucinate(rand(20, 60))
+			if(prob(10))
+				emote("writhes in their sleep.")
+				dir = pick(cardinal)
 
 /mob/living/carbon/proc/experience_dream(dream_image, isNightmare)
 	dreaming--
@@ -44,6 +53,6 @@
 	if(stat != UNCONSCIOUS || InCritical())
 		return
 	if(isNightmare)
-		dream_image = "<spanclass='cultitalic'>[dream_image]</span>"
+		dream_image = "<span class='cultitalic'>[dream_image]</span>"
 	to_chat(src, "<span class='notice'><i>... [dream_image] ...</i></span>")
 
diff --git a/config/names/dreams.txt b/config/names/dreams.txt
index 9effcbbf275..9dffde8e189 100644
--- a/config/names/dreams.txt
+++ b/config/names/dreams.txt
@@ -106,4 +106,5 @@ a drask
 the ai core
 the mining station
 the research station 
-a beaker of strange liquid
\ No newline at end of file
+a beaker of strange liquid
+Captain [DREAMER]
\ No newline at end of file
diff --git a/config/names/nightmares.txt b/config/names/nightmares.txt
index 9d5e6fd4a2f..71df2e90cff 100644
--- a/config/names/nightmares.txt
+++ b/config/names/nightmares.txt
@@ -24,4 +24,5 @@ HoNk
 aaaAAAaaaaAAAAAAaa
 pApErWork
 we SEE yoU
-the ceiling
\ No newline at end of file
+the ceiling
+we have been waiting for you [DREAMER]
\ No newline at end of file