diff --git a/out/boot.dol b/out/boot.dol
index 8b1a5587..3c179430 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp
index e362902f..a8c51346 100644
--- a/source/menu/menu_main.cpp
+++ b/source/menu/menu_main.cpp
@@ -450,6 +450,8 @@ int CMenu::main(void)
 				{
 					/* new theme - exit wiiflow and reload */
 					fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
+					m_cfg.remove(SOURCEFLOW_DOMAIN, "numbers");
+					m_cfg.remove(SOURCEFLOW_DOMAIN, "tiers");
 					m_reload = true;
 					break;
 				}
@@ -501,6 +503,8 @@ int CMenu::main(void)
 				{
 					// new theme - exit wiiflow and reload
 					fsop_deleteFolder(fmt("%s/sourceflow", m_cacheDir.c_str()));
+					m_cfg.remove(SOURCEFLOW_DOMAIN, "numbers");
+					m_cfg.remove(SOURCEFLOW_DOMAIN, "tiers");
 					m_reload = true;
 					break;
 				}
diff --git a/source/menu/menu_source.cpp b/source/menu/menu_source.cpp
index 39ce3587..0f1095c2 100644
--- a/source/menu/menu_source.cpp
+++ b/source/menu/menu_source.cpp
@@ -110,7 +110,10 @@ void CMenu::_sourceFlow()
 			m_source.load(fmt("%s/%s", m_sourceDir.c_str(), fn.c_str()));
 			SF_cacheCovers = true;
 			fn.replace(fn.find("."), 4, "_flow");
-			curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
+			if(m_source.has("general", "flow"))
+				curflow = m_source.getInt("general", "flow", 1);
+			else
+				curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
 			/* get max source button # */
 			m_max_source_btn = 0;
 			const char *srcDomain = m_source.firstDomain().c_str();
@@ -180,7 +183,10 @@ bool CMenu::_srcTierBack(bool home)
 	m_source.unload();
 	m_source.load(fmt("%s/%s", m_sourceDir.c_str(), fn.c_str()));
 	fn.replace(fn.find("."), 4, "_flow");
-	curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
+	if(m_source.has("general", "flow"))
+		curflow = m_source.getInt("general", "flow", 1);
+	else
+		curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
 	/* get max source button # */
 	m_max_source_btn = 0;
 	const char *srcDomain = m_source.firstDomain().c_str();
@@ -584,7 +590,10 @@ void CMenu::_initSourceMenu()
 	m_source.load(fmt("%s/%s", m_sourceDir.c_str(), fn.c_str()));
 
 	fn.replace(fn.find("."), 4, "_flow");
-	curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
+	if(m_source.has("general", "flow"))
+		curflow = m_source.getInt("general", "flow", 1);
+	else
+		curflow = m_cfg.getInt(SOURCEFLOW_DOMAIN, fn, m_cfg.getInt(SOURCEFLOW_DOMAIN, "last_cf_mode", 1));
 	
 	/* get max source button # */
 	m_max_source_btn = 0;