diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index 00485ad80bd791986f2a626f9ea14ee49ec858eb..e913beb29062f72ca4ac26bd35c52b62feb1daca 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -488,8 +488,12 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
 		return r;
 	};
 
+
+
 	// MARK: MAIN LOOP (may get rid of this entirely, we'll see)
 
+	const farmyardStatsDisplay = () => `<<includeDOM App.Facilities.Farmyard.Stats(false)>><<timed 50ms>><<replace #farmyardstats>><<includeDOM App.Facilities.Farmyard.Stats(true)>><</replace>><</timed>>`;
+
 	farmyardStatsRecords();
 	t += farmyardProfit(profits, foodWeek);
 	t += farmyardDecoration();
diff --git a/src/facilities/nursery/widgets/children/childSummary.js b/src/facilities/nursery/widgets/children/childSummary.js
index 10fa981d65c73e6ce1cc98135cfaa8b3c319ac93..8a0322fc34b2e2eb20ad11c4b6e8ee667c2c7f5e 100644
--- a/src/facilities/nursery/widgets/children/childSummary.js
+++ b/src/facilities/nursery/widgets/children/childSummary.js
@@ -224,7 +224,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
 			longSexQuirk(child);
 		}
 		if (child.custom.label) {
-			r += `<strong><span class="yellow">${capFirstChar(child.custom.label)}</span></strong> `;
+			r += `<span class="custom-label">${capFirstChar(child.custom.label)}</span> `;
 		}
 		if ((child.relationship !== 0) || (abbreviate.clothes === 2) || (abbreviate.rulesets === 2)) {
 			r += `<br> `;
diff --git a/src/facilities/nursery/widgets/children/longChildDescription.js b/src/facilities/nursery/widgets/children/longChildDescription.js
index 66ca127dd85567f908093d664e5b79976600f1d9..78e5d86fc110e2ef4fee1c27e292aada45e3b150 100644
--- a/src/facilities/nursery/widgets/children/longChildDescription.js
+++ b/src/facilities/nursery/widgets/children/longChildDescription.js
@@ -6066,10 +6066,10 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
 
 	r += `&nbsp;&nbsp;&nbsp;&nbsp; `;
 
-	r += `<span id="childName"><strong><span class="pink">${SlaveFullName(child)}</span></strong></span> `;
+	r += `<span id="childName" class="slave name simple">${SlaveFullName(child)}</span> `;
 
 	if (child.custom.label) {
-		r += ` (<strong><span class="yellow">${child.custom.label}</span></strong>) `;
+		r += ` (<span class="custom-label">${child.custom.label}</span>) `;
 	}
 
 	r += ` is `;
diff --git a/src/facilities/nursery/widgets/infants/longInfantDescription.js b/src/facilities/nursery/widgets/infants/longInfantDescription.js
index 47303ce6e875c2ef845be3471f9933e638d588c2..f229127e0f32766e46b08971527029cf21eb5136 100644
--- a/src/facilities/nursery/widgets/infants/longInfantDescription.js
+++ b/src/facilities/nursery/widgets/infants/longInfantDescription.js
@@ -55,11 +55,11 @@ App.Facilities.Nursery.LongInfantDescription = function(child, {market = 0, even
 
 	r += `&nbsp;&nbsp;&nbsp;&nbsp; `;
 
-	r += `<span id="childName"><strong><span class="pink">${SlaveFullName(child)}</span></strong></span> `;
+	r += `<span id="childName" class="slave name simple">${SlaveFullName(child)}</span> `;
 
 	if (jsDef(child.custom)) {
 		if (child.custom.label) {
-			r += ` (<strong><span class="yellow">${child.custom.label}</span></strong>) `;
+			r += ` (<span class="custom-label">${child.custom.label}</span>) `;
 		}
 	}
 
diff --git a/src/facilities/statistics.css b/src/facilities/statistics.css
new file mode 100644
index 0000000000000000000000000000000000000000..91320c60544b476fb4f354b35bdc4ce5e865ca77
--- /dev/null
+++ b/src/facilities/statistics.css
@@ -0,0 +1,55 @@
+table.stats {
+	width: 100%;
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+table.stats > tr.header {
+	border-bottom: 2px solid white;
+}
+
+table.stats > tr.total {
+	border-top: 1px solid white;
+}
+
+table.stats > tr > th.narrow {
+	width: 10em;
+	text-align: right;
+}
+
+table.stats > tr > th.wide {
+	width: 20em;
+	text-align: right;
+}
+
+table.stats-slave {
+	width: 100%;
+	font-size: 90%;
+	line-height: 110%;
+}
+
+table.stats-slave > tr {
+	border-bottom: 1px solid #aaa;
+	border-left: none;
+	border-right: none;
+	border-top: none
+}
+
+table.stats-slave > tr > th.narrow {
+	width: 11em;
+	text-align: right;
+}
+
+table.stats-slave > tr > th.wide {
+	width: 22em;
+	text-align: right;
+}
+
+td.value {
+	padding-right: 3px;
+	text-align: right;
+}
+
+.decimalZero {
+	opacity: 0.3;
+}
\ No newline at end of file
diff --git a/src/facilities/statistics.js b/src/facilities/statistics.js
new file mode 100644
index 0000000000000000000000000000000000000000..4343717cc4c14862f9368349b4da253ba61c1cda
--- /dev/null
+++ b/src/facilities/statistics.js
@@ -0,0 +1,569 @@
+App.Facilities.StatsHelper = class {
+	/** Make a statistics table with given column labels
+	 * @param {string[]} columns - Array of four labels for data columns.  The first is wider than the others (typically used for facility revenue).
+	 * @returns {HTMLTableElement}
+	 */
+	makeStatsTable(columns) {
+		const table = document.createElement("table");
+		table.border = "1";
+		table.className = "stats";
+		const header = App.UI.DOM.appendNewElement("tr", table, "", "header");
+		App.UI.DOM.appendNewElement("th", header, "Items"); // first column, flexible width
+		App.UI.DOM.appendNewElement("th", header, columns[0], "wide"); // "revenue" column, wider
+		for (let i = 1; i < 4; ++i) {
+			App.UI.DOM.appendNewElement("th", header, columns[i], "narrow"); // three additional narrow columns
+		}
+		return table;
+	}
+
+	/** Adds a value row to a stats table, with the given label and value cells
+	 * @param {HTMLTableElement} table
+	 * @param {string|Node} label
+	 * @param {HTMLTableCellElement[]} valueCells
+	 * @param {boolean} [totals]
+	 */
+	addValueRow(table, label, valueCells, totals) {
+		const row = App.UI.DOM.appendNewElement("tr", table, undefined, totals ? "total" : undefined);
+		const labelCell = App.UI.DOM.appendNewElement("td", row, label);
+		if (totals) {
+			labelCell.style.fontWeight = "bold";
+		}
+		for (const cell of valueCells) {
+			row.appendChild(cell);
+		}
+	}
+
+	/** Makes a slave label
+	 * @param {string} slaveName
+	 * @param {string} customLabel
+	 * @returns {Node}
+	 */
+	makeSlaveLabel(slaveName, customLabel) {
+		if (!customLabel) {
+			return document.createTextNode(slaveName);
+		} else {
+			const frag = document.createDocumentFragment();
+			const label = App.UI.DOM.appendNewElement("span", frag, `(${customLabel}) `, "custom-label");
+			frag.appendChild(label);
+			frag.appendChild(document.createTextNode(slaveName));
+			return frag;
+		}
+	}
+
+	/** Makes a value cell
+	 * @param {string} type - "reputation" or "cash"
+	 * @param {number} value - numeric value
+	 * @param {object} [flags]
+	 * @param {boolean} [flags.forceNeg] - treat nonzero positive values as negative
+	 * @param {boolean} [flags.showSign] - display the sign
+	 * @param {boolean} [flags.showZero] - show the value, even if it's zero
+	 * @param {boolean} [flags.bold] - style in bold
+	 * @returns {HTMLTableCellElement}
+	 */
+	makeValueCell(type, value, flags = {}) {
+		const cell = document.createElement("td");
+		cell.classList.add("value");
+
+		if (value !== 0 || flags.showZero) {
+			// style appropriately
+			if (value < 0 || flags.forceNeg) {
+				cell.classList.add(type); // reputation or cash
+				cell.classList.add("dec"); // loss
+			} else if (value > 0) {
+				cell.classList.add(type); // reputation or cash
+				cell.classList.add("inc"); // gain
+			}
+			if (flags.bold) {
+				cell.style.fontWeight = "bold";
+			}
+
+			// set contents
+			let prefix = '';
+			if (type === "cash") {
+				prefix += '¤';
+			}
+			if (flags.showSign) {
+				if (flags.forceNeg) { // if the real value is negative, - sign will come from value.toFixed
+					prefix += '-';
+				} else if (value > 0) {
+					prefix += '+';
+				} else if (value === 0) {
+					prefix += '±';
+				}
+			}
+			const fixedPrecision = type === "cash" ? 2 : 1;
+			const parts = value.toFixed(fixedPrecision).split('.');
+			cell.appendChild(document.createTextNode(prefix + parts[0]));
+			App.UI.DOM.appendNewElement("span", cell, '.' + parts[1], /^0+$/.test(parts[1]) ? "decimalZero" : undefined);
+		}
+
+		return cell;
+	}
+
+	/** Make an empty cell (for parity)
+	 * @returns {HTMLTableCellElement}
+	 */
+	makeEmptyCell() {
+		return document.createElement("td");
+	}
+
+	/** Make the customer cell (for the facility-specific slave details column)
+	 * @param {number} value
+	 * @returns {HTMLTableCellElement}
+	 */
+	makeCustomersCell(value) {
+		const cell = document.createElement("td");
+		cell.classList.add("value");
+		if (value <= 0) {
+			cell.textContent = "none";
+			cell.classList.add("red");
+		} else {
+			cell.textContent = value.toString();
+		}
+		return cell;
+	}
+
+	/** Make the production cell (for the facility-specific slave details column)
+	 * @param {number} milk
+	 * @param {number} cum
+	 * @param {number} fluid
+	 * @returns {HTMLTableCellElement}
+	 */
+	makeProductionCell(milk, cum, fluid) {
+		const cell = document.createElement("td");
+		cell.classList.add("value");
+		if (milk || cum || fluid) {
+			cell.textContent = `${milk}/${cum}/${fluid}`;
+		} else {
+			cell.textContent = `0/0/0`;
+		}
+		return cell;
+	}
+
+	/** Appends the slave stats row to the main stats table, and returns a reference to the slave stats table for later use.
+	 * @param {HTMLTableElement} statsTable
+	 * @param {string} caption
+	 * @param {string[]} columns - six column labels - slave type, facility-specific output details column, wide column, then three narrow columns
+	 * @returns {HTMLTableElement}
+	 */
+	makeSlaveStatsTable(statsTable, caption, columns) {
+		const row = App.UI.DOM.appendNewElement("tr", statsTable);
+		const bigCell = document.createElement("td");
+		bigCell.colSpan = 5;
+		const label = App.UI.DOM.appendNewElement("span", bigCell, caption);
+		label.style.fontWeight = "bold";
+		row.appendChild(bigCell);
+
+		const table = document.createElement("table");
+		table.className = "stats-slave";
+		const header = App.UI.DOM.appendNewElement("tr", table, "", "header");
+		App.UI.DOM.appendNewElement("th", header, columns[0]); // first column, flexible width
+		App.UI.DOM.appendNewElement("th", header, columns[1], "narrow"); // facility-specific output details
+		App.UI.DOM.appendNewElement("th", header, columns[2], "wide"); // "revenue" column, wider
+		for (let i = 3; i < 6; ++i) {
+			App.UI.DOM.appendNewElement("th", header, columns[i], "narrow"); // three additional narrow columns
+		}
+		bigCell.appendChild(table);
+		statsTable.appendChild(bigCell);
+		return table;
+	}
+};
+
+App.Facilities.Brothel.Stats = (function() {
+	const H = new App.Facilities.StatsHelper();
+	const assureList = [ "whoreIncome", "rep", "whoreCosts", "adsIncome", "maintenance", "adsCosts", "totalIncome", "totalExpenses", "profit" ];
+
+	/** Make the brothel slave revenue cell
+	 * @param {number} revenue
+	 * @param {number} adsIncome
+	 * @returns {HTMLTableCellElement}
+	 */
+	function makeRevenueCell(revenue, adsIncome) {
+		function printCash(value, cell) {
+			const parts = value.toFixed(2).split('.');
+			App.UI.DOM.appendNewElement("span", cell, '¤' + parts[0], ["cash", "inc"]);
+			App.UI.DOM.appendNewElement("span", cell, '.' + parts[1], ["cash", "inc", "decimalPart"]);
+		}
+		const cell = document.createElement("td");
+		cell.classList.add("value");
+		printCash(revenue, cell);
+		if (adsIncome > 0) {
+			cell.appendChild(document.createTextNode(" ("));
+			printCash(adsIncome, cell);
+			cell.appendChild(document.createTextNode(" due to advertising)"));
+		}
+		return cell;
+	}
+
+	/** Generate the brothel statistics table
+	 * @param {boolean} showDetails
+	 * @returns {HTMLElement|DocumentFragment}
+	 */
+	function output(showDetails) {
+		if (!V.showEconomicDetails) {
+			return document.createDocumentFragment();
+		} else if (!V.facility || !V.facility.brothel) {
+			return App.UI.DOM.makeElement("h4", `- No statistics for ${V.brothelName} gathered this week -`);
+		}
+
+		const b = V.facility.brothel;
+		for (const prop in assureList) {
+			b[prop] = b[prop] || 0;
+		}
+
+		const stats = H.makeStatsTable(["Revenue", "Expenses", "Net Income", "Rep. Change"]);
+		H.addValueRow(stats, "Total whoring income", [
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeValueCell("reputation", b.rep, {showSign: true})
+		]);
+		H.addValueRow(stats, "Total whore living costs", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true}),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		if (showDetails) {
+			const slaveStats = H.makeSlaveStatsTable(stats, "Whore details", ["Whore", "Customers", "Revenue", "Expenses", "Net Income", "Rep. Change"]);
+			for (const record of b.income.values()) {
+				const revenue = record.income + record.adsIncome;
+				const netIncome = revenue - record.cost;
+				H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
+					H.makeCustomersCell(record.customers),
+					makeRevenueCell(revenue, record.adsIncome),
+					H.makeValueCell("cash", record.cost, {forceNeg: true}),
+					H.makeValueCell("cash", netIncome),
+					H.makeValueCell("reputation", record.rep, {showSign: true})
+				]);
+			}
+		}
+		if (b.adsIncome > 0) {
+			H.addValueRow(stats, "Additional income", [
+				H.makeValueCell("cash", b.adsIncome),
+				H.makeEmptyCell(),
+				H.makeValueCell("cash", b.adsIncome),
+				H.makeEmptyCell()
+			]);
+		}
+		H.addValueRow(stats, "Brothel maintenance", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		if (b.adsCosts > 0) {
+			H.addValueRow(stats, "Advertising program", [
+				H.makeEmptyCell(),
+				H.makeValueCell("cash", b.adsCosts, {forceNeg: true}),
+				H.makeValueCell("cash", b.adsCosts, {forceNeg: true, showSign: true}),
+				H.makeEmptyCell()
+			]);
+		}
+		H.addValueRow(stats, "Total", [
+			H.makeValueCell("cash", b.totalIncome),
+			H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+			H.makeValueCell("cash", b.profit, {bold: true}),
+			H.makeValueCell("reputation", b.rep, {showSign: true, bold: true})
+		], true);
+
+		return stats;
+	}
+
+	return output;
+})();
+
+App.Facilities.Club.Stats = (function() {
+	const H = new App.Facilities.StatsHelper();
+	const assureList = [ "whoreIncome", "rep", "whoreCosts", "adsIncome", "maintenance", "adsCosts", "totalIncome", "totalExpenses", "profit" ];
+
+	/** Make the slut efficiency cell
+	 * @param {number} efficiency
+	 * @param {boolean} [bold]
+	 * @returns {HTMLTableCellElement}
+	 */
+	function makeEfficiencyCell(efficiency, bold) {
+		const cell = document.createElement("td");
+		cell.classList.add("value");
+		if (bold) {
+			cell.style.fontWeight = "bold";
+		}
+		const parts = efficiency.toFixed(2).split('.');
+		const val = App.UI.DOM.appendNewElement("span", cell, parts[0], ["reputation", "inc"]);
+		App.UI.DOM.appendNewElement("span", val, '.' + parts[1], /^0+$/.test(parts[1]) ? "decimalZero" : undefined);
+		cell.appendChild(document.createTextNode(" rep/¤"));
+		return cell;
+	}
+
+	/** Generate the Club statistics table
+	 * @param {boolean} showDetails
+	 * @returns {HTMLElement|DocumentFragment}
+	 */
+	function output(showDetails) {
+		if (!V.showEconomicDetails) {
+			return document.createDocumentFragment();
+		} else if (!V.facility || !V.facility.club) {
+			return App.UI.DOM.makeElement("h4", `- No statistics for ${V.clubName} gathered this week -`);
+		}
+
+		const b = V.facility.club;
+		for (const prop in assureList) {
+			b[prop] = b[prop] || 0;
+		}
+
+		const stats = H.makeStatsTable(["Rep. Gain", "Expenses", "Rep/Expenses", "Extra Income"]);
+		H.addValueRow(stats, "Total slut rep gain", [
+			H.makeValueCell("reputation", b.whoreIncome, {showSign: true}),
+			H.makeEmptyCell(),
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.rep)
+		]);
+		H.addValueRow(stats, "Total slut living costs", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true}),
+			H.makeEmptyCell(),
+			H.makeEmptyCell()
+		]);
+		if (showDetails) {
+			const slaveStats = H.makeSlaveStatsTable(stats, "Public slut details", ["Slut", "Customers", "Rep. Gain", "Expenses", "Rep/Expenses", "Extra Income"]);
+			for (const record of b.income.values()) {
+				const netIncome = record.income / record.cost;
+				H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
+					H.makeCustomersCell(record.customers),
+					H.makeValueCell("reputation", record.income, {showSign: true, showZero: true}),
+					H.makeValueCell("cash", record.cost, {forceNeg: true}),
+					makeEfficiencyCell(netIncome),
+					H.makeValueCell("cash", record.rep, {showZero: true})
+				]);
+			}
+		}
+		if (b.adsIncome > 0) {
+			H.addValueRow(stats, "Additional rep gain", [
+				H.makeValueCell("reputation", b.adsIncome),
+				H.makeEmptyCell(),
+				H.makeEmptyCell(),
+				H.makeEmptyCell()
+			]);
+		}
+		H.addValueRow(stats, "Club maintenance", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+			H.makeEmptyCell(),
+			H.makeEmptyCell()
+		]);
+		if (b.adsCosts > 0) {
+			H.addValueRow(stats, "Advertising program", [
+				H.makeEmptyCell(),
+				H.makeValueCell("cash", b.adsCosts, {forceNeg: true}),
+				H.makeEmptyCell(),
+				H.makeEmptyCell()
+			]);
+		}
+		H.addValueRow(stats, "Total", [
+			H.makeValueCell("reputation", b.totalIncome, {showSign: true}),
+			H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+			makeEfficiencyCell(b.profit, true),
+			H.makeValueCell("cash", b.rep, {bold: true, showZero: true})
+		], true);
+
+		return stats;
+	}
+
+	return output;
+})();
+
+App.Facilities.Arcade.Stats = (function() {
+	const H = new App.Facilities.StatsHelper();
+	const assureList = [ "whoreIncome", "rep", "whoreCosts", "maintenance", "totalIncome", "totalExpenses", "profit" ];
+
+	/** Generate the arcade statistics table
+	 * @param {boolean} showDetails
+	 * @returns {HTMLElement|DocumentFragment}
+	 */
+	function output(showDetails) {
+		if (!V.showEconomicDetails) {
+			return document.createDocumentFragment();
+		} else if (!V.facility || !V.facility.arcade) {
+			return App.UI.DOM.makeElement("h4", `- No statistics for ${V.arcadeName} gathered this week -`);
+		}
+
+		const b = V.facility.arcade;
+		for (const prop in assureList) {
+			b[prop] = b[prop] || 0;
+		}
+
+		const stats = H.makeStatsTable(["Revenue", "Expenses", "Net Income", "Rep. Change"]);
+		H.addValueRow(stats, "Total arcade income", [
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeValueCell("reputation", b.rep, {showSign: true})
+		]);
+		H.addValueRow(stats, "Total fuckmeat living costs", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true}),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		if (showDetails) {
+			const slaveStats = H.makeSlaveStatsTable(stats, "Fuckmeat details", ["Fuckmeat", "Customers", "Revenue", "Expenses", "Net Income", "Rep. Change"]);
+			for (const record of b.income.values()) {
+				const revenue = record.income + record.adsIncome;
+				const netIncome = revenue - record.cost;
+				H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
+					H.makeCustomersCell(record.customers),
+					H.makeValueCell("cash", revenue),
+					H.makeValueCell("cash", record.cost, {forceNeg: true}),
+					H.makeValueCell("cash", netIncome),
+					H.makeValueCell("reputation", record.rep, {showSign: true})
+				]);
+			}
+		}
+		H.addValueRow(stats, "Arcade maintenance", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		H.addValueRow(stats, "Total", [
+			H.makeValueCell("cash", b.totalIncome),
+			H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+			H.makeValueCell("cash", b.profit, {bold: true}),
+			H.makeValueCell("reputation", b.rep, {showSign: true, bold: true})
+		], true);
+
+		return stats;
+	}
+
+	return output;
+})();
+
+App.Facilities.Dairy.Stats = (function() {
+	const H = new App.Facilities.StatsHelper();
+	const assureList = [ "whoreIncome", "whoreCosts", "maintenance", "totalIncome", "totalExpenses", "profit" ];
+
+	/** Generate the arcade statistics table
+	 * @param {boolean} showDetails
+	 * @returns {HTMLElement|DocumentFragment}
+	 */
+	function output(showDetails) {
+		if (!V.showEconomicDetails) {
+			return document.createDocumentFragment();
+		} else if (!V.facility || !V.facility.dairy) {
+			return App.UI.DOM.makeElement("h4", `- No statistics for ${V.dairyName} gathered this week -`);
+		}
+
+		const b = V.facility.dairy;
+		for (const prop in assureList) {
+			b[prop] = b[prop] || 0;
+		}
+
+		const stats = H.makeStatsTable(["Revenue", "Expenses", "Net Income", "Rep. Change"]);
+		H.addValueRow(stats, "Total cow income", [
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreIncome),
+			H.makeEmptyCell(),
+		]);
+		H.addValueRow(stats, "Total cow living costs", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true}),
+			H.makeValueCell("cash", b.whoreCosts, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		if (showDetails) {
+			const slaveStats = H.makeSlaveStatsTable(stats, "Cow details", ["Cow", "Milk/Cum/Fluids", "Revenue", "Expenses", "Net Income", "Rep. Change"]);
+			for (const record of b.income.values()) {
+				const netIncome = record.income - record.cost;
+				H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
+					H.makeProductionCell(record.milk, record.cum, record.fluid),
+					H.makeValueCell("cash", record.income),
+					H.makeValueCell("cash", record.cost, {forceNeg: true}),
+					H.makeValueCell("cash", netIncome),
+					H.makeEmptyCell()
+				]);
+			}
+		}
+		H.addValueRow(stats, "Dairy maintenance", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		H.addValueRow(stats, "Total", [
+			H.makeValueCell("cash", b.totalIncome),
+			H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+			H.makeValueCell("cash", b.profit, {bold: true}),
+			H.makeEmptyCell()
+		], true);
+
+		return stats;
+	}
+
+	return output;
+})();
+
+App.Facilities.Farmyard.Stats = (function() {
+	const H = new App.Facilities.StatsHelper();
+	const assureList = [ "farmhandIncome", "farmhandCosts", "maintenance", "totalIncome", "totalExpenses", "food", "profit" ];
+
+	/** Generate the arcade statistics table
+	 * @param {boolean} showDetails
+	 * @returns {HTMLElement|DocumentFragment}
+	 */
+	function output(showDetails) {
+		if (!V.showEconomicDetails) {
+			return document.createDocumentFragment();
+		} else if (!V.facility || !V.facility.farmyard) {
+			return App.UI.DOM.makeElement("h4", `- No statistics for ${V.farmyardName} gathered this week -`);
+		}
+
+		const b = V.facility.farmyard;
+		for (const prop in assureList) {
+			b[prop] = b[prop] || 0;
+		}
+
+		const stats = H.makeStatsTable(["Revenue", "Expenses", "Net Income", "Rep. Change"]);
+		H.addValueRow(stats, "Total farmhand income", [
+			H.makeValueCell("cash", b.farmhandIncome),
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.farmhandIncome),
+			H.makeEmptyCell(),
+		]);
+		H.addValueRow(stats, "Total farmhand living costs", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.farmhandCosts, {forceNeg: true}),
+			H.makeValueCell("cash", b.farmhandCosts, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		if (showDetails) {
+			const slaveStats = H.makeSlaveStatsTable(stats, "Farmhand details", ["Farmhand", "Milk/Cum/Fluids", "Revenue", "Expenses", "Net Income", "Rep. Change"]);
+			for (const record of b.income.values()) {
+				const netIncome = record.income - record.cost;
+				H.addValueRow(slaveStats, H.makeSlaveLabel(record.slaveName, record.customLabel), [
+					H.makeProductionCell(record.milk, record.cum, record.fluid),
+					H.makeValueCell("cash", record.income),
+					H.makeValueCell("cash", record.cost, {forceNeg: true}),
+					H.makeValueCell("cash", netIncome),
+					H.makeEmptyCell()
+				]);
+			}
+		}
+		H.addValueRow(stats, "Farmyard maintenance", [
+			H.makeEmptyCell(),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true}),
+			H.makeValueCell("cash", b.maintenance, {forceNeg: true, showSign: true}),
+			H.makeEmptyCell()
+		]);
+		H.addValueRow(stats, "Total", [
+			H.makeValueCell("cash", b.totalIncome),
+			H.makeValueCell("cash", b.totalExpenses, {forceNeg: true}),
+			H.makeValueCell("cash", b.profit, {bold: true}),
+			H.makeEmptyCell()
+		], true);
+
+		return stats;
+	}
+
+	return output;
+})();
diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index e380ff8791f1bc0c60203b6c2562700912828939..47af08439aa425221b30d19aad0d3ea1023f235f 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -355,6 +355,11 @@ div.double-choices, p.double-choices {
 	font-weight: bold;
 }
 
+.custom-label {
+	color: yellow;
+	font-weight: bold;
+}
+
 div.cheat-menu {
 	font-style: italic;
 	position: absolute;
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index 587bc3b85f6076652b419241c2b5cfe228bf4464..7071420580a7a54e88e96ea4914da055c9230841 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -1565,11 +1565,10 @@ More policies will become available as the arcology develops.//
 		<<else>>
 			<<if $arcologies[0].FSStatuesqueGlorificationSMR == 0>>
 				<br>''<span class="lime">Small Details SMR:</span>'' in order to be sold in the arcology, slaves must pass height requirements.
-				<span class="green">[[Implement|Policies][$arcologies[0].FSPetiteAdmirationSMR = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
+				<span class="green">[[Implement|Policies][$arcologies[0].FSPetiteAdmirationSMR = 1, $policies.SMR.height.advancedSMR = 0, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will help advance Petite Admiration//
 				<<if $policies.SMR.height.basicSMR > 0 || $policies.SMR.height.advancedSMR != 0>>
 					//and will repeal interfering height regulations//
-					<<set $policies.SMR.height.advancedSMR = 0>>
 					<<if $policies.SMR.height.basicSMR > 0>>
 						<<set $policies.SMR.height.basicSMR = 0>>
 					<</if>>
@@ -1608,11 +1607,10 @@ More policies will become available as the arcology develops.//
 		<<else>>
 			<<if $arcologies[0].FSPetiteAdmirationSMR == 0>>
 				<br>''<span class="lime">You Must Be This Tall SMR:</span>'' in order to be sold in the arcology, slaves must pass height requirements.
-				<span class="green">[[Implement|Policies][$arcologies[0].FSStatuesqueGlorificationSMR = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
+				<span class="green">[[Implement|Policies][$arcologies[0].FSStatuesqueGlorificationSMR = 1, $policies.SMR.height.advancedSMR = 0, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
 				<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will help advance Statuesque Glorification//
 				<<if $policies.SMR.height.basicSMR < 0 || $policies.SMR.height.advancedSMR != 0>>
 					//and will repeal interfering height regulations//
-					<<set $policies.SMR.height.advancedSMR = 0>>
 					<<if $policies.SMR.height.basicSMR < 0>>
 						<<set $policies.SMR.height.basicSMR = 0>>
 					<</if>>
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 748d642bc296921f0e4413b398d51bbfb108a9c6..e0adc5cbe33f5bddf80a9a136338c11fdcafe010 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -931,7 +931,7 @@ App.UI.SlaveSummary = function() {
 		delegates.skills(slave, para);
 		delegates.mental(slave, para);
 		if (slave.custom.label) {
-			helpers.makeSpan(res, `${capFirstChar(slave.custom.label)}.`, ["yellow", "strong"]);
+			helpers.makeSpan(res, `${capFirstChar(slave.custom.label)}.`, ["custom-label"]);
 		}
 		if ((slave.relationship !== 0) || (slave.relationship !== 0) || (abbrSettings.clothes === 2) || (abbrSettings.rulesets === 2)) {
 			para = helpers.makeParagraph(res);
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index b9d78538af1a29e290e297228842f5f813d9d36e..027493e3581d47792cd4c05ab4108728bd65432e 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -1579,13 +1579,36 @@ globalThis.lengthToEitherUnit = function(length) {
 globalThis.induceLactation = function(slave) {
 	const {His} = getPronouns(slave);
 	let r = "";
-	if (slave.induceLactation >= 10) {
-		if (jsRandom(1, 100) < slave.induceLactation) {
-			r += `${His} breasts have been stimulated often enough to <span class="lime">induce lactation.</span>`;
-			slave.induceLactation = 0;
-			slave.lactationDuration = 2;
-			slave.lactation = 1;
-		}
+	let lactationStartChance = jsRandom(10, 100);
+	if (slave.boobs < 300) {
+		lactationStartChance *= 1.5;
+	} else if (slave.boobs < 400 || slave.boobs >= 5000) {
+		lactationStartChance *= 1.2;
+	}
+	if (slave.pubertyXX === 0) {
+		lactationStartChance *= 1.5;
+	}
+	if (slave.preg > (slave.pregData.normalBirth / 1.33)) {
+		lactationStartChance *= .5;
+	}
+	if (slave.health.condition < -20) {
+		lactationStartChance *= 2;
+	}
+	if (slave.weight <= -30) {
+		lactationStartChance *= 1.5;
+	}
+	if (slave.boobsImplant > 0) {
+		lactationStartChance *= (1 + (slave.boobsImplant / slave.boobs));
+	}
+	if (slave.lactationAdaptation > 0) {
+		lactationStartChance = (lactationStartChance / (slave.lactationAdaptation / 10));
+	}
+	lactationStartChance = Math.floor(lactationStartChance);
+	if (slave.induceLactation >= lactationStartChance) {
+		r += `${His} breasts have been stimulated often enough to <span class="lime">induce lactation.</span>`;
+		slave.induceLactation = 0;
+		slave.lactationDuration = 2;
+		slave.lactation = 1;
 	}
 	return r;
 };
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 1dfe8a00ec76d152dbb7b42d96da0c0716e34587..3f5743be72bdec17a3762a9fc71d9b1e901db18d 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -42,7 +42,7 @@ App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescripti
 		frag = new DocumentFragment();
 		frag.append("(");
 		span = document.createElement('span');
-		span.style.fontWeight = "bold";
+		span.classList.add("custom-label");
 		span.textContent = slave.custom.label;
 		frag.append(span);
 		frag.append(") ");
@@ -775,9 +775,6 @@ App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescripti
 	$(p).append(r.join(` `));
 	el.appendChild(p);
 
-	$(p).append(r.join(` `));
-	el.appendChild(p);
-
 	if (slave.fuckdoll === 0) {
 		p = document.createElement("p");
 		p.className = "indent";
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
deleted file mode 100644
index 8bb509efc59b5d5dab76c8dfccdf8decaf7d6439..0000000000000000000000000000000000000000
--- a/src/pregmod/widgets/economyWidgets.tw
+++ /dev/null
@@ -1,460 +0,0 @@
-:: economy widgets [widget nobr]
-
-<<widget "BrothelStatistics">>
-	<<if ($showEconomicDetails)>>
-	<<if (!$facility || !$facility.brothel)>>
-		<h4>- No statistics for $brothelName gathered this week -</h4>
-	<<else>>
-		<<set _details = $args[0]>>
-		<<set _b = $facility.brothel>>
-		<<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
-		<<set _b.rep = (def _b.rep) ? _b.rep : 0>>
-		<<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
-		<<set _b.adsIncome = (def _b.adsIncome) ? _b.adsIncome : 0>>
-		<<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
-		<<set _b.adsCosts = (def _b.adsCosts) ? _b.adsCosts : 0>>
-		<<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
-		<<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
-		<<set _b.profit = (def _b.profit) ? _b.profit : 0>>
-		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
-		<tr style="border-bottom: 2px solid white;">
-			<th>Items</th>
-			<th style="width: 20em; text-align: right">Revenue</th>
-			<th style="width: 10em; text-align: right">Expenses</th>
-			<th style="width: 10em; text-align: right">Net Income</th>
-			<th style="width: 10em; text-align: right">Rep. Change</th>
-		</tr>
-		<tr>
-			<td>Total whoring income</td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right;"><<if (_b.rep > 0)>>@@.green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@.red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></td>
-		</tr>
-		<tr>
-			<td>Total whore living costs</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤-<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<<if _details>>
-		<tr>
-			<td colspan="5"><b>Whore details</b>
-			<table style="width: 100%; font-size: 90%; line-height: 110%;">
-			<tr>
-				<th>Whore</th>
-				<th style="width: 10em; text-align: right">Customers</th>
-				<th style="width: 22em; text-align: right">Revenue</th>
-				<th style="width: 11em; text-align: right">Expenses</th>
-				<th style="width: 11.5em; text-align: right">Net Income</th>
-				<th style="width: 11em; text-align: right">Rep. Change</th>
-			</tr>
-			<<set _slaveDetails = _b.income.values()>>
-			<<set _slaveInfo = _slaveDetails.next()>>
-			<<for !_slaveInfo.done>>
-				<<set _revenue = _slaveInfo.value.income + _slaveInfo.value.adsIncome, _netIncome = _revenue - _slaveInfo.value.cost>>
-				<tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none">
-					<td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_slaveInfo.value.customers <= 0)>>@@.red;none@@<<else>>_slaveInfo.value.customers<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td>
-					<td style="padding-right: 3px; text-align: right;"><<if (_slaveInfo.value.rep > 0)>>@@.green;+<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<elseif (_slaveInfo.value.rep < 0)>>@@.red;<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<else>><</if>></td>
-				</tr>
-				<<set _slaveInfo = _slaveDetails.next()>>
-			<</for>>
-			</table>
-			</td>
-		</tr>
-		<</if>>
-		<<if (_b.adsIncome > 0)>>
-		<tr>
-			<td>Additional income</td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<</if>>
-		<tr>
-			<td>Brothel maintenance</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤-<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<<if (_b.adsCosts > 0)>>
-		<tr>
-			<td>Advertising program</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.adsCosts.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤-<<= _b.adsCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<</if>>
-		<tr style="border-top: 1px solid white;">
-			<td><b>Total</b></td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right"><b><<if (_b.profit > 0)>>@@.yellowgreen;¤<<= _b.profit.toFixedHTML(2)>>@@<<elseif (_b.profit < 0)>>@@.red;¤<<= _b.profit.toFixedHTML(2)>>@@<<else>>¤<<= _b.profit.toFixedHTML(2)>><</if>></b></td>
-			<td style="padding-right: 2px; text-align: right;"><b><<if (_b.rep > 0)>>@@.green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@.red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></b></td></tr>
-		</table>
-	<</if>>
-	<</if>>
-<</widget>>
-
-<<widget "ClubStatistics">>
-	<<if ($showEconomicDetails)>>
-	<<if (!$facility || !$facility.club)>>
-		<h4>- No statistics for $clubName gathered this week -</h4>
-	<<else>>
-		<<set _details = $args[0]>>
-		<<set _b = $facility.club>>
-		<<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
-		<<set _b.rep = (def _b.rep) ? _b.rep : 0>>
-		<<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
-		<<set _b.adsIncome = (def _b.adsIncome) ? _b.adsIncome : 0>>
-		<<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
-		<<set _b.adsCosts = (def _b.adsCosts) ? _b.adsCosts : 0>>
-		<<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
-		<<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
-		<<set _b.profit = (def _b.profit) ? _b.profit : 0>>
-		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
-		<tr style="border-bottom: 2px solid white;">
-			<th>Items</th>
-			<th style="width: 20em; text-align: right">Rep. Gain</th>
-			<th style="width: 10em; text-align: right">Expenses</th>
-			<th style="width: 10em; text-align: right">Rep/Expenses</th>
-			<th style="width: 10em; text-align: right">Extra Income</th>
-		</tr>
-		<tr>
-			<td>Total whoring income</td>
-			<td style="padding-right: 3px; text-align: right">@@.green;+<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right;"><<if (_b.rep > 0)>>@@.green;¤<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@.red;¤<<= -_b.rep.toFixedHTML(1)>>@@<</if>></td>
-		</tr>
-		<tr>
-			<td>Total whore living costs</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td></td>
-		</tr>
-		<<if _details>>
-		<tr>
-			<td colspan="5"><b>Whore details</b>
-			<table style="width: 100%; font-size: 90%; line-height: 110%;">
-			<tr>
-				<th>Whore</th>
-				<th style="width: 10em; text-align: right">Customers</th>
-				<th style="width: 22em; text-align: right">Rep. Gain</th>
-				<th style="width: 11em; text-align: right">Expenses</th>
-				<th style="width: 11.5em; text-align: right">Rep/Expenses</th>
-				<th style="width: 11em; text-align: right">Extra Income</th>
-			</tr>
-			<<set _slaveDetails = _b.income.values()>>
-			<<set _slaveInfo = _slaveDetails.next()>>
-			<<for !_slaveInfo.done>>
-				<<set _netIncome = _slaveInfo.value.income / _slaveInfo.value.cost>>
-				<tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none">
-					<td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_slaveInfo.value.customers <= 0)>>@@.red;none@@<<else>>_slaveInfo.value.customers<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.green;+<<= _slaveInfo.value.income.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right">@@.green;<<= _netIncome.toFixedHTML(2)>>@@ rep/¤</td>
-					<td style="padding-right: 3px; text-align: right;">@@.yellowgreen;¤<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@</td>
-				</tr>
-				<<set _slaveInfo = _slaveDetails.next()>>
-			<</for>>
-			</table>
-			</td>
-		</tr>
-		<</if>>
-		<<if (_b.adsIncome > 0)>>
-		<tr>
-			<td>Additional rep gain</td>
-			<td style="padding-right: 2px; text-align: right">@@.green;+<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td></td>
-			<td></td>
-		</tr>
-		<</if>>
-		<tr>
-			<td>Club maintenance</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td></td>
-		</tr>
-		<<if (_b.adsCosts > 0)>>
-		<tr>
-			<td>Advertising program</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.adsCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td></td>
-		</tr>
-		<</if>>
-		<tr style="border-top: 1px solid white;">
-			<td><b>Total</b></td>
-			<td style="padding-right: 2px; text-align: right">@@.green;+<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right"><b>@@.green;<<= _b.profit.toFixedHTML(2)>>@@ rep/¤</b></td>
-			<td style="padding-right: 2px; text-align: right;"><b>@@.green;+<<= _b.rep.toFixedHTML(1)>>@@</b></td></tr>
-		</table>
-	<</if>>
-	<</if>>
-<</widget>>
-
-<<widget "DairyStatistics">>
-	<<if ($showEconomicDetails)>>
-	<<if (!$facility || !$facility.dairy)>>
-		<h4>- No statistics for $dairyName gathered this week -</h4>
-	<<else>>
-		<<set _details = $args[0]>>
-		<<set _b = $facility.dairy>>
-		<<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
-		<<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
-		<<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
-		<<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
-		<<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
-		<<set _b.profit = (def _b.profit) ? _b.profit : 0>>
-		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
-		<tr style="border-bottom: 2px solid white;">
-			<th>Items</th>
-			<th style="width: 20em; text-align: right">Revenue</th>
-			<th style="width: 10em; text-align: right">Expenses</th>
-			<th style="width: 10em; text-align: right">Net Income</th>
-			<th style="width: 10em; text-align: right">Rep. Change</th>
-		</tr>
-		<tr>
-			<td>Total cow income</td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right;"></td>
-		</tr>
-		<tr>
-			<td>Total cow living costs</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤-<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<<if _details>>
-		<tr>
-			<td colspan="5"><b>Cow details</b>
-			<table style="width: 100%; font-size: 90%; line-height: 110%;">
-			<tr>
-				<th>Cow</th>
-				<th style="width: 10em; text-align: right">Milk/Cum/Fluids</th>
-				<th style="width: 22em; text-align: right">Revenue</th>
-				<th style="width: 11em; text-align: right">Expenses</th>
-				<th style="width: 11.5em; text-align: right">Net Income</th>
-				<th style="width: 11em; text-align: right">Rep. Change</th>
-			</tr>
-			<<set _slaveDetails = _b.income.values()>>
-			<<set _slaveInfo = _slaveDetails.next()>>
-			<<for !_slaveInfo.done>>
-				<<set _revenue = _slaveInfo.value.income, _netIncome = _revenue - _slaveInfo.value.cost>>
-				<tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none">
-					<td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
-					<td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td>
-					<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td>
-					<td style="padding-right: 3px; text-align: right;"></td>
-				</tr>
-				<<set _slaveInfo = _slaveDetails.next()>>
-			<</for>>
-			</table>
-			</td>
-		</tr>
-		<</if>>
-		<tr>
-			<td>Dairy maintenance</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤-<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<tr style="border-top: 1px solid white;">
-			<td><b>Total</b></td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right"><b><<if (_b.profit > 0)>>@@.yellowgreen;¤<<= _b.profit.toFixedHTML(2)>>@@<<elseif (_b.profit < 0)>>@@.red;¤<<= _b.profit.toFixedHTML(2)>>@@<<else>>¤<<= _b.profit.toFixedHTML(2)>><</if>></b></td>
-			<td style="padding-right: 2px; text-align: right;"><b></b></td></tr>
-		</table>
-	<</if>>
-	<</if>>
-<</widget>>
-
-<<widget "FarmyardStatistics">>
-	<<if ($showEconomicDetails)>>
-	<<if (!$facility || !$facility.farmyard)>>
-		<h4>- No statistics for $farmyardName gathered this week -</h4>
-	<<else>>
-		<<set _details = $args[0]>>
-		<<set _b = $facility.farmyard>>
-		<<set _b.farmhandIncome = (def _b.farmhandIncome) ? _b.farmhandIncome : 0>>
-		<<set _b.farmhandCosts = (def _b.farmhandCosts) ? _b.farmhandCosts : 0>>
-		<<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
-		<<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
-		<<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
-		<<set _b.food = (def _b.food) ? _b.food : 0>>
-		<<set _b.profit = (def _b.profit) ? _b.profit : 0>>
-		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
-		<tr style="border-bottom: 2px solid white;">
-			<th>Items</th>
-			<th style="width: 20em; text-align: right">Revenue</th>
-			<th style="width: 10em; text-align: right">Expenses</th>
-			<th style="width: 10em; text-align: right">Net Income</th>
-			<th style="width: 10em; text-align: right">Rep. Change</th>
-		</tr>
-		<tr>
-			<td>Total farmhand income</td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.farmhandIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.farmhandIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right;"></td>
-		</tr>
-		<tr>
-			<td>Total farmhand living costs</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _b.farmhandCosts.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤-<<= _b.farmhandCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<<if _details>>
-		<tr>
-			<td colspan="5"><b>Farmhand details</b>
-			<table style="width: 100%; font-size: 90%; line-height: 110%;">
-			<tr>
-				<th>Farmhand</th>
-				<th style="width: 10em; text-align: right">Milk/Cum/Fluids</th>
-				<th style="width: 22em; text-align: right">Revenue</th>
-				<th style="width: 11em; text-align: right">Expenses</th>
-				<th style="width: 11.5em; text-align: right">Net Income</th>
-				<th style="width: 11em; text-align: right">Rep. Change</th>
-			</tr>
-			<<set _slaveDetails = _b.income.values()>>
-			<<set _slaveInfo = _slaveDetails.next()>>
-			<<for !_slaveInfo.done>>
-				<<set _revenue = _slaveInfo.value.income, _netIncome = _revenue - _slaveInfo.value.cost>>
-				<tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none">
-					<td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
-					<td style="padding-right: 3px; text-align: right"><<= _slaveInfo.value.milk>>/<<= _slaveInfo.value.cum>>/<<= _slaveInfo.value.fluid>></td>
-					<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td>
-					<td style="padding-right: 3px; text-align: right;"></td>
-				</tr>
-				<<set _slaveInfo = _slaveDetails.next()>>
-			<</for>>
-			</table>
-			</td>
-		</tr>
-		<</if>>
-		<tr>
-			<td>Farmyard maintenance</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤-<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<tr style="border-top: 1px solid white;">
-			<td><b>Total</b></td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right"><b><<if (_b.profit > 0)>>@@.yellowgreen;¤<<= _b.profit.toFixedHTML(2)>>@@<<elseif (_b.profit < 0)>>@@.red;¤<<= _b.profit.toFixedHTML(2)>>@@<<else>>¤<<= _b.profit.toFixedHTML(2)>><</if>></b></td>
-			<td style="padding-right: 2px; text-align: right;"><b></b></td></tr>
-		</table>
-	<</if>>
-	<</if>>
-<</widget>>
-
-<<widget "ArcadeStatistics">>
-	<<if ($showEconomicDetails)>>
-	<<if (!$facility || !$facility.arcade)>>
-		<h4>- No statistics for $arcadeName gathered this week -</h4>
-	<<else>>
-		<<set _details = $args[0]>>
-		<<set _b = $facility.arcade>>
-		<<set _b.whoreIncome = (def _b.whoreIncome) ? _b.whoreIncome : 0>>
-		<<set _b.rep = (def _b.rep) ? _b.rep : 0>>
-		<<set _b.whoreCosts = (def _b.whoreCosts) ? _b.whoreCosts : 0>>
-		<<set _b.maintenance = (def _b.maintenance) ? _b.maintenance : 0>>
-		<<set _b.totalIncome = (def _b.totalIncome) ? _b.totalIncome : 0>>
-		<<set _b.totalExpenses = (def _b.totalExpenses) ? _b.totalExpenses : 0>>
-		<<set _b.profit = (def _b.profit) ? _b.profit : 0>>
-		<table border="1" style="width: 100%; padding-left: 20px; padding-right: 20px;">
-		<tr style="border-bottom: 2px solid white;">
-			<th>Items</th>
-			<th style="width: 20em; text-align: right">Revenue</th>
-			<th style="width: 10em; text-align: right">Expenses</th>
-			<th style="width: 10em; text-align: right">Net Income</th>
-			<th style="width: 10em; text-align: right">Rep. Change</th>
-		</tr>
-		<tr>
-			<td>Total income</td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _b.whoreIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right;"><<if (_b.rep > 0)>>@@.green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@.red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></td>
-		</tr>
-		<tr>
-			<td>Total fuckmeat living costs</td>
-			<td></td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 3px; text-align: right">@@.red;¤-<<= _b.whoreCosts.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<<if _details>>
-			<tr>
-			<td colspan="5"><b>Fuckmeat details</b>
-			<table style="width: 100%; font-size: 90%; line-height: 110%;">
-			<tr>
-				<th>Fuckmeat</th>
-				<th style="width: 10em; text-align: right">Customers</th>
-				<th style="width: 22em; text-align: right">Revenue</th>
-				<th style="width: 11em; text-align: right">Expenses</th>
-				<th style="width: 11.5em; text-align: right">Net Income</th>
-				<th style="width: 11em; text-align: right">Rep. Change</th>
-			</tr>
-			<<set _slaveDetails = _b.income.values()>>
-			<<set _slaveInfo = _slaveDetails.next()>>
-			<<for !_slaveInfo.done>>
-				<<set _revenue = _slaveInfo.value.income + _slaveInfo.value.adsIncome, _netIncome = _revenue - _slaveInfo.value.cost>>
-				<tr style="border-bottom: 1px solid #aaa; border-left: none; border-right: none; border-top: none">
-					<td><<if (_slaveInfo.value.customLabel)>>(@@.yellow;''_slaveInfo.value.customLabel''@@) <</if>>_slaveInfo.value.slaveName</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_slaveInfo.value.customers <= 0)>>@@.red;none@@<<else>>_slaveInfo.value.customers<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.yellowgreen;¤<<= _revenue.toFixedHTML(2)>>@@<<if (_slaveInfo.value.adsIncome > 0)>> (@@.yellowgreen;¤<<= _slaveInfo.value.adsIncome.toFixedHTML(2)>>@@ due to advertising)<</if>></td>
-					<td style="padding-right: 3px; text-align: right">@@.red;¤<<= _slaveInfo.value.cost.toFixedHTML(2)>>@@</td>
-					<td style="padding-right: 3px; text-align: right"><<if (_netIncome > 0)>>@@.yellowgreen;¤<<= _netIncome.toFixedHTML(2)>>@@<<elseif (_netIncome < 0)>>@@.red;¤<<= _netIncome.toFixedHTML(2)>>@@<<else>>¤<<= _netIncome.toFixedHTML(2)>><</if>></td>
-					<td style="padding-right: 3px; text-align: right;"><<if (_slaveInfo.value.rep > 0)>>@@.green;+<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<elseif (_slaveInfo.value.rep < 0)>>@@.red;<<= _slaveInfo.value.rep.toFixedHTML(1)>>@@<<else>><</if>></td>
-				</tr>
-				<<set _slaveInfo = _slaveDetails.next()>>
-			<</for>>
-			</table>
-			</td>
-			</tr>
-		<</if>>
-		<tr>
-			<td>Arcade maintenance</td>
-			<td></td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤-<<= _b.maintenance.toFixedHTML(2)>>@@</td>
-			<td></td>
-		</tr>
-		<tr style="border-top: 1px solid white;">
-			<td><b>Total</b></td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.totalIncome.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right">@@.red;¤<<= _b.totalExpenses.toFixedHTML(2)>>@@</td>
-			<td style="padding-right: 2px; text-align: right"><b><<if (_b.profit > 0)>>@@.yellowgreen;¤<<= _b.profit.toFixedHTML(2)>>@@<<elseif (_b.profit < 0)>>@@.red;¤<<= _b.profit.toFixedHTML(2)>>@@<<else>>¤<<= _b.profit.toFixedHTML(2)>><</if>></b></td>
-			<td style="padding-right: 2px; text-align: right;"><b><<if (_b.rep > 0)>>@@.green;+<<= _b.rep.toFixedHTML(1)>>@@<<elseif (_b.rep < 0)>>@@.red;<<= _b.rep.toFixedHTML(1)>>@@<<else>>±<<= Number(0).toFixedHTML(1)>><</if>></b></td></tr>
-		</table>
-	<</if>>
-	<</if>>
-<</widget>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 37823197d061dfd6483dd3e216b802784b8c78c7..1bd7640f3700e1547563d00072f68739135e01c1 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -176,7 +176,7 @@
 </div>
 
 <!-- Statistics output -->
-<<ArcadeStatistics 1>>
+<<includeDOM App.Facilities.Arcade.Stats(true)>>
 
 <p>
 	<<print App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.arcade)>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 6e59f20e62cb69fc1cdfdf196e77b378593b613b..627820383a6d90e10fb7ea0502ac91f15c914894 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -293,10 +293,10 @@
 	<</script>>
 
 	<!-- Statistics output -->
-	<<ArcadeStatistics 0>>
+	<<includeDOM App.Facilities.Arcade.Stats(false)>>
 	<<timed 50ms>>
 		<<replace #arcadestats>>
-			<<ArcadeStatistics 1>>
+			<<includeDOM App.Facilities.Arcade.Stats(true)>>
 		<</replace>>
 	<</timed>>
 	<br><br>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 8cecc0d4392b290e9fa91da566d9b255956f0262..e638724aa409fa41cf65e14d39fa363c3b286b61 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -250,7 +250,7 @@
 </div>
 
 <!-- Statistics output -->
-<<BrothelStatistics 1>>
+<<includeDOM App.Facilities.Brothel.Stats(true)>>
 
 <p>
 	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.brothel)>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index c6c5413c84662f0f8d5fe0afaa74e98e9a7cd17b..dd98d3a32e33cc5129f6f4e2c71bd0a06dc623d0 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -348,10 +348,10 @@
 	<</if>>
 
 	<!-- Statistics output -->
-	<<BrothelStatistics 0>>
+	<<includeDOM App.Facilities.Brothel.Stats(false)>>
 	<<timed 50ms>>
 		<<replace #brothelstats>>
-			<<BrothelStatistics 1>>
+			<<includeDOM App.Facilities.Brothel.Stats(true)>>
 		<</replace>>
 	<</timed>>
 <</if>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 2a779b3a3708938d2a7b023d220c2f62a9de0283..74fe3887039bebc101bcab61b9c8f4e59a3b3bce 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -282,7 +282,7 @@
 </div>
 
 <!-- Statistics output -->
-<<ClubStatistics 1>>
+<<includeDOM App.Facilities.Club.Stats(true)>>
 
 <p>
 	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.club)>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index c3537777ab0b052f913f4f6546b45ec0192fce45..96f2a61ae0acc1a872b7f97a0460d4db7b6336d7 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -249,10 +249,10 @@
 	<</if>>
 
 	<!-- Statistics output -->
-	<<ClubStatistics 0>>
+	<<includeDOM App.Facilities.Club.Stats(false)>>
 	<<timed 50ms>>
 		<<replace #clubstats>>
-			<<ClubStatistics 1>>
+			<<includeDOM App.Facilities.Club.Stats(true)>>
 		<</replace>>
 	<</timed>>
 <</if>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 401c090c3f4f00cf28da9bb47b4c99f34ffe7bc4..396eb8897115e729bace9738ada62020150cf479 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -715,7 +715,7 @@
 <</if>>
 
 <!-- Statistics output -->
-<<DairyStatistics 1>>
+<<includeDOM App.Facilities.Dairy.Stats(true)>>
 
 <p>
 	<<set _facility = App.Entity.facilities.dairy>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 984e6ee5a28573f144afd7a054f5a40b3ca17976..b83bd981ccb9bdb28f637c38a4c50cdc36e605ad 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1179,10 +1179,10 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
 
 <<if _DL > 0>>
 	<!-- Statistics output -->
-	<<DairyStatistics 0>>
+	<<includeDOM App.Facilities.Dairy.Stats(false)>>
 	<<timed 50ms>>
 		<<replace #dairystats>>
-			<<DairyStatistics 1>>
+			<<includeDOM App.Facilities.Dairy.Stats(true)>>
 		<</replace>>
 	<</timed>>
 <</if>>