diff --git a/wocchat/wocchat.lua b/wocchat/wocchat.lua
index d0fb572..9c9e2da 100644
--- a/wocchat/wocchat.lua
+++ b/wocchat/wocchat.lua
@@ -62,13 +62,13 @@ local function saveScreen()
 end
 
 local function restoreScreen()
-	term.setCursor(1,screen.height)
-	gpu.setBackground(table.unpack(screen.bg))
-	gpu.setForeground(table.unpack(screen.fg))
 	print("Restoring screen ...")
 	for i = 0,15 do
 		gpu.setPaletteColor(i,screen.palette[i])
 	end
+	term.setCursor(1,screen.height)
+	gpu.setBackground(table.unpack(screen.bg))
+	gpu.setForeground(table.unpack(screen.fg))
 end
 
 local function loadConfig()
@@ -439,13 +439,7 @@ local function drawTextbar(x,y,width,text)
 end
 
 local customGPU={}
-if newterm then
-	-- New term does not handle palette colors properly yet, hack around this.
-	customGPU.gpu = {
-		setForeground = function(color) gpu.setForeground(color, true) end,
-		setBackground = function(color) gpu.setBackground(color, true) end,
-	}
-else
+if not newterm then
 	customGPU.gpu = {
 		set = function(x,y,s,v) return gpu.set(x+customGPU.x-1,y+customGPU.y-1,s,v ~= nil and v) end,
 		get = function(x,y) return gpu.get(x+customGPU.x-1,y+customGPU.y-1) end,
@@ -1476,7 +1470,7 @@ local function main()
 			helper.joinServer(k)
 		end
 	end
-	local history = {}
+	local history = {nowrap=true}
 	while true do
 		if dirty.blocks or dirty.title or dirty.window or dirty.nicks then
 			redraw()
@@ -1553,8 +1547,7 @@ if newterm then
 	end
 	
 	local window = term.internal.open()
-	-- TODO: window will eventually be moved to the end in later updates.
-	term.bind(window, customGPU.gpu, term.screen(), term.keyboard())
+	term.bind(customGPU.gpu, term.screen(), term.keyboard(), window)
 	process.info().data.window = window
 	customGPU.window = window
 else