--- a/gui.lua	Thu Jul 26 20:46:00 2012 +0000
+++ b/gui.lua	Fri Jul 27 10:23:12 2012 +0000
@@ -117,6 +117,7 @@
 		        :gsub("([^\n])\n([^\n])", "%1 %2")
 		        :gsub("|r\n\n", "|r\n")
 	end
+	gui.markup = markup  -- too useful to keep local
 end
 
 -- Working around this bug:
@@ -355,7 +356,7 @@
 				return
 			end
 
-			local display_bcast_from = OuroLootSV_opts.display_bcast_from
+			local display_bcast_from = self.db.profile.display_bcast_from
 			-- XXX FIXME a major weakness here is that we're constantly replacing
 			-- what's already been created.  Lots of garbage.  Trying to detect what
 			-- actually needs to be replaced is even worse.  We'll live with
@@ -1414,7 +1415,7 @@
 		st_widget.head_offset = 15
 		st_widget.tail_offset = 0
 
-		if OuroLootSV_opts.scroll_to_bottom then
+		if gui.opts.scroll_to_bottom then
 			local scrollbar = _G[st.scrollframe:GetName().."ScrollBar"]
 			if scrollbar then
 				local _,max = scrollbar:GetMinMaxValues()
@@ -1924,7 +1925,7 @@
 	if not status then
 		addon:horrible_horrible_error(err)
 	end
-	if OuroLootSV_opts.gui_noob then
+	if gui.opts.gui_noob then
 		local tip = noob_tips[group]
 		if type(tip) == 'function' then
 			tip = tip()
@@ -2001,6 +2002,7 @@
 		self:gui_init (g_loot, g_uniques)
 		self:zero_printed_fenceposts()
 	end
+	gui.opts = self.db.profile
 
 	local display = AceGUI:Create("Frame")
 	_d = display
@@ -2393,7 +2395,7 @@
 		-- been real loot happening while the user was clicking and typing.
 		local boss_index = addon._addBossEntry{
 			kind		= 'boss',
-			bossname	= (OuroLootSV_opts.snarky_boss and addon.boss_abbrev[data.name] or data.name) or data.name,
+			bossname	= (gui.opts.snarky_boss and addon.boss_abbrev[data.name] or data.name) or data.name,
 			reason		= 'kill',
 			instance	= data.instance,
 			duration	= 0,