diff --git a/Template.cpp b/Template.cpp
index 094d77a1..3a606876 100644
--- a/Template.cpp
+++ b/Template.cpp
@@ -10,6 +10,9 @@
 
 #include "Template.h"
 #include "FileUtils.h"
+#include <sstream>
+
+using std::stringstream;
 
 void CTemplateOptions::Parse(const CString& sLine) {
 	CString sName = sLine.Token(0, false, "=").Trim_n().AsUpper();
@@ -23,18 +26,24 @@ void CTemplateOptions::Parse(const CString& sLine) {
 }
 
 CTemplate* CTemplateLoopContext::GetRow(unsigned int uIndex) {
-	if (uIndex < m_pvRows->size()) {
-		return (*m_pvRows)[uIndex];
+	unsigned int uSize = m_pvRows->size();
+
+	if (uIndex < uSize) {
+		if (m_bReverse) {
+			return (*m_pvRows)[uSize - uIndex -1];
+		} else {
+			return (*m_pvRows)[uIndex];
+		}
 	}
 
 	return NULL;
 }
 
-CString CTemplateLoopContext::GetValue(const CString& sName) {
+CString CTemplateLoopContext::GetValue(const CString& sName, bool bFromIf) {
 	CTemplate* pTemplate = GetCurRow();
 
 	if (!pTemplate) {
-		DEBUG("Loop [" << GetName() << "] has no row index [" << GetCurRow() << "]");
+		DEBUG("Loop [" + GetName() + "] has no row index [" + CString(GetCurRow()) + "]");
 		return "";
 	}
 
@@ -56,7 +65,7 @@ CString CTemplateLoopContext::GetValue(const CString& sName) {
 		return ((GetRowIndex() == 0 || GetRowIndex() == m_pvRows->size() -1) ? "" : "1");
 	}
 
-	return pTemplate->GetValue(sName);
+	return pTemplate->GetValue(sName, bFromIf);
 }
 
 CTemplate::~CTemplate() {
@@ -72,23 +81,105 @@ CTemplate::~CTemplate() {
 	}
 }
 
+void CTemplate::Init() {
+	/* We have no CConfig in znc land
+	CString sPath(CConfig::GetValue("WebFilesPath"));
+
+	if (!sPath.empty()) {
+		SetPath(sPath);
+	}
+	*/
+
+	ClearPath();
+	m_pParent = NULL;
+}
+
+CString CTemplate::ExpandFile(const CString& sFilename) {
+	if (sFilename.Left(1) == "/" || sFilename.Left(2) == "./") {
+		return sFilename;
+	}
+
+	CString sFile(ResolveLiteral(sFilename));
+
+	for (LCString::iterator it = m_lsPaths.begin(); it != m_lsPaths.end(); it++) {
+		CString sRoot = *it;
+		CString sFilePath(CDir::ChangeDir(sRoot, sFile));
+
+		if (CFile::Exists(sFilePath)) {
+			if (sRoot.empty() || sFilePath.Left(sRoot.length()) == sRoot) {
+				//DEBUG("\t\tFound  [" + sFilePath + "]\n");
+				return sFilePath;
+			} else {
+				DEBUG("\t\tOutside of root [" + sFilePath + "] !~ [" + sRoot + "]");
+			}
+		} else {
+			DEBUG("\t\tNo such file [" + sFilePath + "]");
+		}
+	}
+
+	switch (m_lsPaths.size()) {
+		case 0:
+			DEBUG("Unable to find [" + sFile + "] using the current directory");
+			break;
+		case 1:
+			DEBUG("Unable to find [" + sFile + "] in the defined path [" + *m_lsPaths.begin());
+			break;
+		default:
+			DEBUG("Unable to find [" + sFile + "] in any of the " + CString(m_lsPaths.size()) + " defined paths");
+	}
+
+	return "";
+}
+
+void CTemplate::SetPath(const CString& sPaths) {
+	VCString vsDirs;
+	sPaths.Split(":", vsDirs, false);
+
+	for (size_t a = 0; a < vsDirs.size(); a++) {
+		AppendPath(vsDirs[a]);
+	}
+}
+
+void CTemplate::PrependPath(const CString& sPath) {
+	DEBUG("CTemplate::PrependPath(" + sPath + ") == [" + CDir::ChangeDir("./", sPath + "/") + "]");
+	m_lsPaths.push_front(CDir::ChangeDir("./", sPath + "/"));
+}
+
+void CTemplate::AppendPath(const CString& sPath) {
+	DEBUG("CTemplate::AppendPath(" + sPath + ") == [" + CDir::ChangeDir("./", sPath + "/") + "]");
+	m_lsPaths.push_back(CDir::ChangeDir("./", sPath + "/"));
+}
+
+void CTemplate::RemovePath(const CString& sPath) {
+	DEBUG("CTemplate::RemovePath(" + sPath + ") == [" + CDir::ChangeDir("./", sPath + "/") + "]");
+	m_lsPaths.remove(CDir::ChangeDir("./", sPath + "/"));
+}
+
+void CTemplate::ClearPath() {
+	m_lsPaths.clear();
+}
+
 bool CTemplate::SetFile(const CString& sFileName) {
+	m_sFileName = ExpandFile(sFileName);
+	PrependPath(sFileName + "/..");
+
 	if (sFileName.empty()) {
 		DEBUG("CTemplate::SetFile() - Filename is empty");
 		return false;
 	}
 
-	if (!CFile::Exists(sFileName)) {
-		DEBUG("CTemplate::SetFile() - [" << sFileName << "] does not exist");
+	if (m_sFileName.empty()) {
+		DEBUG("CTemplate::SetFile() - [" + sFileName + "] does not exist");
 		return false;
 	}
 
-	m_sFileName = sFileName;
+	DEBUG("Set template file to [" + m_sFileName + "]");
+
 	return true;
 }
 
 CTemplate& CTemplate::AddRow(const CString& sName) {
-	CTemplate* pTmpl = new CTemplate(m_spOptions);
+	CTemplate* pTmpl = new CTemplate(m_spOptions, this);
 	m_mvLoops[sName].push_back(pTmpl);
 
 	return *pTmpl;
@@ -126,6 +217,16 @@ vector<CTemplate*>* CTemplate::GetLoop(const CString& sName) {
 	return NULL;
 }
 
+bool CTemplate::PrintString(CString& sRet) {
+	sRet.clear();
+	stringstream sStream;
+	bool bRet = Print(sStream);
+
+	sRet = sStream.str();
+
+	return bRet;
+}
+
 bool CTemplate::Print(ostream& oOut) {
 	return Print(m_sFileName, oOut);
 }
@@ -139,196 +240,333 @@ bool CTemplate::Print(const CString& sFileName, ostream& oOut) {
 	CFile File(sFileName);
 
 	if (!File.Open()) {
-		DEBUG("Unable to open file [" << sFileName << "] in CTemplate::Print()");
+		DEBUG("Unable to open file [" + sFileName + "] in CTemplate::Print()");
 		return false;
 	}
 
 	CString sLine;
-	CString sOutput;
+	CString	sSetBlockVar;
 	bool bValidLastIf = false;
+	bool bInSetBlock = false;
 	unsigned long uFilePos = 0;
 	unsigned long uCurPos = 0;
 	unsigned int uLineNum = 0;
 	unsigned int uNestedIfs = 0;
 	unsigned int uSkip = 0;
+	bool bLoopCont = false;
+	bool bLoopBreak = false;
+	bool bExit = false;
 
 	while (File.ReadLine(sLine)) {
-		bool bFoundOneTag = false;
+		CString sOutput;
+		bool bFoundATag = false;
+		bool bTmplLoopHasData = false;
 		uLineNum++;
 		CString::size_type iPos = 0;
 		uCurPos = uFilePos;
 		unsigned int uLineSize = sLine.size();
+		bool bBroke = false;
 
-		do {
+		while (1) {
 			iPos = sLine.find("<?");
 
-			if (iPos != CString::npos) {
-				uCurPos += iPos;
-				bFoundOneTag = true;
+			if (iPos == CString::npos) {
+				break;
+			}
 
-				if (!uSkip) {
-					sOutput += sLine.substr(0, iPos);
+			uCurPos += iPos;
+			bFoundATag = true;
+
+			if (!uSkip) {
+				sOutput += sLine.substr(0, iPos);
+			}
+
+			sLine = sLine.substr(iPos +2);
+
+			CString::size_type iPos2 = sLine.find("?>");
+
+			// Make sure our tmpl tag is ended properly
+			if (iPos2 == CString::npos) {
+				DEBUG("Template tag not ended properly in file [" + sFileName + "] [<?" + sLine + "]");
+				return false;
+			}
+
+			uCurPos += iPos2 +4;
+
+			CString sMid = CString(sLine.substr(0, iPos2)).Trim_n();
+
+			// Make sure we don't have a nested tag
+			if (sMid.find("<?") == CString::npos) {
+				sLine = sLine.substr(iPos2 +2);
+				CString sAction = sMid.Token(0);
+				CString sArgs = sMid.Token(1, true);
+				bool bNotFound = false;
+
+				// If we're breaking or continuing from within a loop, skip all tags that aren't ENDLOOP
+				if ((bLoopCont || bLoopBreak) && !sAction.Equals("ENDLOOP")) {
+					continue;
 				}
 
-				sLine = sLine.substr(iPos +2);
+				if (!uSkip) {
+					if (sAction.Equals("INC")) {
+						if (!Print(ExpandFile(sArgs), oOut)) {
+							return false;
+						}
+					} else if (sAction.Equals("SETOPTION")) {
+						m_spOptions->Parse(sArgs);
+					} else if (sAction.Equals("ADDROW")) {
+						CString sLoopName = sArgs.Token(0);
+						MCString msRow;
 
-				CString::size_type iPos2 = sLine.find("?>");
+						if (sArgs.Token(1, true, " ").OptionSplit(msRow)) {
+							CTemplate& NewRow = AddRow(sLoopName);
 
-				// Make sure our tmpl tag is ended properly
-				if (iPos2 != CString::npos) {
-					CString sMid = CString(sLine.substr(0, iPos2)).Trim_n();
+							for (MCString::iterator it = msRow.begin(); it != msRow.end(); it++) {
+								NewRow[it->first] = it->second;
+							}
+						}
+					} else if (sAction.Equals("SET")) {
+						CString sName = sArgs.Token(0);
+						CString sValue = sArgs.Token(1, true);
 
-					// Make sure we don't have a nested tag
-					if (sMid.find("<?") == CString::npos) {
-						sLine = sLine.substr(iPos2 +2);
-						CString sAction = sMid.Token(0);
-						CString sArgs = sMid.Token(1, true);
+						(*this)[sName] = sValue;
+					} else if (sAction.Equals("JOIN")) {
+						VCString vsArgs;
+						//sArgs.Split(" ", vsArgs, false, "\"", "\"");
+						sArgs.QuoteSplit(vsArgs);
 
-						if (!uSkip) {
-							if (sAction.Equals("INC")) {
-								if (!Print(File.GetDir() + sArgs, oOut)) {
-									return false;
-								}
-							} else if (sAction.Equals("SETOPTION")) {
-								m_spOptions->Parse(sArgs);
-							} else if (sAction.Equals("ADDROW")) {
-								CString sLoopName = sArgs.Token(0);
-								MCString msRow;
+						if (vsArgs.size() > 1) {
+							CString sDelim = vsArgs[0];
+							bool bFoundOne = false;
+							CString::EEscape eEscape = CString::EASCII;
 
-								if (sArgs.Token(1).URLSplit(msRow)) {
-									CTemplate& NewRow = AddRow(sLoopName);
+							for (unsigned int a = 1; a < vsArgs.size(); a++) {
+								const CString& sArg = vsArgs[a];
 
-									for (MCString::iterator it = msRow.begin(); it != msRow.end(); it++) {
-										NewRow[it->first] = it->second;
-									}
-								}
-							} else if (sAction.Equals("SET")) {
-								CString sName = sArgs.Token(0);
-								CString sValue = sArgs.Token(1, true);
-
-								(*this)[sName] = sValue;
-							} else if (sAction.Equals("JOIN")) {
-								VCString vsArgs;
-								sArgs.Split(" ", vsArgs, false, "\"", "\"");
-
-								if (vsArgs.size() > 1) {
-									CString sDelim = vsArgs[0];
-									bool bFoundOne = false;
-									CString::EEscape eEscape = CString::EASCII;
-
-									for (unsigned int a = 1; a < vsArgs.size(); a++) {
-										const CString& sArg = vsArgs[a];
-
-										if (sArg.Equals("ESC=", false, 4)) {
-											eEscape = CString::ToEscape(sArg.LeftChomp_n(4));
-										} else {
-											CString sValue = GetValue(sArg);
-
-											if (!sValue.empty()) {
-												if (bFoundOne) {
-													sOutput += sDelim;
-												}
-
-												sOutput += sValue.Escape_n(eEscape);
-												bFoundOne = true;
-											}
-										}
-									}
-								}
-							} else if (sAction.Equals("VAR")) {
-								sOutput += GetValue(sArgs);
-							} else if (sAction.Equals("LOOP")) {
-								CTemplateLoopContext* pContext = GetCurLoopContext();
-
-								if (!pContext || pContext->GetFilePosition() != uCurPos) {
-									// we are at a brand new loop (be it new or a first pass at an inner loop)
-
-									CString sLoopName = sArgs.Token(0);
-									vector<CTemplate*>* pvLoop = GetLoop(sLoopName);
-
-									if (pvLoop) {
-										// If we found data for this loop, add it to our context vector
-										m_vLoopContexts.push_back(new CTemplateLoopContext(uCurPos, sLoopName, pvLoop));
-									} else {  // If we don't have data, just skip this loop and everything inside
-										uSkip++;
-									}
-								}
-							} else if (sAction.Equals("IF")) {
-								if (ValidIf(sArgs)) {
-									uNestedIfs++;
-									bValidLastIf = true;
+								if (sArg.Equals("ESC=", false, 4)) {
+									eEscape = CString::ToEscape(sArg.LeftChomp_n(4));
 								} else {
-									uSkip++;
-									bValidLastIf = false;
-								}
-							}
-						} else if (sAction.Equals("IF")) {
-							uSkip++;
-						} else if (sAction.Equals("LOOP")) {
-							uSkip++;
-						}
+									CString sValue = GetValue(sArg);
 
-						if (sAction.Equals("ENDIF")) {
-							if (uSkip) {
-								uSkip--;
-							} else {
-								uNestedIfs--;
-							}
-						} else if (sAction.Equals("ENDLOOP")) {
-							if (uSkip) {
-								uSkip--;
-							} else {
-								// We are at the end of the loop so we need to inc the index
-								CTemplateLoopContext* pContext = GetCurLoopContext();
+									if (!sValue.empty()) {
+										if (bFoundOne) {
+											sOutput += sDelim;
+										}
 
-								if (pContext) {
-									pContext->IncRowIndex();
-
-									// If we didn't go out of bounds we need to seek back to the top of our loop
-									if (pContext->GetCurRow()) {
-										uCurPos = pContext->GetFilePosition();
-										uFilePos = uCurPos;
-										uLineSize = 0;
-
-										File.Seek(uCurPos);
-									} else {
-										DelCurLoopContext();
+										sOutput += sValue.Escape_n(eEscape);
+										bFoundOne = true;
 									}
 								}
 							}
-						} else if (sAction.Equals("ELSE")) {
-							if (!bValidLastIf && uSkip == 1) {
-								CString sArg = sArgs.Token(0);
+						}
+					} else if (sAction.Equals("SETBLOCK")) {
+						sSetBlockVar = sArgs;
+						bInSetBlock = true;
+					} else if (sAction.Equals("EXPAND")) {
+						sOutput += ExpandFile(sArgs);
+					} else if (sAction.Equals("VAR")) {
+						sOutput += GetValue(sArgs);
+					} else if (sAction.Equals("LT")) {
+						sOutput += "<?";
+					} else if (sAction.Equals("GT")) {
+						sOutput += "?>";
+					} else if (sAction.Equals("CONTINUE")) {
+						CTemplateLoopContext* pContext = GetCurLoopContext();
 
-								if (sArg.empty() || (sArg.Equals("IF") && ValidIf(sArgs.Token(1, true)))) {
-									uSkip = 0;
-									bValidLastIf = true;
+						if (pContext) {
+							uSkip++;
+							bLoopCont = true;
+
+							break;
+						} else {
+							DEBUG("[" + sFileName + ":" + CString(uCurPos - iPos2 -4) + "] <? CONTINUE ?> must be used inside of a loop!");
+						}
+					} else if (sAction.Equals("BREAK")) {
+						// break from loop
+						CTemplateLoopContext* pContext = GetCurLoopContext();
+
+						if (pContext) {
+							uSkip++;
+							bLoopBreak = true;
+
+							break;
+						} else {
+							DEBUG("[" + sFileName + ":" + CString(uCurPos - iPos2 -4) + "] <? BREAK ?> must be used inside of a loop!");
+						}
+					} else if (sAction.Equals("EXIT")) {
+						bExit = true;
+					} else if (sAction.Equals("DEBUG")) {
+						DEBUG("CTemplate DEBUG [" + sFileName + "@" + CString(uCurPos - iPos2 -4) + "b] -> [" + sArgs + "]");
+					} else if (sAction.Equals("LOOP")) {
+						CTemplateLoopContext* pContext = GetCurLoopContext();
+
+						if (!pContext || pContext->GetFilePosition() != uCurPos) {
+							// we are at a brand new loop (be it new or a first pass at an inner loop)
+
+							CString sLoopName = sArgs.Token(0);
+							bool bReverse = (sArgs.Token(1).Equals("REVERSE"));
+							vector<CTemplate*>* pvLoop = GetLoop(sLoopName);
+
+							if (pvLoop) {
+								// If we found data for this loop, add it to our context vector
+								//unsigned long uBeforeLoopTag = uCurPos - iPos2 - 4;
+								unsigned long uAfterLoopTag = uCurPos;
+
+								for (CString::size_type t = 0; t < sLine.size(); t++) {
+									char c = sLine[t];
+									if (c == '\r' || c == '\n') {
+										uAfterLoopTag++;
+									} else {
+										break;
+									}
 								}
-							} else if (!uSkip) {
-								uSkip = 1;
+
+								m_vLoopContexts.push_back(new CTemplateLoopContext(uAfterLoopTag, sLoopName, bReverse, pvLoop));
+							} else {  // If we don't have data, just skip this loop and everything inside
+								uSkip++;
+							}
+						}
+					} else if (sAction.Equals("IF")) {
+						if (ValidIf(sArgs)) {
+							uNestedIfs++;
+							bValidLastIf = true;
+						} else {
+							uSkip++;
+							bValidLastIf = false;
+						}
+					} else if (sAction.Equals("REM")) {
+						uSkip++;
+					} else {
+						bNotFound = true;
+					}
+				} else if (sAction.Equals("REM")) {
+					uSkip++;
+				} else if (sAction.Equals("IF")) {
+					uSkip++;
+				} else if (sAction.Equals("LOOP")) {
+					uSkip++;
+				}
+
+				if (sAction.Equals("ENDIF")) {
+					if (uSkip) {
+						uSkip--;
+					} else {
+						uNestedIfs--;
+					}
+				} else if (sAction.Equals("ENDREM")) {
+					if (uSkip) {
+						uSkip--;
+					}
+				} else if (sAction.Equals("ENDSETBLOCK")) {
+					bInSetBlock = false;
+					sSetBlockVar = "";
+				} else if (sAction.Equals("ENDLOOP")) {
+					if (bLoopCont && uSkip == 1) {
+						uSkip--;
+						bLoopCont = false;
+					}
+
+					if (bLoopBreak && uSkip == 1) {
+						uSkip--;
+					}
+
+					if (uSkip) {
+						uSkip--;
+					} else {
+						// We are at the end of the loop so we need to inc the index
+						CTemplateLoopContext* pContext = GetCurLoopContext();
+
+						if (pContext) {
+							pContext->IncRowIndex();
+
+							// If we didn't go out of bounds we need to seek back to the top of our loop
+							if (!bLoopBreak && pContext->GetCurRow()) {
+								uCurPos = pContext->GetFilePosition();
+								uFilePos = uCurPos;
+								uLineSize = 0;
+
+								File.Seek(uCurPos);
+								bBroke = true;
+
+								if (!sOutput.Trim_n().empty()) {
+									pContext->SetHasData();
+								}
+
+								break;
+							} else {
+								if (sOutput.Trim_n().empty()) {
+									sOutput.clear();
+								}
+
+								bTmplLoopHasData = pContext->HasData();
+								DelCurLoopContext();
+								bLoopBreak = false;
+							}
+						}
+					}
+				} else if (sAction.Equals("ELSE")) {
+					if (!bValidLastIf && uSkip == 1) {
+						CString sArg = sArgs.Token(0);
+
+						if (sArg.empty() || (sArg.Equals("IF") && ValidIf(sArgs.Token(1, true)))) {
+							uSkip = 0;
+							bValidLastIf = true;
+						}
+					} else if (!uSkip) {
+						uSkip = 1;
+					}
+				} else if (bNotFound) {
+					// Unknown tag that isn't being skipped...
+					vector<CSmartPtr<CTemplateTagHandler> >& vspTagHandlers = GetTagHandlers();
+
+					if (!vspTagHandlers.empty()) { // @todo this should go up to the top to grab handlers
+						CTemplate* pTmpl = GetCurTemplate();
+						CString sCustomOutput;
+
+						for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
+							CSmartPtr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
+
+							if (spTagHandler->HandleTag(*pTmpl, sAction, sArgs, sCustomOutput)) {
+								sOutput += sCustomOutput;
+								bNotFound = false;
+								break;
 							}
 						}
 
-						continue;
+						if (bNotFound) {
+							DEBUG("Unknown/Unhandled tag [" + sAction + "]");
+						}
 					}
 				}
 
-				DEBUG("Malformed tag on line " << uLineNum << " of [" << File.GetLongName() << "]");
-				DEBUG("--------------- [" << sLine << "]");
+				continue;
 			}
-		} while (iPos != CString::npos);
 
-		uFilePos += uLineSize;
-
-		if (!uSkip) {
-			sOutput += sLine;
+			DEBUG("Malformed tag on line " + CString(uLineNum) + " of [" << File.GetLongName() + "]");
+			DEBUG("--------------- [" + sLine + "]");
 		}
 
-		if (!bFoundOneTag || sOutput.find_first_not_of(" \t\r\n") != CString::npos) {
-			oOut << sOutput;
+		if (!bBroke) {
+			uFilePos += uLineSize;
+
+			if (!uSkip) {
+				sOutput += sLine;
+			}
 		}
 
-		sOutput.clear();
+		if (!bFoundATag || bTmplLoopHasData || sOutput.find_first_not_of(" \t\r\n") != CString::npos) {
+			if (bInSetBlock) {
+				CString sName = sSetBlockVar.Token(0);
+				//CString sValue = sSetBlockVar.Token(1, true);
+				(*this)[sName] += sOutput;
+			} else {
+				oOut << sOutput;
+			}
+		}
+
+		if (bExit) {
+			break;
+		}
 	}
 
 	oOut.flush();
@@ -355,7 +593,11 @@ CTemplateLoopContext* CTemplate::GetCurLoopContext() {
 
 bool CTemplate::ValidIf(const CString& sArgs) {
 	CString sArgStr = sArgs;
-	sArgStr.Replace(" ", "", "\"", "\"", true);
+	//sArgStr.Replace(" ", "", "\"", "\"", true);
+	sArgStr.Replace(" &&", "&&", "\"", "\"", false);
+	sArgStr.Replace("&& ", "&&", "\"", "\"", false);
+	sArgStr.Replace(" ||", "||", "\"", "\"", false);
+	sArgStr.Replace("|| ", "||", "\"", "\"", false);
 
 	CString::size_type uOrPos = sArgStr.find("||");
 	CString::size_type uAndPos = sArgStr.find("&&");
@@ -387,33 +629,51 @@ bool CTemplate::ValidIf(const CString& sArgs) {
 	return false;
 }
 
-bool CTemplate::ValidExpr(const CString& sExpr) {
+bool CTemplate::ValidExpr(const CString& sExpression) {
 	bool bNegate = false;
+	CString sExpr(sExpression);
 	CString sName;
 	CString sValue;
 
-	if (sExpr.find("!=") != CString::npos) {
-		sName = sExpr.Token(0, false, "!=").Trim_n();
-		sValue = sExpr.Token(1, true, "!=").Trim_n();
+	if (sExpr.Left(1) == "!") {
 		bNegate = true;
-	} else if (sExpr.find("==") != CString::npos) {
-		sName = sExpr.Token(0, false, "==").Trim_n();
-		sValue = sExpr.Token(1, true, "==").Trim_n();
-		bNegate = false;
-	} else {
-		sName = sExpr.Trim_n();
+		sExpr.LeftChomp();
 	}
 
-	if (sName.Left(1) == "!") {
-		bNegate = true;
-		sName.LeftChomp();
+	if (sExpr.find("!=") != CString::npos) {
+		sName = sExpr.Token(0, false, "!=").Trim_n();
+		sValue = sExpr.Token(1, true, "!=", false, "\"", "\"", true).Trim_n();
+		bNegate = !bNegate;
+	} else if (sExpr.find("==") != CString::npos) {
+		sName = sExpr.Token(0, false, "==").Trim_n();
+		sValue = sExpr.Token(1, true, "==", false, "\"", "\"", true).Trim_n();
+	} else if (sExpr.find(">=") != CString::npos) {
+		sName = sExpr.Token(0, false, ">=").Trim_n();
+		sValue = sExpr.Token(1, true, ">=", false, "\"", "\"", true).Trim_n();
+		return (GetValue(sName, true).ToLong() >= sValue.ToLong());
+	} else if (sExpr.find("<=") != CString::npos) {
+		sName = sExpr.Token(0, false, "<=").Trim_n();
+		sValue = sExpr.Token(1, true, "<=", false, "\"", "\"", true).Trim_n();
+		return (GetValue(sName, true).ToLong() <= sValue.ToLong());
+	} else if (sExpr.find(">") != CString::npos) {
+		sName = sExpr.Token(0, false, ">").Trim_n();
+		sValue = sExpr.Token(1, true, ">", false, "\"", "\"", true).Trim_n();
+		return (GetValue(sName, true).ToLong() > sValue.ToLong());
+	} else if (sExpr.find("<") != CString::npos) {
+		sName = sExpr.Token(0, false, "<").Trim_n();
+		sValue = sExpr.Token(1, true, "<", false, "\"", "\"", true).Trim_n();
+		return (GetValue(sName, true).ToLong() < sValue.ToLong());
+	} else {
+		sName = sExpr.Trim_n();
 	}
 
 	if (sValue.empty()) {
 		return (bNegate != IsTrue(sName));
 	}
 
-	return (bNegate != GetValue(sName).Equals(sValue));
+	sValue = ResolveLiteral(sValue);
+
+	return (bNegate != GetValue(sName, true).Equals(sValue));
 }
 
 bool CTemplate::IsTrue(const CString& sName) {
@@ -421,13 +681,21 @@ bool CTemplate::IsTrue(const CString& sName) {
 		return true;
 	}
 
-	return GetValue(sName).ToBool();
+	return GetValue(sName, true).ToBool();
 }
 
 bool CTemplate::HasLoop(const CString& sName) {
 	return (GetLoop(sName) != NULL);
 }
 
+CTemplate* CTemplate::GetParent(bool bRoot) {
+	if (!bRoot) {
+		return m_pParent;
+	}
+
+	return (m_pParent) ? m_pParent->GetParent(bRoot) : this;
+}
+
 CTemplate* CTemplate::GetCurTemplate() {
 	CTemplateLoopContext* pContext = GetCurLoopContext();
 
@@ -438,25 +706,31 @@ CTemplate* CTemplate::GetCurTemplate() {
 	return pContext->GetCurRow();
 }
 
-CString CTemplate::GetValue(const CString& sArgs) {
+CString CTemplate::ResolveLiteral(const CString& sString) {
+	if (sString.Left(2) == "**") {
+		// Allow string to start with a literal * by using two in a row
+		return sString.substr(1);
+	} else if (sString.Left(1) == "*") {
+		// If it starts with only one * then treat it as a var and do a lookup
+		return GetValue(sString.substr(1));
+	}
+
+	return sString;
+}
+
+CString CTemplate::GetValue(const CString& sArgs, bool bFromIf) {
 	CTemplateLoopContext* pContext = GetCurLoopContext();
 	CString sName = sArgs.Token(0);
 	CString sRest = sArgs.Token(1, true);
 	CString sRet;
 
-	if (pContext) {
-		sRet = pContext->GetValue(sName);
-	} else {
-		MCString::iterator it = find(sName);
-		sRet = (it != end()) ? it->second : "";
-	}
-
-	while (sRest.Replace(" =", "=", "\"", "\"")) ;
-	while (sRest.Replace("= ", "=", "\"", "\"")) ;
+	while (sRest.Replace(" =", "=", "\"", "\"")) {}
+	while (sRest.Replace("= ", "=", "\"", "\"")) {}
 
 	VCString vArgs;
 	MCString msArgs;
-	sRest.Split(" ", vArgs, false, "\"", "\"");
+	//sRest.Split(" ", vArgs, false, "\"", "\"");
+	sRest.QuoteSplit(vArgs);
 
 	for (unsigned int a = 0; a < vArgs.size(); a++) {
 		const CString& sArg = vArgs[a];
@@ -464,16 +738,75 @@ CString CTemplate::GetValue(const CString& sArgs) {
 		msArgs[sArg.Token(0, false, "=").AsUpper()] = sArg.Token(1, true, "=");
 	}
 
-	if (sRet.empty()) {
-		sRet = msArgs["DEFAULT"];
+	/* We have no CConfig in znc land
+	if (msArgs.find("CONFIG") != msArgs.end()) {
+		sRet = CConfig::GetValue(sName);
+	} else*/ if (msArgs.find("ROWS") != msArgs.end()) {
+		vector<CTemplate*>* pLoop = GetLoop(sName);
+		sRet = CString((pLoop) ? pLoop->size() : 0);
+	} else if (msArgs.find("TOP") == msArgs.end() && pContext) {
+		sRet = pContext->GetValue(sArgs, bFromIf);
+
+		if (!sRet.empty()) {
+			return sRet;
+		}
+	} else {
+		if (sName.Left(1) == "*") {
+			sName.LeftChomp(1);
+			MCString::iterator it = find(sName);
+			sName = (it != end()) ? it->second : "";
+		}
+
+		MCString::iterator it = find(sName);
+		sRet = (it != end()) ? it->second : "";
 	}
 
-	MCString::iterator it = msArgs.find("ESC");
+	vector<CSmartPtr<CTemplateTagHandler> >& vspTagHandlers = GetTagHandlers();
 
-	if (it != msArgs.end()) {
-		sRet.Escape(CString::ToEscape(it->second));
-	} else {
-		sRet.Escape(m_spOptions->GetEscapeFrom(), m_spOptions->GetEscapeTo());
+	if (!vspTagHandlers.empty()) { // @todo this should go up to the top to grab handlers
+		CTemplate* pTmpl = GetCurTemplate();
+		CString sCustomOutput;
+
+		if (sRet.empty()) {
+			for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
+				CSmartPtr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
+
+				if (!bFromIf && spTagHandler->HandleVar(*pTmpl, sArgs.Token(0), sArgs.Token(1, true), sCustomOutput)) {
+					sRet = sCustomOutput;
+					break;
+				} else if (bFromIf && spTagHandler->HandleIf(*pTmpl, sArgs.Token(0), sArgs.Token(1, true), sCustomOutput)) {
+					sRet = sCustomOutput;
+					break;
+				}
+			}
+		}
+
+		for (unsigned int j = 0; j < vspTagHandlers.size(); j++) {
+			CSmartPtr<CTemplateTagHandler> spTagHandler = vspTagHandlers[j];
+
+			if (spTagHandler->HandleValue(*pTmpl, sRet, msArgs)) {
+				break;
+			}
+		}
+	}
+
+	if (!bFromIf) {
+		if (sRet.empty()) {
+			sRet = ResolveLiteral(msArgs["DEFAULT"]);
+		}
+
+		MCString::iterator it = msArgs.find("ESC");
+
+		if (it != msArgs.end()) {
+			VCString vsEscs;
+			it->second.Split(",", vsEscs, false);
+
+			for (unsigned int a = 0; a < vsEscs.size(); a++) {
+				sRet.Escape(CString::ToEscape(vsEscs[a]));
+			}
+		} else {
+			sRet.Escape(m_spOptions->GetEscapeFrom(), m_spOptions->GetEscapeTo());
+		}
 	}
 
 	return sRet;
diff --git a/Template.h b/Template.h
index f5cb1607..a0b68dcb 100644
--- a/Template.h
+++ b/Template.h
@@ -15,9 +15,35 @@
 #include <iostream>
 
 using std::ostream;
+using std::cout;
+using std::endl;
 
 class CTemplate;
 
+class CTemplateTagHandler {
+public:
+	CTemplateTagHandler() {}
+	virtual ~CTemplateTagHandler() {}
+
+	virtual bool HandleVar(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) {
+		return false;
+	}
+
+	virtual bool HandleTag(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) {
+		return false;
+	}
+
+	virtual bool HandleIf(CTemplate& Tmpl, const CString& sName, const CString& sArgs, CString& sOutput) {
+		return HandleVar(Tmpl, sName, sArgs, sOutput);
+	}
+
+	virtual bool HandleValue(CTemplate& Tmpl, CString& sValue, const MCString& msOptions) {
+		return false;
+	}
+private:
+};
+class CTemplate;
+
 class CTemplateOptions {
 public:
 	CTemplateOptions() {
@@ -25,7 +51,7 @@ public:
 		m_eEscapeTo = CString::EASCII;
 	}
 
-	~CTemplateOptions() {}
+	virtual ~CTemplateOptions() {}
 
 	void Parse(const CString& sLine);
 
@@ -41,16 +67,19 @@ private:
 
 class CTemplateLoopContext {
 public:
-	CTemplateLoopContext(unsigned long uFilePos, const CString& sLoopName, vector<CTemplate*>* pRows) {
+	CTemplateLoopContext(unsigned long uFilePos, const CString& sLoopName, bool bReverse, vector<CTemplate*>* pRows) {
 		m_uFilePosition = uFilePos;
 		m_sName = sLoopName;
 		m_uRowIndex = 0;
+		m_bReverse = bReverse;
 		m_pvRows = pRows;
+		m_bHasData = false;
 	}
 
-	~CTemplateLoopContext() {}
+	virtual ~CTemplateLoopContext() {}
 
 	// Setters
+	void SetHasData(bool b = true) { m_bHasData = b; }
 	void SetName(const CString& s) { m_sName = s; }
 	void SetRowIndex(unsigned int u) { m_uRowIndex = u; }
 	unsigned int IncRowIndex() { return ++m_uRowIndex; }
@@ -59,6 +88,7 @@ public:
 	// !Setters
 
 	// Getters
+	bool HasData() const { return m_bHasData; }
 	const CString& GetName() const { return m_sName; }
 	unsigned long GetFilePosition() const { return m_uFilePosition; }
 	unsigned int GetRowIndex() const { return m_uRowIndex; }
@@ -68,32 +98,70 @@ public:
 	CTemplate* GetCurRow() { return GetRow(m_uRowIndex); }
 
 	CTemplate* GetRow(unsigned int uIndex);
-	CString GetValue(const CString& sName);
+	CString GetValue(const CString& sName, bool bFromIf = false);
 	// !Getters
 private:
-protected:
-	CString				m_sName;			//! The name portion of the <?LOOP name?> tag
-	unsigned int		m_uRowIndex;		//! The index of the current row we're on
-	unsigned long		m_uFilePosition;	//! The file position of the opening <?LOOP?> tag
-	vector<CTemplate*>*	m_pvRows;			//! This holds pointers to the templates associated with this loop
+	bool				m_bReverse;			//!< Iterate through this loop in reverse order
+	bool				m_bHasData;			//!< Tells whether this loop has real data or not
+	CString				m_sName;			//!< The name portion of the <?LOOP name?> tag
+	unsigned int		m_uRowIndex;		//!< The index of the current row we're on
+	unsigned long		m_uFilePosition;	//!< The file position of the opening <?LOOP?> tag
+	vector<CTemplate*>*	m_pvRows;			//!< This holds pointers to the templates associated with this loop
 };
 
 
 class CTemplate : public MCString {
 public:
-	CTemplate() : MCString(), m_spOptions(new CTemplateOptions) {}
-	CTemplate(const CString& sFileName) : MCString(), m_sFileName(sFileName), m_spOptions(new CTemplateOptions) {}
-	CTemplate(const CSmartPtr<CTemplateOptions>& Options) : MCString(), m_spOptions(Options) {}
-	~CTemplate();
+	CTemplate() : MCString(), m_spOptions(new CTemplateOptions) {
+		Init();
+	}
 
+	CTemplate(const CString& sFileName) : MCString(), m_sFileName(sFileName), m_spOptions(new CTemplateOptions) {
+		Init();
+	}
+
+	CTemplate(const CSmartPtr<CTemplateOptions>& Options, CTemplate* pParent = NULL) : MCString(), m_spOptions(Options) {
+		Init();
+		m_pParent = pParent;
+	}
+
+	virtual ~CTemplate();
+
+	//! Class for implementing custom tags in subclasses
+	void AddTagHandler(CSmartPtr<CTemplateTagHandler> spTagHandler) {
+		m_vspTagHandlers.push_back(spTagHandler);
+	}
+
+	vector<CSmartPtr<CTemplateTagHandler> >& GetTagHandlers() {
+		if (m_pParent) {
+			return m_pParent->GetTagHandlers();
+		}
+
+		return m_vspTagHandlers;
+	}
+ 
+	CString ResolveLiteral(const CString& sString);
+
+	void Init();
+
+	CTemplate* GetParent(bool bRoot);
+	CString ExpandFile(const CString& sFilename);
 	bool SetFile(const CString& sFileName);
+
+	void SetPath(const CString& sPath);	// Sets the dir:dir:dir type path to look at for templates, as of right now no ../../.. protection
+	void PrependPath(const CString& sPath);
+	void AppendPath(const CString& sPath);
+	void RemovePath(const CString& sPath);
+	void ClearPath();
+	CString ResolvePath(const CString& sPath, const CString& sFilename);
+	bool PrintString(CString& sRet);
 	bool Print(ostream& oOut = cout);
 	bool Print(const CString& sFileName, ostream& oOut = cout);
 	bool ValidIf(const CString& sArgs);
 	bool ValidExpr(const CString& sExpr);
 	bool IsTrue(const CString& sName);
 	bool HasLoop(const CString& sName);
-	CString GetValue(const CString& sName);
+	CString GetValue(const CString& sName, bool bFromIf = false);
 	CTemplate& AddRow(const CString& sName);
 	CTemplate* GetRow(const CString& sName, unsigned int uIndex);
 	vector<CTemplate*>* GetLoop(const CString& sName);
@@ -105,11 +173,13 @@ public:
 	const CString& GetFileName() const { return m_sFileName; }
 	// !Getters
 private:
-protected:
+	CTemplate*							m_pParent;
 	CString								m_sFileName;
+	LCString							m_lsPaths;
 	map<CString, vector<CTemplate*> >	m_mvLoops;
 	vector<CTemplateLoopContext*>		m_vLoopContexts;
 	CSmartPtr<CTemplateOptions>			m_spOptions;
+	vector<CSmartPtr<CTemplateTagHandler> >		m_vspTagHandlers;
 };
 
 #endif // !_TEMPLATE_H
diff --git a/ZNCString.cpp b/ZNCString.cpp
index 0d1ea967..e0a84be1 100644
--- a/ZNCString.cpp
+++ b/ZNCString.cpp
@@ -187,10 +187,11 @@ int CString::StrCmp(const CString& s, unsigned long uLen) const {
 }
 
 bool CString::Equals(const CString& s, bool bCaseSensitive, unsigned long uLen) const {
-	if (bCaseSensitive)
+	if (bCaseSensitive) {
 		return (StrCmp(s, uLen) == 0);
-	else
+	} else {
 		return (CaseCmp(s, uLen) == 0);
+	}
 }
 
 bool CString::WildCmp(const CString& sWild, const CString& sString) {
@@ -495,7 +496,8 @@ unsigned int CString::Replace(CString& sStr, const CString& sReplace, const CStr
 	return uRet;
 }
 
-CString CString::Token(unsigned int uPos, bool bRest, const CString& sSep) const {
+CString CString::Token(unsigned int uPos, bool bRest, const CString& sSep, bool bAllowEmpty,
+                       const CString& sLeft, const CString& sRight, bool bTrimQuotes) const {
 	const char *sep_str = sSep.c_str();
 	size_t sep_len = sSep.length();
 	const char *str = c_str();
@@ -503,10 +505,22 @@ CString CString::Token(unsigned int uPos, bool bRest, const CString& sSep) const
 	size_t start_pos = 0;
 	size_t end_pos;
 
+	if (!bAllowEmpty) {
+		while (strncmp(&str[start_pos], sep_str, sep_len) == 0) {
+			start_pos += sep_len;
+		}
+	}
+
 	// First, find the start of our token
 	while (uPos != 0 && start_pos < str_len) {
-		if (strncmp(&str[start_pos], sep_str, sep_len) == 0) {
+		bool bFoundSep = false;
+
+		while (strncmp(&str[start_pos], sep_str, sep_len) == 0 && (!bFoundSep || !bAllowEmpty)) {
 			start_pos += sep_len;
+			bFoundSep = true;
+		}
+
+		if (bFoundSep) {
 			uPos--;
 		} else {
 			start_pos++;
@@ -581,7 +595,48 @@ unsigned int CString::URLSplit(MCString& msRet) const {
 	return msRet.size();
 }
 
-unsigned int CString::Split(const CString& sDelim, VCString& vsRet, bool bAllowEmpty, const CString& sLeft, const CString& sRight) const {
+unsigned int CString::OptionSplit(MCString& msRet, bool bUpperKeys) const {
+	CString sName;
+	CString sCopy(*this);
+	msRet.clear();
+
+	while (!sCopy.empty()) {
+		sName = sCopy.Token(0, false, "=", false, "\"", "\"", false).Trim_n();
+		sCopy = sCopy.Token(1, true, "=", false, "\"", "\"", false).TrimLeft_n();
+
+		if (sName.empty()) {
+			continue;
+		}
+
+		VCString vsNames;
+		sName.Split(" ", vsNames, false, "\"", "\"");
+
+		for (unsigned int a = 0; a < vsNames.size(); a++) {
+			CString sKeyName = vsNames[a];
+
+			if (bUpperKeys) {
+				sKeyName.MakeUpper();
+			}
+
+			if ((a +1) == vsNames.size()) {
+				msRet[sKeyName] = sCopy.Token(0, false, " ", false, "\"", "\"");
+				sCopy = sCopy.Token(1, true, " ", false, "\"", "\"", false);
+			} else {
+				msRet[sKeyName] = "";
+			}
+		}
+	}
+
+	return msRet.size();
+}
+
+unsigned int CString::QuoteSplit(VCString& vsRet) const {
+	vsRet.clear();
+	return Split(" ", vsRet, false, "\"", "\"", true);
+}
+
+unsigned int CString::Split(const CString& sDelim, VCString& vsRet, bool bAllowEmpty,
+		const CString& sLeft, const CString& sRight, bool bTrimQuotes, bool bTrimWhiteSpace) const {
 	vsRet.clear();
 
 	if (empty()) {
@@ -603,18 +658,30 @@ unsigned int CString::Split(const CString& sDelim, VCString& vsRet, bool bAllowE
 
 	while (*p) {
 		if (uLeftLen && uRightLen && !bInside && strncasecmp(p, sLeft.c_str(), uLeftLen) == 0) {
+			if (!bTrimQuotes) {
+				sTmp += sLeft;
+			}
+
 			p += uLeftLen;
 			bInside = true;
 			continue;
 		}
 
 		if (uLeftLen && uRightLen && bInside && strncasecmp(p, sRight.c_str(), uRightLen) == 0) {
+			if (!bTrimQuotes) {
+				sTmp += sRight;
+			}
+
 			p += uRightLen;
 			bInside = false;
 			continue;
 		}
 
 		if (uDelimLen && !bInside && strncasecmp(p, sDelim.c_str(), uDelimLen) == 0) {
+			if (bTrimWhiteSpace) {
+				sTmp.Trim();
+			}
+
 			vsRet.push_back(sTmp);
 			sTmp.clear();
 			p += uDelimLen;
@@ -639,32 +706,12 @@ unsigned int CString::Split(const CString& sDelim, VCString& vsRet, bool bAllowE
 	}
 
 	return vsRet.size();
-
-	/*vsRet.clear();
-	CString sTmp = *this;
-
-	while (sTmp.size()) {
-		CString sTok = sTmp.Token(0, false, sDelim);
-		CString sRest = sTmp.Token(1, true, sDelim);
-
-		if (bAllowEmpty || !sTok.empty()) {
-			vsRet.push_back(sTok);
-		}
-
-		if (bAllowEmpty && sRest.empty() && sTok.size() < sTmp.size()) {
-			vsRet.push_back("");
-		}
-
-		sTmp = sRest;
-	}
-
-	return vsRet.size();*/
 }
 
-unsigned int CString::Split(const CString& sDelim, SCString& ssRet, bool bAllowEmpty, const CString& sLeft, const CString& sRight) const {
+unsigned int CString::Split(const CString& sDelim, SCString& ssRet, bool bAllowEmpty, const CString& sLeft, const CString& sRight, bool bTrimQuotes, bool bTrimWhiteSpace) const {
 	VCString vsTokens;
 
-	Split(sDelim, vsTokens, bAllowEmpty, sLeft, sRight);
+	Split(sDelim, vsTokens, bAllowEmpty, sLeft, sRight, bTrimQuotes, bTrimWhiteSpace);
 
 	ssRet.clear();
 
diff --git a/ZNCString.h b/ZNCString.h
index 4a9df7e9..376eeb6d 100644
--- a/ZNCString.h
+++ b/ZNCString.h
@@ -13,12 +13,14 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <list>
 #include <sys/types.h>
 
 using std::map;
 using std::set;
 using std::string;
 using std::vector;
+using std::list;
 
 #define _SQL(s) CString("'" + CString(s).Escape_n(CString::ESQL) + "'")
 #define _URL(s) CString("'" + CString(s).Escape_n(CString::EURL) + "'")
@@ -29,6 +31,7 @@ class MCString;
 
 typedef set<CString>				SCString;
 typedef vector<CString>				VCString;
+typedef list<CString>				LCString;
 
 static const unsigned char XX = 0xff;
 static const unsigned char base64_table[256] = {
@@ -105,10 +108,19 @@ public:
 	CString Right(unsigned int uCount) const;
 
 	CString FirstLine() const { return Token(0, false, "\n"); }
-	CString Token(unsigned int uPos, bool bRest = false, const CString& sSep = " ") const;
+	CString Token(unsigned int uPos, bool bRest = false, const CString& sSep = " ", bool bAllowEmpty = false, const CString& sLeft = "", const CString& sRight = "", bool bTrimQuotes = true) const;
+
 	unsigned int URLSplit(MCString& msRet) const;
-	unsigned int Split(const CString& sDelim, VCString& vsRet, bool bAllowEmpty = true, const CString& sLeft = "", const CString& sRight = "") const;
-	unsigned int Split(const CString& sDelim, SCString& ssRet, bool bAllowEmpty = true, const CString& sLeft = "", const CString& sRight = "") const;
+	unsigned int OptionSplit(MCString& msRet, bool bUpperKeys = false) const;
+	unsigned int QuoteSplit(VCString& vsRet) const;
+
+	unsigned int Split(const CString& sDelim, VCString& vsRet, bool bAllowEmpty = true,
+					   const CString& sLeft = "", const CString& sRight = "", bool bTrimQuotes = true,
+					   bool bTrimWhiteSpace = false) const;
+
+	unsigned int Split(const CString& sDelim, SCString& ssRet, bool bAllowEmpty = true,
+					   const CString& sLeft = "", const CString& sRight = "", bool bTrimQuotes = true,
+					   bool bTrimWhiteSpace = false) const;
 
 	static CString RandomString(unsigned int uLength);
 
diff --git a/modules/webadmin/skins/dark-clouds/Settings.tmpl b/modules/webadmin/skins/dark-clouds/Settings.tmpl
index 4538bac0..8c35bc41 100644
--- a/modules/webadmin/skins/dark-clouds/Settings.tmpl
+++ b/modules/webadmin/skins/dark-clouds/Settings.tmpl
@@ -21,7 +21,7 @@
 							<? LOOP ListenLoop ?>
 							<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 								<td><? VAR Port ESC=HTML ?></td>
-								<td><? VAR BindHost ESC=HTML DEFAULT=* ?></td>
+								<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
 								<td><? IF IsSSL ?>True<? ELSE ?>False<? ENDIF ?></td>
 								<td style="border-right: 0px;"><? IF IsIPV6 ?>True<? ELSE ?>False<? ENDIF ?></td>
 							</tr>
diff --git a/modules/webadmin/skins/default/Settings.tmpl b/modules/webadmin/skins/default/Settings.tmpl
index d1f2d66e..67e1a362 100644
--- a/modules/webadmin/skins/default/Settings.tmpl
+++ b/modules/webadmin/skins/default/Settings.tmpl
@@ -21,7 +21,7 @@
 							<? LOOP ListenLoop ?>
 								<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 									<td><? VAR Port ESC=HTML ?></td>
-									<td><? VAR BindHost ESC=HTML DEFAULT=* ?></td>
+									<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
 									<td><? IF IsSSL ?>True<? ENDIF ?></td>
 									<td><? IF IsIPV6 ?>True<? ENDIF ?></td>
 								</tr>
diff --git a/modules/webadmin/skins/graphiX/Settings.tmpl b/modules/webadmin/skins/graphiX/Settings.tmpl
index 4538bac0..8c35bc41 100644
--- a/modules/webadmin/skins/graphiX/Settings.tmpl
+++ b/modules/webadmin/skins/graphiX/Settings.tmpl
@@ -21,7 +21,7 @@
 							<? LOOP ListenLoop ?>
 							<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 								<td><? VAR Port ESC=HTML ?></td>
-								<td><? VAR BindHost ESC=HTML DEFAULT=* ?></td>
+								<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
 								<td><? IF IsSSL ?>True<? ELSE ?>False<? ENDIF ?></td>
 								<td style="border-right: 0px;"><? IF IsIPV6 ?>True<? ELSE ?>False<? ENDIF ?></td>
 							</tr>
diff --git a/modules/webadmin/skins/ice/Settings.tmpl b/modules/webadmin/skins/ice/Settings.tmpl
index aa0b2cae..e1471a22 100644
--- a/modules/webadmin/skins/ice/Settings.tmpl
+++ b/modules/webadmin/skins/ice/Settings.tmpl
@@ -19,7 +19,7 @@
 					<? LOOP ListenLoop ?>
 						<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 							<td><? VAR Port ESC=HTML ?></td>
-							<td><? VAR BindHost ESC=HTML DEFAULT=* ?></td>
+							<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
 							<td><? IF IsSSL ?>True<? ENDIF ?></td>
 							<td><? IF IsIPV6 ?>True<? ENDIF ?></td>
 						</tr>