diff --git a/.DS_Store b/.DS_Store
index a52e3d5..d31d0bf 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/COMBO_MO_MOBIL.htm b/COMBO_MO_MOBIL.htm
index 94b8b0e..c0856d6 100644
--- a/COMBO_MO_MOBIL.htm
+++ b/COMBO_MO_MOBIL.htm
@@ -27,7 +27,7 @@
 		p          { margin: 0 0.500rem; line-height: 0.750rem; }
 		svg        { margin: auto; display: block; }
 		.info      { font-weight: normal; color: gray; }
-		.theme     { font-weight: bold; color: black; }
+		.theme     { font-weight: normal; color: black; }
 		.name      { font-weight: normal; font-style: italic; color: #333333; text-align: right; white-space: nowrap; }
 		.infobox   { width: 1.000rem; height: 1.000rem; line-height: 1.000rem; font-size: 0.625rem; font-weight: bold; text-align: center; color: white; }
 		.starttime { width: auto; height: 1.500rem; line-height: 1.500rem; margin: auto; font-size: 0.625rem; color: black; }
@@ -65,9 +65,10 @@
 		#outgoing  { margin: 0 3.000rem; }
 		#technik   { margin: 0 3.000rem; }
 		#week      { page-break-after: always; }
+		tr.heigher { height: 1.8rem;}
 		div#outgoing:not(:first-child) { display: none; }
 	</style>
-    <!--@JS-DATA@--><script>const myDATA ={'29.04.24': ['', '2', 'Russisch', '0', ' - 14:30 Uhr', '1', ' - Lothar Hoffmann', '1', ' - 09:30 Uhr', '1', ' - Peter Dörsam', '4', ' - 14:00 Uhr', '2', ' - Jürgen Zielke', '5', '', '3', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '']}</script>
+    <!--@JS-DATA@-->
 	
 </head>
 
@@ -79,7 +80,7 @@
 				<h2 style="color: black; margin-top: 1rem; margin-bottom: -1rem;">
 					!CONGREGATION_TITLE! - !WEEKSTARTING!#IF !EXCEPTION!# (!EXCEPTION!)#ELSEIF !CONVENTION!# (!EXCEPTION! !NO_MEETING!)#ENDIF#
 					<br>
-					<p style="font-size: 0.75rem; color: gray;">Zoom-Versammlung: ID:612 011 9044 / PW: 918 915</p>
+					<p style="font-size: 0.75rem; color: gray;">Zoom-Versammlung: ID: 612 011 9044 / PW: 918915 -- Zoom-Dienst: ID: 922 886 3912 / PW: 918915</p>
 				</h2>
 			</section>
 			<p style="display: none;">!Service_START!</p>
@@ -95,23 +96,23 @@
 			</div>
 			<div id="s">
 				<table>
-					<tr>
+					<tr class="heigher">
 						<td style="width: 2.750rem;"><div class="infobox starttime s">Infos</div></td>
-						<td><p class="theme" style="text-align: left"><b>Gastfreundschaft </b> <span class="info CustomElem"></p></td>
-						<td><p class="theme" style="text-align: left"><b>Reinigung </b> <span class="info CustomElem"></p></td>
-						<td><p class="theme" style="text-align: left"><b>Zoom-Dienst</b> <span class="info">ID: 922 886 3912 / PW: 918915</p></p></td>
+						<td><p class="theme" style="text-align: left"><b>Gastfreundschaft: </b> <span class="info CustomElem"></p></td>
+						<td><p class="theme" style="text-align: left"><b>Allgemein-Reinigung: </b> <span class="info CustomElem"></p></td>
+						<td><p class="theme" style="text-align: left"><b>Zwischen-Reinigung: </b> <span class="info CustomElem"></p></td>
 					</tr>
-					<tr>
+					<tr class="heigher">
 						<td style="width: 2.750rem;"><div class="infobox starttime s">Dienst</div></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
 					</tr>
-					<tr>
+					<tr class="heigher">
 						<td style="width: 2.750rem;"><div class="infobox starttime s">Dienst</div></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
-						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><br> <span class="info CustomElem"></span><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
+						<td><p class="theme" style="text-align: left"><b><span class="CustomElem"></span><span class="CustomElem"></span></b><span class="info CustomElem"></span><br><span class="info CustomElem"></span></p></td>
 					</tr>
 				</table>
 			</div>
@@ -159,11 +160,13 @@
 				<table>
 					<!--GW Title-->
 					<tr>
-						<td>#IF !DURATION!#<div class="infobox duration gw"></div>#ELSE#
-							<div class="infobox starttime gw"></div>#ENDIF#
+						<td style="background-color: rgba(101, 97, 100, 1); width: 2.750rem; height: 2.000rem; text-align: center;">
+							<svg width="66.7%" height="66.7%" viewBox="0 0 1024 1024">
+								<path d="M1019 295L879 28q-6-12-20-20t-27-8H192q-13 0-27 8t-20 20L5 290q-6 12-5 28t9 26l480 670q8 10 19 10q5 0 10-2.5t9-7.5l488-664q16-23 6-50q-1-3-2-5zm-77-7H771l69-197zM575 64h206l-64 183zm93 224H371L511 86zm-354-31L250 64h199zm367 95L509 844L345 352h336zM437 831L93 352h185zm312-479h185L581 832zM188 82l69 206H79z" fill="#ffffff" />
+							</svg>
 						</td>
 						<td colspan="4">
-							<p><b><span class="gw">!GW! (!LM_SOURCE!)</span></b></p>
+							<p><b><span class="gw" style="font-size: 0.85rem;">!GW! (!LM_SOURCE!)</span></b></p>
 						</td>
 					</tr>
 					<!--GW Talk-->
@@ -237,11 +240,21 @@
 				<table>
 					<!--FM Title-->
 					<tr>
-						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration fm"></div>#ELSE#
-							<div class="infobox starttime fm"></div>#ENDIF#
+						<td style="background-color: rgba(199, 137, 9, 1); width: 2.750rem; height: 2.000rem; text-align: center;">
+							<svg width="75%" height="75%" viewBox="0 0 33.334 100">
+								<path d="M19.445,41.667l11.11-11.111c2.778-2.778,2.778-2.778,2.778-13.889l-11.111,11.11C19.445,30.556,19.445,30.556,19.445,41.667z" fill="white" />
+								<path d="M33.334,0L22.223,11.111c-2.777,2.777-2.777,2.777-2.777,13.889l11.11-11.111C33.334,11.111,33.334,11.111,33.334,0z" fill="white" />
+								<path d="M13.89,41.667c0-11.111,0-11.111-2.778-13.89L0,16.667c0,11.11,0,11.11,2.778,13.889L13.89,41.667z" fill="white" />
+								<path d="M19.445,58.333l11.11-11.11c2.778-2.778,2.778-2.778,2.778-13.89L22.223,44.444C19.445,47.223,19.445,47.223,19.445,58.333z" fill="white" />
+								<path d="M13.89,58.333c0-11.11,0-11.11-2.778-13.889L0,33.333c0,11.111,0,11.111,2.778,13.89L13.89,58.333z" fill="white" />
+								<path d="M19.445,75l11.11-11.111c2.778-2.777,2.778-2.777,2.778-13.889L22.223,61.111C19.445,63.889,19.445,63.889,19.445,75z" fill="white" />
+								<path d="M13.89,75c0-11.111,0-11.111-2.778-13.889L0,50c0,11.111,0,11.111,2.778,13.889L13.89,75z" fill="white" />
+								<path d="M13.89,25c0-11.111,0-11.111-2.778-13.889L0,0c0,11.111,0,11.111,2.778,13.889L13.89,25z" fill="white" />
+								<path d="M16.667,83.333L0,66.667c0,11.11,0,11.11,2.778,13.889L13.89,91.667V100h5.556v-8.333l11.11-11.111c2.778-2.778,2.778-2.778,2.778-13.889L16.667,83.333z" fill="white" />
+							</svg>
 						</td>
 						<td colspan="4">
-							<p><b><span class="fm">!FM!</span></b></p>
+							<p><b><span class="fm" style="font-size: 0.85rem;">!FM!</span></b></p>
 						</td>
 					</tr>
 					<!--FM Talk 1-->
@@ -347,11 +360,13 @@
 			<div id="cl">
 				<table>
 					<tr>
-						<td>#IF !DURATION!#<div class="infobox duration cl"></div>#ELSE#
-							<div class="infobox starttime cl"></div>#ENDIF#
+						<td style="background-color: rgba(153, 19, 30, 1); width: 2.750rem; height: 2.000rem; text-align: center;">
+							<svg width="90%" height="90%" viewBox="0 0 100 100">
+								<path d="m 55.597646,70.013108 -5.940517,18.033439 -4.230019,0 2.745531,-18.056554 7.425005,0.02311 0,0 z m -37.547513,0.887353 6.517105,17.146086 -4.230019,0 -7.780717,-13.954952 5.493631,-3.191134 0,0 z M 64.304242,15.884538 c 0,-2.168944 1.758013,-3.928241 3.928241,-3.928241 0,0 14.891103,-0.0064 15.023372,0 1.738751,0.09117 3.46466,0.739675 4.901633,1.9455 L 100,23.837332 l 0,1.832494 c 0,2.709575 -2.197201,4.905486 -4.905491,4.905486 l -16.792938,0 0,1.421564 6.113879,2.676186 c 0,0 -4.626824,10.388844 -8.018286,18.843744 -4.087477,10.188514 -10.301521,12.493579 -11.416171,12.82746 l 2.199764,21.700997 -4.228734,0 -6.03683,-21.654767 -38.107407,-0.115574 -11.9439587,6.92932 -2.63381,14.841021 -4.23001806500003,0 0,-18.934919 L 6.2384423,62.873186 l 0,-11.045049 c -1.118503,0.895059 -2.367989,1.632166 -3.716355,2.177933 l 0,-12.860848 c 0,-3.77029 1.403585,-7.213119 3.716355,-9.834087 1.516591,-1.718204 3.4222815,-3.083265 5.5809527,-3.957777 1.722057,-0.696014 3.604633,-1.079977 5.575817,-1.079977 l 45.335936,0 9.602938,-8.058095 c -0.453308,0.0565 -0.914321,0.08604 -1.383039,0.08604 -2.49512,0 -4.797617,-0.829567 -6.646805,-2.226731 l 0,-0.190056 0,0 z" fill="white" />
+							</svg>
 						</td>
 						<td colspan="2">
-							<p><b><span class="cl">!CL!</span></b></p>
+							<p><b><span class="cl" style="font-size: 0.85rem;">!CL!</span></b></p>
 							<p class="info">!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#</p>
 						</td>
 					</tr>
@@ -443,10 +458,10 @@
 			<div id="other">
 				<table style="margin-top: 1.5rem;">
 					<tr>#IF !WT_NO!#
-						<td style="width: 2.750rem; background-color: !WT_LIGHT_COLOR!;">
+						<td style="width: 2.750rem; background-color: rgba(185, 140, 140, 0.44);">
 						</td>#ENDIF#
-						<td style="background-color: !WT_LIGHT_COLOR!; padding-left: 0.250rem;">
-							<h3 style="text-align: left; color: rgba(189, 101, 101, 0.67);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
+						<td style="background-color: rgba(185, 140, 140, 0.44); padding-left: 0.250rem;">
+							<h3 style="text-align: left; color: rgba(188, 86, 86, 0.843);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
 						</td>
 					</tr>
 				</table>
@@ -456,7 +471,7 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG1_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG1_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
 							<p class="info">!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!</p>
@@ -471,12 +486,12 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!PT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67);">Vortrag</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">Vortrag</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="theme">!PT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!PT_SPEAKER! <span class="info">(!PT_SPEAKER_CONGREGATION!)</span></p>
 						</td>
 					</tr>
@@ -486,31 +501,57 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!WT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67)">WT</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">WT</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="info" st>!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#</span></p>
 							<p class="theme">!WT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!WT_CONDUCTOR! <span class="info">(!CONDUCTOR!)</span>#IF !CO_VISIT! EMPTY##IF !WT_READER!#<br><span class="name">!WT_READER! <span class="info">(!READER!)</span>#ENDIF##ENDIF#</span></p>
 						</td>
 					</tr>
 				</table>
 			</div>
+			<p>#IF !CO_VISIT!#</p>
 			<div id="other">
 				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration cob">!FT_TIME!</div>#ELSE#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!FT_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="theme">!FT_THEME!</p>
+						</td>
+						<td>
+							<p class="name">!CO_NAME! <span class="info">(!CO!)</p>
+						</td>
+					</tr>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG3_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
-							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!PT_SPEAKER!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!CO_NAME!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
 						</td>
-						<td></td>
 					</tr>
 				</table>
 			</div>
+			<p>#ENDIF#</p>
+			<p>#IF !CO_VISIT! EMPTY#</p>
+			<div id="other">
+				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#<span class="name">(!PRAYER2_NAME!)</span>#ENDIF#</p>
+						</td>
+					</tr>
+				</table>
+			</div>
+            <P>#ENDIF#</P>
 			<p>#ENDIF#</p>
 			<p>#ENDIF#</p>
 			<p>#IF !NO_MEETING_EXCEPTION! EMPTY#</p><p>#IF !VIRTUAL_CONVENTION!#</p>
@@ -630,29 +671,31 @@
 		</div>
 		<script>
 			window.weekdate.push("!WEEKSTARTING!".replace("Woche vom ", ""))
+			// window.weekdate.push("20.10.2024".replace("Woche vom ", ""))
 		</script>
 		<p>!REPEAT_END!</p>
 	</main>
 	<script>
 		const ordner_elements = document.querySelectorAll('.CustomElem');
-		const weekdays = ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sonntag']
+		const weekdays_comp = ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sonntag']
+		const weekdays = ['Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.', 'So.']
 		const service_type = ['Zoom', 'Saal', 'Gruppe']
 
 		function setData(myDATA){
 			let weeklistpos = 0;
 			let myIndex = 0;
 			ordner_elements.forEach((element) => {
-				if (myIndex == 37){
+				if (myIndex == 36){
 					myIndex = 0;
 					weeklistpos = weeklistpos + 1;
 				}
 				if( window.weekdate[weeklistpos] in myDATA ){
 					
-					if ([4, 8, 12, 16, 20, 24].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
+					if ([5, 9, 13, 17, 21, 25].includes(myIndex+1) && myDATA[window.weekdate[weeklistpos]][myIndex] != "") {
 					
 						element.innerHTML = weekdays[myDATA[window.weekdate[weeklistpos]][myIndex]];
 
-					} 
+					}
 					else {
 
 						element.innerHTML = myDATA[window.weekdate[weeklistpos]][myIndex];
@@ -668,17 +711,4 @@
 	</script>
 </body>
 
-</html>window.weekdate[weeklistpos]][myIndex];
-
-					}
-				
-				}
-				myIndex = myIndex + 1;
-		});
-		}
-		
-		setData(myDATA)
-	</script>
-</body>
-
 </html>
\ No newline at end of file
diff --git a/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm b/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm
index 1b0612b..78a496e 100644
--- a/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm
+++ b/theocbase_templates/COMBO_MO_MOBIL_VORLAGE.htm
@@ -458,10 +458,10 @@
 			<div id="other">
 				<table style="margin-top: 1.5rem;">
 					<tr>#IF !WT_NO!#
-						<td style="width: 2.750rem; background-color: !WT_LIGHT_COLOR!;">
+						<td style="width: 2.750rem; background-color: rgba(185, 140, 140, 0.44);">
 						</td>#ENDIF#
-						<td style="background-color: !WT_LIGHT_COLOR!; padding-left: 0.250rem;">
-							<h3 style="text-align: left; color: rgba(189, 101, 101, 0.67);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
+						<td style="background-color: rgba(185, 140, 140, 0.44); padding-left: 0.250rem;">
+							<h3 style="text-align: left; color: rgba(188, 86, 86, 0.843);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
 						</td>
 					</tr>
 				</table>
@@ -471,7 +471,7 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG1_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG1_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
 							<p class="info">!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!</p>
@@ -486,12 +486,12 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!PT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67);">Vortrag</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">Vortrag</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="theme">!PT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!PT_SPEAKER! <span class="info">(!PT_SPEAKER_CONGREGATION!)</span></p>
 						</td>
 					</tr>
@@ -501,31 +501,57 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!WT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67)">WT</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">WT</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="info" st>!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#</span></p>
 							<p class="theme">!WT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!WT_CONDUCTOR! <span class="info">(!CONDUCTOR!)</span>#IF !CO_VISIT! EMPTY##IF !WT_READER!#<br><span class="name">!WT_READER! <span class="info">(!READER!)</span>#ENDIF##ENDIF#</span></p>
 						</td>
 					</tr>
 				</table>
 			</div>
+			<p>#IF !CO_VISIT!#</p>
 			<div id="other">
 				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration cob">!FT_TIME!</div>#ELSE#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!FT_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="theme">!FT_THEME!</p>
+						</td>
+						<td>
+							<p class="name">!CO_NAME! <span class="info">(!CO!)</p>
+						</td>
+					</tr>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG3_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
-							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!PT_SPEAKER!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!CO_NAME!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<p>#ENDIF#</p>
+			<p>#IF !CO_VISIT! EMPTY#</p>
+			<div id="other">
+				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#<span class="name">(!PRAYER2_NAME!)</span>#ENDIF#</p>
 						</td>
-						<td></td>
 					</tr>
 				</table>
 			</div>
+            <P>#ENDIF#</P>
 			<p>#ENDIF#</p>
 			<p>#ENDIF#</p>
 			<p>#IF !NO_MEETING_EXCEPTION! EMPTY#</p><p>#IF !VIRTUAL_CONVENTION!#</p>
@@ -659,7 +685,7 @@
 			let weeklistpos = 0;
 			let myIndex = 0;
 			ordner_elements.forEach((element) => {
-				if (myIndex == 36){
+				if (myIndex == 37){
 					myIndex = 0;
 					weeklistpos = weeklistpos + 1;
 				}
diff --git a/theocbase_templates/COMBO_MO_PC.htm b/theocbase_templates/COMBO_MO_PC.htm
index e00354f..e5d347e 100755
--- a/theocbase_templates/COMBO_MO_PC.htm
+++ b/theocbase_templates/COMBO_MO_PC.htm
@@ -456,10 +456,10 @@
 			<div id="other">
 				<table style="margin-top: 1.5rem;">
 					<tr>#IF !WT_NO!#
-						<td style="width: 2.750rem; background-color: !WT_LIGHT_COLOR!;">
+						<td style="width: 2.750rem; background-color: rgba(185, 140, 140, 0.44);">
 						</td>#ENDIF#
-						<td style="background-color: !WT_LIGHT_COLOR!; padding-left: 0.250rem;">
-							<h3 style="text-align: left; color: rgba(189, 101, 101, 0.67);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
+						<td style="background-color: rgba(185, 140, 140, 0.44); padding-left: 0.250rem;">
+							<h3 style="text-align: left; color: rgba(188, 86, 86, 0.843);">!TITLE! (!DATE ddd dd.MM.!#IF !DURATION!# - !BEGIN! !PM_STARTTIME!#ENDIF#)
 						</td>
 					</tr>
 				</table>
@@ -469,7 +469,7 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG1_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG1_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
 							<p class="info">!SONG! #IF !SONG1_NO!#!SONG1_NO!#IF !SONG1_NAME!#: !SONG1_NAME!#ENDIF##ENDIF# & !PRAYER!</p>
@@ -484,12 +484,12 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!PT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67);">Vortrag</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">Vortrag</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="theme">!PT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!PT_SPEAKER! <span class="info">(!PT_SPEAKER_CONGREGATION!)</span></p>
 						</td>
 					</tr>
@@ -499,31 +499,57 @@
 				<table>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration">!WT_TIME!</div>#ELSE#
-							<div class="infobox starttime" style="background-color: rgba(189, 101, 101, 0.67)">WT</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">WT</div>#ENDIF#
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="info" st>!SONG! !SONG2_NO!#IF !SONG2_NAME!#: !SONG2_NAME!#ENDIF#</span></p>
 							<p class="theme">!WT_THEME!</p>
 						</td>
-						<td style="background-color: rgba(227, 120, 120, 0.118)">
+						<td style="background-color: white">
 							<p class="name">!WT_CONDUCTOR! <span class="info">(!CONDUCTOR!)</span>#IF !CO_VISIT! EMPTY##IF !WT_READER!#<br><span class="name">!WT_READER! <span class="info">(!READER!)</span>#ENDIF##ENDIF#</span></p>
 						</td>
 					</tr>
 				</table>
 			</div>
+			<p>#IF !CO_VISIT!#</p>
 			<div id="other">
 				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION!#<div class="infobox duration cob">!FT_TIME!</div>#ELSE#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!FT_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="theme">!FT_THEME!</p>
+						</td>
+						<td>
+							<p class="name">!CO_NAME! <span class="info">(!CO!)</p>
+						</td>
+					</tr>
 					<tr>
 						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
-							<div class="infobox starttime" style="background-color: !WT_LIGHT_COLOR!;">!SONG3_STARTTIME!</div>#ENDIF#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
 						</td>
 						<td>
-							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!PT_SPEAKER!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! <span class="name">#IF !PRAYER2_NAME! EMPTY# (!CO_NAME!)#ELSE# (!PRAYER2_NAME!)</span>#ENDIF#</p>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<p>#ENDIF#</p>
+			<p>#IF !CO_VISIT! EMPTY#</p>
+			<div id="other">
+				<table>
+					<tr>
+						<td style="width: 2.750rem;">#IF !DURATION! EMPTY#
+							<div class="infobox starttime" style="background-color: rgba(185, 140, 140, 0.44);">!SONG3_STARTTIME!</div>#ENDIF#
+						</td>
+						<td>
+							<p class="info">!SONG! !SONG3_NO!#IF !SONG3_NAME!#: !SONG3_NAME!#ENDIF# & !PRAYER! #IF !PRAYER2_NAME!#<span class="name">(!PRAYER2_NAME!)</span>#ENDIF#</p>
 						</td>
-						<td></td>
 					</tr>
 				</table>
 			</div>
+            <P>#ENDIF#</P>
 			<p>#ENDIF#</p>
 			<p>#ENDIF#</p>
 			<p>#IF !NO_MEETING_EXCEPTION! EMPTY#</p><p>#IF !VIRTUAL_CONVENTION!#</p>