diff --git a/epg_events.cpp b/epg_events.cpp
index e9931f7f..59fdd1b2 100644
--- a/epg_events.cpp
+++ b/epg_events.cpp
@@ -287,7 +287,7 @@ namespace vdrlive
 
 			eventId += channelId;
 			eventId += '_';
-			eventId += lexical_cast<std::string>(eId);
+			eventId += cSv(cToSvInt(eId));
 			return eventId;
 		}
 
@@ -303,7 +303,7 @@ namespace vdrlive
 			std::string const eIdStr = epgid.substr(delimPos+1);
 
 			channelId = tChannelID::FromString(cIdStr.c_str());
-			eventId = lexical_cast<tEventID>(eIdStr);
+			eventId = parse_int<tEventID>(eIdStr);
 		}
 
 		EpgInfoPtr CreateEpgInfo(std::string const &epgid, cSchedules const *schedules)
diff --git a/epgsearch.cpp b/epgsearch.cpp
index bde6f6f2..13fa57d1 100644
--- a/epgsearch.cpp
+++ b/epgsearch.cpp
@@ -56,8 +56,8 @@ void SearchTimer::Init()
 	m_useDayOfWeek = false;
 	m_dayOfWeek = 0;
 	m_useEpisode = false;
-	m_priority = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefPriority"));
-	m_lifetime = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefLifetime"));
+	m_priority = parse_int<int>(EPGSearchSetupValues::ReadValue("DefPriority"));
+	m_lifetime = parse_int<int>(EPGSearchSetupValues::ReadValue("DefLifetime"));
 	m_fuzzytolerance = 1;
 	m_useInFavorites = false;
 	m_useAsSearchtimer = 0;
@@ -68,8 +68,8 @@ void SearchTimer::Init()
 	m_switchMinBefore = 1;
 	m_useExtEPGInfo = false;
 	m_useVPS = false;
-	m_marginstart = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStart"));
-	m_marginstop = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStop"));
+	m_marginstart = parse_int<int>(EPGSearchSetupValues::ReadValue("DefMarginStart"));
+	m_marginstop = parse_int<int>(EPGSearchSetupValues::ReadValue("DefMarginStop"));
 	m_avoidrepeats = false;
 	m_allowedrepeats = 0;
 	m_compareTitle = false;
@@ -95,55 +95,55 @@ SearchTimer::SearchTimer( std::string const& data )
       std::vector<std::string>::const_iterator part = parts.begin();
       for ( int i = 0; part != parts.end(); ++i, ++part ) {
 			switch ( i ) {
-			case  0: m_id = lexical_cast<int>( *part ); break;
+			case  0: m_id = parse_int<int>( *part ); break;
 			case  1: m_search = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
 			case  2: m_useTime = lexical_cast<bool>( *part ); break;
-			case  3: if ( m_useTime ) m_startTime = lexical_cast<int>( *part ); break;
-			case  4: if ( m_useTime ) m_stopTime = lexical_cast<int>( *part ); break;
-			case  5: m_useChannel = lexical_cast<int>( *part ); break;
+			case  3: if ( m_useTime ) m_startTime = parse_int<int>( *part ); break;
+			case  4: if ( m_useTime ) m_stopTime = parse_int<int>( *part ); break;
+			case  5: m_useChannel = parse_int<int>( *part ); break;
 			case  6: ParseChannel( *part ); break;
-			case  7: m_useCase = lexical_cast<int>( *part ); break;
-			case  8: m_mode = lexical_cast<int>( *part ); break;
+			case  7: m_useCase = parse_int<int>( *part ); break;
+			case  8: m_mode = parse_int<int>( *part ); break;
 			case  9: m_useTitle = lexical_cast<bool>( *part ); break;
 			case 10: m_useSubtitle = lexical_cast<bool>( *part ); break;
 			case 11: m_useDescription = lexical_cast<bool>( *part ); break;
 			case 12: m_useDuration = lexical_cast<bool>( *part ); break;
-			case 13: if ( m_useDuration ) m_minDuration = lexical_cast<int>( *part ); break;
-			case 14: if ( m_useDuration ) m_maxDuration = lexical_cast<int>( *part ); break;
-			case 15: m_useAsSearchtimer = lexical_cast<int>( *part ); break;
+			case 13: if ( m_useDuration ) m_minDuration = parse_int<int>( *part ); break;
+			case 14: if ( m_useDuration ) m_maxDuration = parse_int<int>( *part ); break;
+			case 15: m_useAsSearchtimer = parse_int<int>( *part ); break;
 			case 16: m_useDayOfWeek = lexical_cast<bool>( *part ); break;
-			case 17: m_dayOfWeek = lexical_cast<int>( *part ); break;
+			case 17: m_dayOfWeek = parse_int<int>( *part ); break;
 			case 18: m_useEpisode = lexical_cast<bool>( *part ); break;
 			case 19: m_directory = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
-			case 20: m_priority = lexical_cast<int>( *part ); break;
-			case 21: m_lifetime = lexical_cast<int>( *part ); break;
-			case 22: m_marginstart = lexical_cast<int>( *part ); break;
-			case 23: m_marginstop = lexical_cast<int>( *part ); break;
+			case 20: m_priority = parse_int<int>( *part ); break;
+			case 21: m_lifetime = parse_int<int>( *part ); break;
+			case 22: m_marginstart = parse_int<int>( *part ); break;
+			case 23: m_marginstop = parse_int<int>( *part ); break;
 			case 24: m_useVPS = lexical_cast<bool>( *part ); break;
-			case 25: m_action = lexical_cast<int>( *part ); break;
+			case 25: m_action = parse_int<int>( *part ); break;
 			case 26: m_useExtEPGInfo = lexical_cast<bool>( *part ); break;
 			case 27: ParseExtEPGInfo( *part ); break;
 			case 28: m_avoidrepeats = lexical_cast<bool>( *part ); break;
-			case 29: m_allowedrepeats = lexical_cast<int>( *part ); break;
+			case 29: m_allowedrepeats = parse_int<int>( *part ); break;
 			case 30: m_compareTitle = lexical_cast<bool>( *part ); break;
-			case 31: m_compareSubtitle = lexical_cast<int>( *part ); break;
+			case 31: m_compareSubtitle = parse_int<int>( *part ); break;
 			case 32: m_compareSummary = lexical_cast<bool>( *part ); break;
-			case 33: m_catvaluesAvoidRepeat = lexical_cast< long >( *part ); break;
-			case 34: m_repeatsWithinDays = lexical_cast<int>( *part ); break;
-			case 35: m_delAfterDays = lexical_cast<int>( *part ); break;
-			case 36: m_recordingsKeep = lexical_cast<int>( *part ); break;
-			case 37: m_switchMinBefore = lexical_cast<int>( *part ); break;
-			case 38: m_pauseOnNrRecordings = lexical_cast<int>( *part ); break;
-			case 39: m_blacklistmode = lexical_cast<int>( *part ); break;
+			case 33: m_catvaluesAvoidRepeat = parse_int< unsigned long >( *part ); break;
+			case 34: m_repeatsWithinDays = parse_int<int>( *part ); break;
+			case 35: m_delAfterDays = parse_int<int>( *part ); break;
+			case 36: m_recordingsKeep = parse_int<int>( *part ); break;
+			case 37: m_switchMinBefore = parse_int<int>( *part ); break;
+			case 38: m_pauseOnNrRecordings = parse_int<int>( *part ); break;
+			case 39: m_blacklistmode = parse_int<int>( *part ); break;
 			case 40: ParseBlacklist( *part ); break;
-			case 41: m_fuzzytolerance = lexical_cast<int>( *part ); break;
+			case 41: m_fuzzytolerance = parse_int<int>( *part ); break;
 			case 42: m_useInFavorites = lexical_cast<bool>( *part ); break;
-			case 43: m_menuTemplate = lexical_cast<int>( *part ); break;
-			case 44: m_delMode = lexical_cast<int>( *part ); break;
-			case 45: m_delAfterCountRecs = lexical_cast<int>( *part ); break;
-			case 46: m_delAfterDaysOfFirstRec = lexical_cast<int>( *part ); break;
-			case 47: m_useAsSearchTimerFrom = lexical_cast<time_t>( *part ); break;
-			case 48: m_useAsSearchTimerTil = lexical_cast<time_t>( *part ); break;
+			case 43: m_menuTemplate = parse_int<int>( *part ); break;
+			case 44: m_delMode = parse_int<int>( *part ); break;
+			case 45: m_delAfterCountRecs = parse_int<int>( *part ); break;
+			case 46: m_delAfterDaysOfFirstRec = parse_int<int>( *part ); break;
+			case 47: m_useAsSearchTimerFrom = parse_int<time_t>( *part ); break;
+			case 48: m_useAsSearchTimerTil = parse_int<time_t>( *part ); break;
 			case 49: m_ignoreMissingEPGCats = lexical_cast<bool>( *part ); break;
 			}
 		}
@@ -275,10 +275,10 @@ std::string SearchTimer::ToText()
 void SearchTimer::ParseChannel( std::string const& data )
 {
 	switch ( m_useChannel ) {
-	case NoChannel: m_channels = tr("All"); break;
-	case Interval: ParseChannelIDs( data ); break;
-	case Group: m_channels = data; break;
-	case FTAOnly: m_channels = tr("FTA"); break;
+    case NoChannel: m_channels = tr("All"); break;
+    case Interval: ParseChannelIDs( data ); break;
+    case Group: m_channels = data; break;
+    case FTAOnly: m_channels = tr("FTA"); break;
 	}
 }
 
@@ -287,12 +287,8 @@ void SearchTimer::ParseChannelIDs( std::string const& data )
 	std::vector<std::string> parts = StringSplit( data, '|' );
 	m_channelMin = lexical_cast<tChannelID>( parts[ 0 ] );
 
-#if VDRVERSNUM >= 20301
 	LOCK_CHANNELS_READ;
 	cChannel const* channel = Channels->GetByChannelID( m_channelMin );
-#else
-	cChannel const* channel = Channels.GetByChannelID( m_channelMin );
-#endif
 	if ( channel != 0 )
 		m_channels = channel->Name();
 
@@ -401,11 +397,9 @@ bool SearchTimers::Save(SearchTimer* searchtimer)
 
 SearchTimer* SearchTimers::GetByTimerId( std::string const& id )
 {
-   for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
-      if (timer->Id() == lexical_cast<int>(id))
-         return &*timer;
-   return NULL;
-
+  for (SearchTimers::iterator timer = m_timers.begin(); timer != m_timers.end(); ++timer)
+    if (timer->Id() == parse_int<int>(id)) return &*timer;
+  return NULL;
 }
 
 bool SearchTimers::ToggleActive(std::string const& id)
@@ -425,7 +419,7 @@ bool SearchTimers::Delete(std::string const& id)
 	if ( !CheckEpgsearchVersion() || cPluginManager::CallFirstService(ServiceInterface, &service) == 0 )
 		throw HtmlError( tr("EPGSearch version outdated! Please update.") );
 
-	if (service.handler->DelSearchTimer(lexical_cast<int>( id )))
+	if (service.handler->DelSearchTimer(parse_int<int>( id )))
 		return Reload();
 	return false;
 }
@@ -447,23 +441,20 @@ bool SearchTimer::BlacklistSelected(int id) const
 
 ExtEPGInfo::ExtEPGInfo( std::string const& data )
 {
-   m_id = -1;
-   m_searchmode = 0;
-
-   std::vector<std::string> parts = StringSplit( data, '|' );
-   try {
-      std::vector<std::string>::const_iterator part = parts.begin();
-      for ( int i = 0; part != parts.end(); ++i, ++part ) {
-         switch ( i ) {
-			case  0: m_id = lexical_cast<int>( *part ); break;
-			case  1: m_name = *part; break;
-			case  2: m_menuname = *part; break;
-			case  3: ParseValues( *part ); break;
-			case  4: m_searchmode = lexical_cast<int>( *part ); break;
-         }
-      }
-   } catch ( bad_lexical_cast const& ex ) {
-   }
+  m_id = -1;
+  m_searchmode = 0;
+
+  std::vector<std::string> parts = StringSplit( data, '|' );
+  std::vector<std::string>::const_iterator part = parts.begin();
+  for ( int i = 0; part != parts.end(); ++i, ++part ) {
+    switch ( i ) {
+      case  0: m_id = parse_int<int>( *part ); break;
+      case  1: m_name = *part; break;
+      case  2: m_menuname = *part; break;
+      case  3: ParseValues( *part ); break;
+      case  4: m_searchmode = parse_int<int>( *part ); break;
+     }
+  }
 }
 
 void ExtEPGInfo::ParseValues( std::string const& data )
@@ -529,7 +520,7 @@ Blacklist::Blacklist( std::string const& data )
       std::vector<std::string>::const_iterator part = parts.begin();
       for ( int i = 0; part != parts.end(); ++i, ++part ) {
 			switch ( i ) {
-			case  0: m_id = lexical_cast<int>( *part ); break;
+			case  0: m_id = parse_int<int>( *part ); break;
 			case  1: m_search = StringReplace( StringReplace( *part, "|", ":" ), "!^pipe^!", "|" ); break;
 			}
 		}
@@ -555,18 +546,18 @@ SearchResult::SearchResult( std::string const& data )
 		std::vector<std::string>::const_iterator part = parts.begin();
 		for ( int i = 0; part != parts.end(); ++i, ++part ) {
 			switch ( i ) {
-			case  0: m_searchId = lexical_cast<int>( *part ); break;
-			case  1: m_eventId = lexical_cast<u_int32_t>( *part ); break;
+			case  0: m_searchId = parse_int<int>( *part ); break;
+			case  1: m_eventId = parse_int<tEventID>( *part ); break;
 			case  2: m_title = StringReplace( *part, "|", ":" ); break;
 			case  3: m_shorttext = StringReplace( *part, "|", ":" ); break;
 			case  4: m_description = StringReplace( *part, "|", ":" ); break;
-			case  5: m_starttime = lexical_cast<unsigned long>( *part ); break;
-			case  6: m_stoptime = lexical_cast<unsigned long>( *part ); break;
+			case  5: m_starttime = parse_int<time_t>( *part ); break;
+			case  6: m_stoptime = parse_int<time_t>( *part ); break;
 			case  7: m_channel = lexical_cast<tChannelID>( *part ); break;
-			case  8: m_timerstart = lexical_cast<unsigned long>( *part ); break;
-			case  9: m_timerstop = lexical_cast<unsigned long>( *part ); break;
+			case  8: m_timerstart = parse_int<time_t>( *part ); break;
+			case  9: m_timerstop = parse_int<time_t>( *part ); break;
 			case 10: m_file = *part; break;
-			case 11: m_timerMode = lexical_cast<int>( *part ); break;
+			case 11: m_timerMode = parse_int<int>( *part ); break;
 			}
 		}
 	} catch ( bad_lexical_cast const& ex ) {
diff --git a/live/css/styles.css b/live/css/styles.css
index 5173a511..ce6d7912 100644
--- a/live/css/styles.css
+++ b/live/css/styles.css
@@ -316,7 +316,8 @@ img.artwork {
 	width: 480px
 }
 img.channel_logo {
-	max-height:32px; max-width:150px; vertical-align:middle;
+	max-height:32px; max-width:140px; vertical-align:middle;
+	background-color: #E9EFFF;
 }
 /* ##############################
    # Infowin styles for epg infos
@@ -1475,6 +1476,9 @@ img.actor {
 .hint-tip {
  	max-width: 200px; /* depends on the tip backround image width */
 }
+img.channel_logo {
+	max-height:32px; max-width:90px;
+}
 
 }
 @media (hover: none) {
diff --git a/live/themes/orange-blue/css/theme.css b/live/themes/orange-blue/css/theme.css
index eced3b4a..41558eb1 100644
--- a/live/themes/orange-blue/css/theme.css
+++ b/live/themes/orange-blue/css/theme.css
@@ -246,6 +246,9 @@ div.__progress {
 div.__progress div.__elapsed {
 	background-color: #FCB840;
 }
+img.channel_logo {
+	background-color: #FCB840;
+}
 
 
 /* #############
diff --git a/live/themes/redwine/css/theme.css b/live/themes/redwine/css/theme.css
index 4a3f0332..0512b597 100644
--- a/live/themes/redwine/css/theme.css
+++ b/live/themes/redwine/css/theme.css
@@ -173,6 +173,9 @@ div.__progress {
 div.__progress div.__elapsed {
 	background-color: #FFE9FA;
 }
+img.channel_logo {
+	background-color: #FFE9FA;
+}
 
 
 /*
diff --git a/live/themes/veltliner/css/theme.css b/live/themes/veltliner/css/theme.css
index 01213011..775e7f11 100644
--- a/live/themes/veltliner/css/theme.css
+++ b/live/themes/veltliner/css/theme.css
@@ -184,6 +184,10 @@ div.__progress {
 div.__progress div.__elapsed {
 	background-color: #FFCC00;
 }
+img.channel_logo {
+	background-color: #FFCC00;
+}
+
 
 
 /* #############
diff --git a/pages/channels_widget.ecpp b/pages/channels_widget.ecpp
index da147f4d..6161fc59 100644
--- a/pages/channels_widget.ecpp
+++ b/pages/channels_widget.ecpp
@@ -2,6 +2,7 @@
 
 #include <exception.h>
 #include <setup.h>
+#include <stringhelpers.h>
 
 #if VDRVERSNUM < 20300
 #include <tools.h>  // ReadLock
@@ -41,6 +42,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 %			continue;
 %
 %		std::string listChannelId = *listChannel->GetChannelID().ToString();
-		<option value="<? channelid ? *listChannel->GetChannelID().ToString() ?><? !channelid ? std::to_string(listChannel->Number()) ?>"<{ reply.out() << ( listChannelId == selected ? " selected=\"selected\"" : "" ); }>><$ std::to_string(listChannel->Number()) $>: <$ listChannel->Name() $></option>
+		<option value="<? channelid ? *listChannel->GetChannelID().ToString() ?><? !channelid ? cSv(cToSvInt(listChannel->Number())) ?>"<{ reply.out() << ( listChannelId == selected ? " selected=\"selected\"" : "" ); }>><$ cSv(cToSvInt(listChannel->Number())) $>: <$ listChannel->Name() $></option>
 %	}
 </select>
diff --git a/pages/delete_recording.ecpp b/pages/delete_recording.ecpp
index 90a6a50b..5455ed66 100644
--- a/pages/delete_recording.ecpp
+++ b/pages/delete_recording.ecpp
@@ -26,7 +26,7 @@ using namespace vdrlive;
     throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
   }
 
-	bool ajaxReq = !async.empty() && (lexical_cast<int>(async) != 0);
+	bool ajaxReq = !async.empty() && (parse_int<int>(async) != 0);
 	std::string referrer;
 
 	if (ajaxReq) {
diff --git a/pages/edit_recording.ecpp b/pages/edit_recording.ecpp
index 5b99ca84..a5e5f870 100644
--- a/pages/edit_recording.ecpp
+++ b/pages/edit_recording.ecpp
@@ -41,7 +41,7 @@ const cRecording* recording;
 	if (!cUser::CurrentUserHasRightTo(UR_EDITRECS))
 		throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
 
-	bool ajaxReq = !async.empty() && (lexical_cast<int>(async) != 0);
+	bool ajaxReq = !async.empty() && (parse_int<int>(async) != 0);
 
 	std::string message;
 
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index fbae1294..6a662964 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -344,10 +344,10 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 		usetitle = true;
 		usesubtitle = true;
 		usedescr = true;
-		priority = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefPriority"));
-		lifetime = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefLifetime"));
-		marginstart = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStart"));
-		marginstop = lexical_cast<int>(EPGSearchSetupValues::ReadValue("DefMarginStop"));
+		priority = parse_int<int>(EPGSearchSetupValues::ReadValue("DefPriority"));
+		lifetime = parse_int<int>(EPGSearchSetupValues::ReadValue("DefLifetime"));
+		marginstart = parse_int<int>(EPGSearchSetupValues::ReadValue("DefMarginStart"));
+		marginstop = parse_int<int>(EPGSearchSetupValues::ReadValue("DefMarginStop"));
 	}
 </%cpp>
 <& pageelems.doc_type &>
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index b18210ab..21e622bb 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -60,7 +60,7 @@ const cTimer* timer;
 	if (!cUser::CurrentUserHasRightTo(UR_EDITTIMERS))
 		throw HtmlError( tr("Sorry, no permission. Please contact your administrator!") );
 
-	bool ajaxReq = !async.empty() && (lexical_cast<int>(async) != 0);
+	bool ajaxReq = !async.empty() && (parse_int<int>(async) != 0);
 
 	tChannelID channelid = tChannelID();
 	tEventID eventid = tEventID();
diff --git a/pages/epginfo.ecpp b/pages/epginfo.ecpp
index 62d2580b..8e1a119e 100644
--- a/pages/epginfo.ecpp
+++ b/pages/epginfo.ecpp
@@ -55,7 +55,7 @@ using namespace vdrlive;
 
 	pageTitle = tr("Electronic program guide information");
 
-	bool ajaxReq = !async.empty() && (lexical_cast<int>(async) != 0);
+	bool ajaxReq = !async.empty() && (parse_int<int>(async) != 0);
 
 	bool aboutBox = false;
   if (epgid.compare(0, 4, "del_") == 0) {
diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index 5e6ce571..6a97f23b 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -137,7 +137,7 @@ std::vector<time_t>			times_start;
                         thisGroup.erase( 0, channelSep+1 );
                     else
                         thisGroup = "";
-                    int channel_no = lexical_cast< int > (thisChannel);
+                    int channel_no = parse_int< int > (thisChannel);
 #if VDRVERSNUM >= 20301
                     cChannel* Channel = (cChannel *)Channels->GetByNumber( channel_no );
 #else
@@ -236,7 +236,7 @@ std::vector<time_t>			times_start;
 					continue;
 				}
 				std::string min = (*part).substr(sep+1, (*part).npos );
-				offsets.push_back( lexical_cast<time_t>( hour )*60*60 + lexical_cast<time_t>( min ) *60 );
+				offsets.push_back( parse_int<time_t>( hour )*60*60 + parse_int<time_t>( min ) *60 );
 			}
 			catch ( const bad_lexical_cast & ) {
 				esyslog("live: Error parsing time '%s'", part->c_str() );
@@ -326,7 +326,7 @@ std::vector<time_t>			times_start;
 	time_t sched_start = (times_start[ time_para ]/300)*300;
 	time_t max_hours;
 	try {
-		max_hours = lexical_cast<time_t>( LiveSetup().GetScheduleDuration() );
+		max_hours = parse_int<time_t>( LiveSetup().GetScheduleDuration() );
 	}
 	catch ( const bad_lexical_cast & )
 	{
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 5b64c91f..d675be66 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -21,15 +21,17 @@ std::string toString(const std::vector<std::string> &vec) {
   return result;
 }
   
+/*
 std::string toString(const std::vector<int> &vec) {
   if (vec.size() == 0) return "";
   std::string result;
   for (const int &i:vec) {
     if (!result.empty() ) result.append(", ");
-    result.append(std::to_string(i) );
+    result.append(cToSvInt(i) );
   }
   return result;
 }
+*/
   
 std::string toString(const std::vector<cActor> &vec) {
   if (vec.size() == 0) return "";
@@ -843,22 +845,19 @@ if (scraperMovieOrTv.found) {
   }
   if (episodeFound) {
 </%cpp>
-    <div class="scraper_list"><$ tr("Episode:") $> S<$ std::to_string(scraperMovieOrTv.episode.season ) $>E<$ (scraperMovieOrTv.episode.number ) $><$scraperMovieOrTv.episode.absoluteNumber?"A" + std::to_string(scraperMovieOrTv.episode.absoluteNumber):""$> <$ (scraperMovieOrTv.episode.name ) $></div>
+    <div class="scraper_list"><$ tr("Episode:") $> S<$ cSv(cToSvInt(scraperMovieOrTv.episode.season )) $>E<$ cSv(cToSvInt(scraperMovieOrTv.episode.number)) $><$scraperMovieOrTv.episode.absoluteNumber?concat("A", cToSvInt(scraperMovieOrTv.episode.absoluteNumber)):""$> <$ scraperMovieOrTv.episode.name $></div>
     <div class="scraper_list"><$ tr("Episode overview:") $>   <$ (scraperMovieOrTv.episode.overview ) $></div>
 <%cpp>
     if (scraperMovieOrTv.episode.vote_average != 0 ) {
 </%cpp>
-      <div class="scraper_list"><$ tr("Episode vote average/count:") $> <$ (scraperMovieOrTv.episode.vote_average ) $> / <$ (scraperMovieOrTv.episode.vote_count ) $></div>
+      <div class="scraper_list"><$ tr("Episode vote average/count:") $> <$ (scraperMovieOrTv.episode.vote_average) $> / <$ (scraperMovieOrTv.episode.vote_count ) $></div>
 <%cpp>
     }
 </%cpp>
     <div class="scraper_list"><$ tr("Episode first aired:") $> <$ (scraperMovieOrTv.episode.firstAired ) $></div>
 %   if (scraperMovieOrTv.episode.runtime > 0) {
-      <div class="scraper_list"><$ tr("Episode runtime:") $> <$ (scraperMovieOrTv.episode.runtime ) $></div>
+      <div class="scraper_list"><$ tr("Episode runtime:") $> <$ FormatDuration(tr("%d:%02d"), scraperMovieOrTv.episode.runtime*60) $></div>
 %   }
-<#
-    <div class="scraper_list">episode Image Url:  <$ (scraperMovieOrTv.episode.episodeImageUrl ) $></div>
-#>
 %   if (!scraperMovieOrTv.episode.IMDB_ID.empty() ) {
       <a href="https://www.imdb.com/title/<$ (scraperMovieOrTv.episode.IMDB_ID ) $>" target="_blank"> <$ tr("IMDB episode") $> </a>
 <%cpp>
@@ -900,21 +899,15 @@ if (scraperMovieOrTv.found) {
   if (!scraperMovieOrTv.tagline.empty() ) {
 </%cpp>
   <div class="scraper_list"><$ tr("Tagline:") $>        <$ (scraperMovieOrTv.tagline ) $></div>
-<%cpp>
-  }
-</%cpp>
+% }
   <div class="scraper_list"><$ tr("Overview:") $>       <$ (scraperMovieOrTv.overview ) $></div>
   <div class="scraper_list"><$ tr("Genres:") $>         <$ toString(scraperMovieOrTv.genres ) $></div>
-<%cpp>
-  if (!scraperMovieOrTv.homepage.empty() ) {
-</%cpp>
+% if (!scraperMovieOrTv.homepage.empty() ) {
   <div class="scraper_list"><a href ="<$ (scraperMovieOrTv.homepage) $>" target="_blank"><$ tr("Homepage") $></a></div>
-<%cpp>
-  }
-</%cpp>
+% }
   <div class="scraper_list"><$ tr("Release date:") $>   <$ (scraperMovieOrTv.releaseDate ) $></div>
 % if (scraperMovieOrTv.runtime > 0) {
-  <div class="scraper_list"><$ tr("Runtime:") $>        <$ std::to_string(scraperMovieOrTv.runtime) $></div>
+  <div class="scraper_list"><$ tr("Runtime:") $>        <$ FormatDuration(tr("%d:%02d"), scraperMovieOrTv.runtime*60) $></div>
 % }
 <%cpp>
   if (scraperMovieOrTv.popularity != 0) {
@@ -924,7 +917,7 @@ if (scraperMovieOrTv.found) {
   }
   if (scraperMovieOrTv.voteAverage  != 0) {
 </%cpp>
-  <div class="scraper_list"><$ tr("Vote average/count:") $> <$ (scraperMovieOrTv.voteAverage ) $> / <$ (scraperMovieOrTv.voteCount ) $></div>
+  <div class="scraper_list"><$ tr("Vote average/count:") $> <$ (scraperMovieOrTv.voteAverage ) $> / <$ (scraperMovieOrTv.voteCount) $></div>
 <%cpp>
   }
 </%cpp>
diff --git a/pages/playlist.ecpp b/pages/playlist.ecpp
index 1f68a722..d617bb37 100644
--- a/pages/playlist.ecpp
+++ b/pages/playlist.ecpp
@@ -53,10 +53,10 @@ using namespace vdrlive;
 	if (Channel != 0) {
 		std::string channelname = Channel->Name();
 		int streamdevPort = LiveSetup().GetStreamdevPort();
-		videourl = std::string("#EXTM3U\n#EXTINF:-1,") + channelname + "\nhttp://" + server + ":" + lexical_cast<std::string,int>(streamdevPort) + "/" + LiveSetup().GetStreamdevType() + "/" + *Channel->GetChannelID().ToString();
+		videourl = concat("#EXTM3U\n#EXTINF:-1,", channelname, "\nhttp://", server, ":", cToSvInt(streamdevPort), "/", LiveSetup().GetStreamdevType(), "/", *Channel->GetChannelID().ToString());
 	}
 	else {
-		videourl = std::string("#EXTM3U\n#EXTINF:-1\nhttp://") + server + ":" + lexical_cast<std::string,int>(LiveSetup().GetServerPort()) + "/recstream.html?recid=" + recid;
+		videourl = concat("#EXTM3U\n#EXTINF:-1\nhttp://", server, ":", cToSvInt(LiveSetup().GetServerPort()), "/recstream.html?recid=", recid);
 	}
 </%cpp>
 <& playlist.m3u videourl=(videourl) &>
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index ff2ad2ff..81301303 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -215,7 +215,7 @@ if(recItemFound) {
 <%def channel_selection>
 <form action="schedule.html" method="get" id="channels">
    <span>
-     <label for="channel"><$ tr("Channel") $>:&nbsp;<span class="bold"><$ std::to_string(Channel->Number()) $></span></label>
+     <label for="channel"><$ tr("Channel") $>:&nbsp;<span class="bold"><$ cSv(cToSvInt(Channel->Number())) $></span></label>
      <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &>
 %    if (cDevice::PrimaryDevice() && cDevice::PrimaryDevice()->HasDecoder() ) {
        <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &>
diff --git a/pages/searchresults.ecpp b/pages/searchresults.ecpp
index 807c3c73..9243dc7b 100644
--- a/pages/searchresults.ecpp
+++ b/pages/searchresults.ecpp
@@ -32,7 +32,7 @@ bool logged_in(false);
 	pageTitle = tr("Search results");
 	SearchResults results;
 	if (!searchtimerid.empty())
-		results.GetByID(lexical_cast< int >(searchtimerid));
+		results.GetByID(parse_int< int >(searchtimerid));
 	if (!searchtimerquery.empty())
 		results.GetByQuery(SearchResults::PopQuery(searchtimerquery));
 	if (!searchplain.empty())
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 3b10f600..238b58ae 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -1,6 +1,7 @@
 <%pre>
 
 #include <setup.h>
+#include <stringhelpers.h>
 #include <tools.h>
 #include <users.h>
 #include <live.h>
@@ -53,7 +54,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 			message = tr("Please set login and password!");
 		else
 		{
-			LiveSetup().SetLastChannel(lastchannel != "" ? lexical_cast< int >(lastchannel):0);
+			LiveSetup().SetLastChannel(lastchannel != "" ? parse_int<int>(lastchannel):0);
 			LiveSetup().SetUseAuth(useauth);
 			if (useauth) {
 				LiveSetup().SetAdminLogin(login);
@@ -70,7 +71,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 			LiveSetup().SetShowLogo(!showLogo.empty());
 			LiveSetup().SetShowInfoBox(!showInfoBox.empty());
 			LiveSetup().SetUseStreamdev(!useStreamdev.empty());
-			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : lexical_cast<int>(streamdevport));
+			LiveSetup().SetStreamdevPort(streamdevport.empty() ? 3000 : parse_int<int>(streamdevport));
 			LiveSetup().SetStreamdevType(streamdevtype.empty() ? "PES" : streamdevtype);
 			LiveSetup().SetMarkNewRec(!markNewRec.empty());
 
@@ -94,7 +95,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 	if (ilastchannel == std::numeric_limits< int >::max())
 		lastchannel = "";
 	else
-		lastchannel = lexical_cast<std::string, int>(ilastchannel);
+		lastchannel = std::string(cToSvInt(ilastchannel));
 
 	login = LiveSetup().GetAdminLogin();
 	useauth = LiveSetup().GetUseAuth();
@@ -107,7 +108,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 	showLogo = LiveSetup().GetShowLogo() ? "1" : "";
 	showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : "";
 	useStreamdev = LiveSetup().GetUseStreamdev() ? "1" : "";
-	streamdevport = lexical_cast<std::string, int>(LiveSetup().GetStreamdevPort());
+	streamdevport = std::string(cToSvInt(LiveSetup().GetStreamdevPort()));
 	streamdevtype = LiveSetup().GetStreamdevType();
 	markNewRec = LiveSetup().GetMarkNewRec() ? "1" : "";
 	streamVideoOpt0 = LiveSetup().GetStreamVideoOpt0();
diff --git a/pages/stream.ecpp b/pages/stream.ecpp
index 19aacfc2..4d48d77f 100644
--- a/pages/stream.ecpp
+++ b/pages/stream.ecpp
@@ -39,28 +39,14 @@ using namespace vdrlive;
 		return reply.redirect("");
 	}
 
-#if VDRVERSNUM < 20301
-	ReadLock channelsLock( Channels );
-	if ( !channelsLock )
-		throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") );
-#endif
-
 	if ( qparam.has("channelid_str") ) {
-#if VDRVERSNUM >= 20301
 		LOCK_CHANNELS_READ;
 		cChannel *c = (cChannel *)Channels->GetByChannelID( channelid );
-#else
-		cChannel *c = Channels.GetByChannelID( channelid );
-#endif
 		if ( c ) channel = c->Number();
 	}
 	if ( channel > 0 ) {
-#if VDRVERSNUM >= 20301
 		LOCK_CHANNELS_READ;
 		Channel = (cChannel *)Channels->GetByNumber( channel );
-#else
-		Channel = Channels.GetByNumber( channel );
-#endif
 	}
 	if ( Channel == 0 )
 		throw HtmlError( tr("Couldn't find channel or no channels available. Maybe you mistyped your request?") );
@@ -109,7 +95,7 @@ using namespace vdrlive;
 				<script>
 				Clappr.Log.setLevel(Clappr.Log.LEVEL_INFO);
 				var player = new Clappr.Player({
-					source: "media/<$ session $>/master_<$ std::to_string(channel) $>.m3u8",
+					source: "media/<$ session $>/master_<$ cSv(cToSvInt(channel)) $>.m3u8",
 					parentId: "#player",
 					width: 1280, height: 720,
 					autoPlay: "true",
@@ -186,7 +172,7 @@ if (Event) {
 %							}
 						</div>
 					</td>
-					<td class="topaligned rightcol bottomrow" style="width: 250px"><div class="station withmargin"><a	href="schedule.html?channel=<$ std::to_string(channel) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ std::to_string(channel) $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div>
+					<td class="topaligned rightcol bottomrow" style="width: 250px"><div class="station withmargin"><a	href="schedule.html?channel=<$ cSv(cToSvInt(channel)) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ cSv(cToSvInt(channel)) $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div>
 					</td>
 				</tr>
 			</table>
@@ -200,7 +186,7 @@ if (Event) {
 <%def channel_selection>
 <form action="stream.html" method="get" id="channels">
   <span>
-    <label for="channel"><$ tr("Channel") $>:&nbsp;<span class="bold"><$ std::to_string(Channel->Number()) $></span></label>
+    <label for="channel"><$ tr("Channel") $>:&nbsp;<span class="bold"><$ cSv(cToSvInt(Channel->Number())) $></span></label>
     <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("player.stop(); document.forms.channels.submit()") &>
 %   if (cDevice::PrimaryDevice() && cDevice::PrimaryDevice()->HasDecoder() ) {
       <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &>
diff --git a/pages/switch_channel.ecpp b/pages/switch_channel.ecpp
index 0b1b8ed1..7ea6847c 100644
--- a/pages/switch_channel.ecpp
+++ b/pages/switch_channel.ecpp
@@ -15,7 +15,7 @@ using namespace vdrlive;
 <%cpp>
 	tChannelID paramID;
         paramID = paramID.FromString(param.c_str());
-	bool ajaxReq = !async.empty() && (lexical_cast<int>(async) != 0);
+	bool ajaxReq = !async.empty() && (parse_int<int>(async) != 0);
 	std::string referrer;
 
 	if (!cUser::CurrentUserHasRightTo(UR_SWITCHCHNL))
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp
index b5a54f8a..d7cb822b 100644
--- a/pages/timerconflicts.ecpp
+++ b/pages/timerconflicts.ecpp
@@ -50,7 +50,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
 </%cpp>
 						<tr class="head">
 							<td colspan="12">
-								<div class="boxheader"><div><div><$ FormatDateTime(tr("%A, %x"), conflict->ConflictTime()) + " " + FormatDateTime(tr("%I:%M %p"), conflict->ConflictTime()) + " - " + lexical_cast<std::string, int>(confltimer->percentage) + "%" $><span style="float:right;"><diff><$ tr("Server")$>: <$ (confltimer->remote == "" ) ? tr("local") : confltimer->remote $> </diff></span></div></div></div>
+								<div class="boxheader"><div><div><$ concat(FormatDateTime(tr("%A, %x"), conflict->ConflictTime()), " ", FormatDateTime(tr("%I:%M %p"), conflict->ConflictTime()), " - ", cToSvInt(confltimer->percentage), "%") $><span style="float:right;"><diff><$ tr("Server")$>: <$ (confltimer->remote == "" ) ? tr("local") : confltimer->remote $> </diff></span></div></div></div>
 							</td>
 						</tr>
 						<tr class="description">
diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp
index 5a2d96a1..89c39816 100644
--- a/pages/whats_on.ecpp
+++ b/pages/whats_on.ecpp
@@ -213,7 +213,7 @@ if (type == "now") {
 </%cpp>
 			<div class="event">
 				<div class="station">
-					<div><div><div><a href="schedule.html?channel=<$ std::to_string(chNumber) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ std::to_string(chNumber) $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div></div></div>
+					<div><div><div><a href="schedule.html?channel=<$ cSv(cToSvInt(chNumber)) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ cSv(cToSvInt(chNumber)) $><$ tr(" - ") $><$ (epgEvent->Caption()) $></a></div></div></div>
 				</div>
 				<div class="content">
 					<div class="tools">
@@ -240,14 +240,25 @@ if (type == "now") {
 			EpgEvents::DecodeDomId(epgEvent->Id(), chanId, eventId);
 
 			// Searching for channel logos
-			std::string chanlogoimg("");
+			std::string chanlogoimg;
 			if (!LiveSetup().GetChanLogoDir().empty() ) {
-				std::string chanlogopath = LiveSetup().GetChanLogoDir() + epgEvent->Caption() + ".png";
+				std::string chanlogofile = StringReplace(epgEvent->Caption(), "/", "_") + ".png";
+				std::string chanlogopath = LiveSetup().GetChanLogoDir() + chanlogofile;
 				struct stat chanfilebuf;
-				if (stat (chanlogopath.c_str(), &chanfilebuf) == 0) {
-					chanlogoimg = "<img src=\"chanlogos/" + epgEvent->Caption() + ".png\" loading=\"lazy\" class=\"channel_logo\">";
+        bool logo_available = stat (chanlogopath.c_str(), &chanfilebuf) == 0;
+        if (!logo_available) {
+          chanlogofile = stringToLower(chanlogofile, g_locale);
+          chanlogopath = LiveSetup().GetChanLogoDir() + chanlogofile;
+          logo_available = stat (chanlogopath.c_str(), &chanfilebuf) == 0;
+        }
+				if (logo_available) {
+					chanlogoimg = "<img src=\"chanlogos/";
+          AppendHtmlEscapedAndCorrectNonUTF8(chanlogoimg, chanlogofile);
+          chanlogoimg.append("\" alt=\"");
+          AppendHtmlEscapedAndCorrectNonUTF8(chanlogoimg, epgEvent->Caption());
+          chanlogoimg.append("\" loading=\"lazy\" class=\"channel_logo\">");
 				}
-        	        }
+      }
 </%cpp>
 			<tr>
 				<& pageelems.epg_tool_box detail=(0) epgid=(epgEvent->Id()) title=(epgEvent->Title()) startTime=(epgEvent->GetStartTime()) endTime=(epgEvent->GetEndTime()) lastCurrentChanel=(lastCurrentChanel ? 1 : 0) &>
@@ -271,7 +282,7 @@ if (type == "now") {
 %					}
 					</div>
 				</td>
-				<td class="topaligned rightcol <? lastCurrentChanel ? "bottomrow"?>"><div class="station withmargin"><a href="schedule.html?channel=<$ std::to_string(chNumber) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ std::to_string(chNumber) $><$ tr(" - ") $><$$ chanlogoimg != "" ? chanlogoimg : (epgEvent->Caption()) $></a></div>
+				<td class="topaligned rightcol <? lastCurrentChanel ? "bottomrow"?>"><div class="station withmargin"><a href="schedule.html?channel=<$ cSv(cToSvInt(chNumber)) $>" <& tooltip.hint text=(tr("View the schedule of this channel")) &>><$ cSv(cToSvInt(chNumber)) $><$ tr(" - ") $><$$ chanlogoimg $><$ chanlogoimg.empty()?epgEvent->Caption():"" $></a></div>
 				</td>
 			</tr>
 %	}
diff --git a/recman.cpp b/recman.cpp
index 1c6eaed4..5d689974 100644
--- a/recman.cpp
+++ b/recman.cpp
@@ -282,8 +282,8 @@ namespace vdrlive {
     do {
       if( m_short_text && *m_short_text ) result = getNextUtfCodepoint(m_short_text);
       else result = getNextUtfCodepoint(m_description);
-    } while (result && iswpunct(result));
-    return towlower(result);
+    } while (result && std::ispunct<wchar_t>(result, g_locale));
+    return std::tolower<wchar_t>(result, g_locale);
   }
 
 	/**
@@ -342,7 +342,7 @@ namespace vdrlive {
   int firstNonPunct(cSv s) {
 // returns first non-punct char in s
     unsigned int ret;
-    for (ret = 0; ret < s.length() && ispunct(s[ret]); ret++ );
+    for (ret = 0; ret < s.length() && std::ispunct(s[ret]); ret++ );
     return ret;
   }
   int compareWithLocale(cSv first, cSv second) {
@@ -394,8 +394,8 @@ namespace vdrlive {
           if (fe) return -1;
 // compare strings case-insensitive
           for(; *first && *second; ) {
-            wint_t  flc = towlower(getNextUtfCodepoint(first));
-            wint_t  slc = towlower(getNextUtfCodepoint(second));
+            wint_t  flc = std::tolower<wchar_t>(getNextUtfCodepoint(first), g_locale);
+            wint_t  slc = std::tolower<wchar_t>(getNextUtfCodepoint(second), g_locale);
             if ( flc < slc ) return -1;
             if ( flc > slc ) return  1;
             if (numEqualChars) (*numEqualChars)++;
@@ -582,7 +582,7 @@ bool searchNameDesc(RecordingsItemRecPtr &RecItem, const std::vector<RecordingsI
 	 *  Implementation of class RecordingsItemDirSeason:
 	 */
 	RecordingsItemDirSeason::RecordingsItemDirSeason(int level, const RecordingsItemRecPtr &rPtr):
-		RecordingsItemDir(std::to_string(rPtr->m_s_season_number), level)
+		RecordingsItemDir(cToSvInt(rPtr->m_s_season_number), level)
 	{
     m_cmp_rec = RecordingsItemPtrCompare::ByEpisode;
 //    m_imageLevels = cImageLevels(eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
@@ -646,7 +646,7 @@ bool searchNameDesc(RecordingsItemRecPtr &RecItem, const std::vector<RecordingsI
     const char *name_c_end = name_c + name.length();
     while(name_c < name_c_end) {
       wint_t codepoint = getNextUtfCodepoint(name_c);
-      if(!iswpunct(codepoint) ) stringAppendUtfCodepoint(result, towlower(codepoint));
+      if(!std::ispunct<wchar_t>(codepoint, g_locale) ) stringAppendUtfCodepoint(result, std::tolower<wchar_t>(codepoint, g_locale));
     }
     return result;
 	}
@@ -1168,12 +1168,12 @@ std::string recordingErrorsHtml(int recordingErrors) {
     result.append("\" title=\"");
     result.append(tr("Number of recording errors:"));
     result.append(" ");
-    result.append(std::to_string(recordingErrors));
+    result.append(cToSvInt(recordingErrors));
   }
   result.append("\" width = \"16px\"/> </div>");
   return result;
 #else
-  return "";
+  return std::string();
 #endif
 }
 
diff --git a/setup.cpp b/setup.cpp
index 506a872b..8696c5b5 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -101,7 +101,7 @@ bool Setup::ParseCommandLine( int argc, char* argv[] )
 	}
   if (!m_serverUrl.empty() ) {
     m_serverUrlImages = m_serverUrl + ":";
-    m_serverUrlImages += std::to_string(m_serverPort);
+    m_serverUrlImages += cSv(cToSvInt(m_serverPort));
     m_serverUrlImages += "/tvscraper/";
   } else m_serverUrlImages = "";
 
@@ -265,7 +265,7 @@ int Setup::GetAdminPasswordLength() const
 {
 	// format is <length>:<md5-hash of password>
 	std::vector<std::string> parts = StringSplit( m_adminPasswordMD5, ':' );
-	return (parts.size() > 0) ? lexical_cast<int>( parts[0] ) : 0;
+	return (parts.size() > 0) ? parse_int<int>( parts[0] ) : 0;
 }
 
 std::string Setup::SetAdminPassword(std::string password)
@@ -313,7 +313,7 @@ bool Setup::CheckLocalNet(const std::string& ip)
 	if (parts.size() != 2) return false;
 	std::string net = parts[0];
 
-	int range = lexical_cast<int>(parts[1]);
+	int range = parse_int<int>(parts[1]);
 	// split net and ip addr in its 4 subcomponents
 	std::vector<std::string> netparts = StringSplit( net, '.' );
 	std::vector<std::string> addrparts = StringSplit( ip, '.' );
@@ -321,16 +321,16 @@ bool Setup::CheckLocalNet(const std::string& ip)
 
 	// to binary representation
 	std::stringstream bin_netstream;
-	bin_netstream << std::bitset<8>(lexical_cast<long>(netparts[0]))
-		<< std::bitset<8>(lexical_cast<long>(netparts[1]))
-		<< std::bitset<8>(lexical_cast<long>(netparts[2]))
-		<< std::bitset<8>(lexical_cast<long>(netparts[3]));
+	bin_netstream << std::bitset<8>(parse_int<long>(netparts[0]))
+		<< std::bitset<8>(parse_int<long>(netparts[1]))
+		<< std::bitset<8>(parse_int<long>(netparts[2]))
+		<< std::bitset<8>(parse_int<long>(netparts[3]));
 
 	std::stringstream bin_addrstream;
-	bin_addrstream << std::bitset<8>(lexical_cast<long>(addrparts[0]))
-		<< std::bitset<8>(lexical_cast<long>(addrparts[1]))
-		<< std::bitset<8>(lexical_cast<long>(addrparts[2]))
-		<< std::bitset<8>(lexical_cast<long>(addrparts[3]));
+	bin_addrstream << std::bitset<8>(parse_int<long>(addrparts[0]))
+		<< std::bitset<8>(parse_int<long>(addrparts[1]))
+		<< std::bitset<8>(parse_int<long>(addrparts[2]))
+		<< std::bitset<8>(parse_int<long>(addrparts[3]));
 
 	// compare range
 	std::string bin_net = bin_netstream.str();
diff --git a/stringhelpers.h b/stringhelpers.h
index ad5934ba..b212febd 100644
--- a/stringhelpers.h
+++ b/stringhelpers.h
@@ -21,6 +21,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <locale>
 
 #include <iostream>
 #include <chrono>
@@ -132,13 +133,16 @@ inline std::string charPointerToString(const unsigned char *s) {
   return s?reinterpret_cast<const char *>(s):std::string();
 }
 // challange:
-//   method with importing parameter cSv called with const char * = nullptr
-//   undifined behavior, as cSv(nullptr) is undefined.
+//   method with importing parameter std::string_view called with const char * = nullptr
+//   undefined behavior, as std::string_view(nullptr) is undefined. In later c++ standard, it is even an abort
 // solution:
-//   a) be very carefull, check const char * for nullptr before calling a method with cSv as import parameter
-//   b) replace all cSv with cSv
+//   a) be very carefull, check const char * for nullptr before calling a method with std::string_view as import parameter
+// or:
+//   b) replace all std::string_view with cSv
 //      very small performance impact if such a method if called with cSv
-//      convert nullptr to empty cSv if called with const char *
+//      this will convert nullptr to empty cSv if called with const char *
+
+// 2nd advantage of cSv: substr(pos) if pos > length: no dump, just an empty cSv as result
 
 class cSv: public std::string_view {
   public:
@@ -148,9 +152,8 @@ class cSv: public std::string_view {
     cSv(const char *s, size_t l): std::string_view(s, l) {}
     cSv(const unsigned char *s, size_t l): std::string_view(reinterpret_cast<const char *>(s), l) {}
     cSv(std::string_view sv): std::string_view(sv) {}
-    cSv(const cSv &sv): std::string_view(sv) {}
     cSv(const std::string &s): std::string_view(s) {}
-    cSv substr(size_t pos = 0) const { return (length() > pos)?cSv(data() + pos, length() - pos):cSv(); }
+    cSv substr(size_t pos) const { return (length() > pos)?cSv(data() + pos, length() - pos):cSv(); }
     cSv substr(size_t pos, size_t count) const { return (length() > pos)?cSv(data() + pos, std::min(length() - pos, count) ):cSv(); }
   private:
     static std::string_view charPointerToStringView(const char *s) {
@@ -260,6 +263,27 @@ inline wint_t getNextUtfCodepoint(const char *&p){
   if( l == 0 ) { p++; return '?'; }
   return Utf8ToUtf32(p, l);
 }
+inline void stringAppendToLower(std::string &target, cSv str, const std::locale &loc) {
+  const char *pos = str.data();
+  const char *end = str.data() + str.length();
+  while (pos < end) {
+    wint_t u_char = getNextUtfCodepoint(pos);
+    try {
+      if (u_char) stringAppendUtfCodepoint(target, std::tolower<wchar_t>(u_char, loc));
+// The standard library is guaranteed to provide the following specializations (they are required to be implemented by any locale object):
+//   std::ctype<char> and std::ctype<wchar_t> . So don't call  std::tolower<wint_t>, this is not implemented !!!!
+    } catch (const std::bad_cast& e) {
+      esyslog("ERROR in stringToLower(%.*s,%s), error message: %s", (int) str.length(), str.data(), loc.name().c_str(), e.what() );
+      return;
+    }
+  }
+}
+inline std::string stringToLower(cSv str, const std::locale &loc) {
+  std::string result;
+  result.reserve(str.length() + 1);
+  stringAppendToLower(result, str, loc);
+  return result;
+}
 
 // =========================================================
 // =========================================================
@@ -533,7 +557,6 @@ inline std::string concat(cSv s1, cSv s2) {
   result.append(s2);
   return result;
 }
-
 inline std::string concat(cSv s1, cSv s2, cSv s3) {
   std::string result;
   result.reserve(s1.length() + s2.length() + s3.length() );
@@ -542,20 +565,18 @@ inline std::string concat(cSv s1, cSv s2, cSv s3) {
   result.append(s3);
   return result;
 }
-
 inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4) {
   std::string result;
-  result.reserve(s1.length() + s2.length() + s3.length()  + s4.length() );
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() );
   result.append(s1);
   result.append(s2);
   result.append(s3);
   result.append(s4);
   return result;
 }
-
 inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5) {
   std::string result;
-  result.reserve(s1.length() + s2.length() + s3.length()  + s4.length() + s5.length() );
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() );
   result.append(s1);
   result.append(s2);
   result.append(s3);
@@ -563,16 +584,85 @@ inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5) {
   result.append(s5);
   return result;
 }
-
 inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6) {
   std::string result;
-  result.reserve(s1.length() + s2.length() + s3.length()  + s4.length() + s5.length() + s6.length() );
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() );
+  result.append(s1);
+  result.append(s2);
+  result.append(s3);
+  result.append(s4);
+  result.append(s5);
+  result.append(s6);
+  return result;
+}
+inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6, cSv s7) {
+  std::string result;
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() + s7.length());
+  result.append(s1);
+  result.append(s2);
+  result.append(s3);
+  result.append(s4);
+  result.append(s5);
+  result.append(s6);
+  result.append(s7);
+  return result;
+}
+inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6, cSv s7, cSv s8) {
+  std::string result;
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() + s7.length() + s8.length());
+  result.append(s1);
+  result.append(s2);
+  result.append(s3);
+  result.append(s4);
+  result.append(s5);
+  result.append(s6);
+  result.append(s7);
+  result.append(s8);
+  return result;
+}
+inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6, cSv s7, cSv s8, cSv s9) {
+  std::string result;
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() + s7.length() + s8.length() + s9.length());
+  result.append(s1);
+  result.append(s2);
+  result.append(s3);
+  result.append(s4);
+  result.append(s5);
+  result.append(s6);
+  result.append(s7);
+  result.append(s8);
+  result.append(s9);
+  return result;
+}
+inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6, cSv s7, cSv s8, cSv s9, cSv s10) {
+  std::string result;
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() + s7.length() + s8.length() + s9.length() + s10.length());
+  result.append(s1);
+  result.append(s2);
+  result.append(s3);
+  result.append(s4);
+  result.append(s5);
+  result.append(s6);
+  result.append(s7);
+  result.append(s8);
+  result.append(s9);
+  result.append(s10);
+  return result;
+}
+inline std::string concat(cSv s1, cSv s2, cSv s3, cSv s4, cSv s5, cSv s6, cSv s7, cSv s8, cSv s9, cSv s10, cSv s11) {
+  std::string result;
+  result.reserve(s1.length() + s2.length() + s3.length() + s4.length() + s5.length() + s6.length() + s7.length() + s8.length() + s9.length() + s10.length() + s11.length());
   result.append(s1);
   result.append(s2);
   result.append(s3);
   result.append(s4);
   result.append(s5);
   result.append(s6);
+  result.append(s7);
+  result.append(s8);
+  result.append(s9);
+  result.append(s10);
+  result.append(s11);
   return result;
 }
 
diff --git a/timerconflict.cpp b/timerconflict.cpp
index b72ca0a5..66d54119 100644
--- a/timerconflict.cpp
+++ b/timerconflict.cpp
@@ -40,20 +40,20 @@ namespace vdrlive {
 		try {
 			std::vector<std::string>::const_iterator part = parts.begin();
 			if (parts.size() > 0) {
-				conflictTime = lexical_cast<time_t>( *part++ );
+				conflictTime = parse_int<time_t>( *part++ );
 				for ( int i = 1; part != parts.end(); ++i, ++part ) {
 					std::vector<std::string> timerparts = StringSplit( *part, '|' );
 					std::vector<std::string>::const_iterator timerpart = timerparts.begin();
 					TimerInConflict timer;
 					for ( int j = 0; timerpart != timerparts.end(); ++j, ++timerpart ) {
 						switch (j) {
-							case 0: timer.timerIndex = lexical_cast<int>( *timerpart ); break;
-							case 1: timer.percentage = lexical_cast<int>( *timerpart ); break;
+							case 0: timer.timerIndex = parse_int<int>( *timerpart ); break;
+							case 1: timer.percentage = parse_int<int>( *timerpart ); break;
 							case 2: {
 								std::vector<std::string> conctimerparts = StringSplit( *timerpart, '#' );
 								std::vector<std::string>::const_iterator conctimerpart = conctimerparts.begin();
 								for ( int k = 0; conctimerpart != conctimerparts.end(); ++k, ++conctimerpart )
-									timer.concurrentTimerIndices.push_back(lexical_cast<int>( *conctimerpart ));
+									timer.concurrentTimerIndices.push_back(parse_int<int>( *conctimerpart ));
 								break;
 							}
 							case 3: {
diff --git a/timers.cpp b/timers.cpp
index f13f969b..39110ba5 100644
--- a/timers.cpp
+++ b/timers.cpp
@@ -49,10 +49,10 @@ namespace vdrlive {
 		}
 
 		try {
-			int weekdays = lexical_cast<int>( parts[1] );
-			time_t day = lexical_cast<time_t>( parts[2] );
-			int start = lexical_cast<int>( parts[3] );
-			int stop = lexical_cast<int>( parts[4] );
+			int weekdays = parse_int<int>( parts[1] );
+			time_t day = parse_int<time_t>( parts[2] );
+			int start = parse_int<int>( parts[3] );
+			int stop = parse_int<int>( parts[4] );
 
 			cMutexLock MutexLock(&m_mutex);
 
@@ -341,7 +341,7 @@ namespace vdrlive {
 				dsyslog("live: DoUptimer() update timer on remote server '%s'", timerData.remote);
 				cStringList response;
 				std::string command = "MODT ";
-				command.append(std::to_string(timerData.id));
+				command.append(cToSvInt(timerData.id));
 				command.append(" ");
 				command.append(timerData.builder);
 				dsyslog("live: DoUpdateTimer() svdrp command '%s'", command.c_str());
@@ -443,7 +443,7 @@ namespace vdrlive {
 			dsyslog("live: DoDeleteTimer() delete remote timer id '%d' from server '%s'", timerData.id, timerData.remote);
 			cStringList response;
 			std::string command = "DELT ";
-			command.append(std::to_string(timerData.id));
+			command.append(cToSvInt(timerData.id));
 			bool svdrpOK = ExecSVDRPCommand(timerData.remote, command.c_str(), &response);
 			if ( !svdrpOK ) {
 				esyslog( "live: delete remote timer id %d failed", timerData.id);
@@ -517,7 +517,7 @@ namespace vdrlive {
 			LOCK_TIMERS_READ;
 			const cTimer* toggleTimer = Timers->GetById( timerData.id, timerData.remote );
 			std::string command = "MODT ";
-			command.append(std::to_string(timerData.id));
+			command.append(cToSvInt(timerData.id));
 			if (toggleTimer->HasFlags(tfActive)) {
 				dsyslog("live: DoToggleTimer() timer is active");
 				command.append(" off");
diff --git a/tools.cpp b/tools.cpp
index a8f152b7..4618d745 100644
--- a/tools.cpp
+++ b/tools.cpp
@@ -341,7 +341,7 @@ template void AppendTextTruncateOnWord<cLargeString>(cLargeString &target, const
 	time_t GetTimeT(std::string timestring) // timestring in HH:MM
 	{
 		timestring = StringReplace(timestring, ":", "");
-		int iTime = lexical_cast<int>( timestring );
+		int iTime = parse_int<int>( timestring );
 		struct tm tm_r;
 		time_t t = time(NULL);
 		tm* tmnow = localtime_r(&t, &tm_r);
@@ -391,9 +391,9 @@ template void AppendTextTruncateOnWord<cLargeString>(cLargeString &target, const
 	{
 		if (datestring.empty())
 			return 0;
-		int year = lexical_cast<int>(datestring.substr(format.find("yyyy"), 4));
-		int month = lexical_cast<int>(datestring.substr(format.find("mm"), 2));
-		int day = lexical_cast<int>(datestring.substr(format.find("dd"), 2));
+		int year = parse_int<int>(datestring.substr(format.find("yyyy"), 4));
+		int month = parse_int<int>(datestring.substr(format.find("mm"), 2));
+		int day = parse_int<int>(datestring.substr(format.find("dd"), 2));
 		struct tm tm_r;
 		tm_r.tm_year = year - 1900;
 		tm_r.tm_mon = month -1;
diff --git a/users.cpp b/users.cpp
index ae390fcd..718e1b0b 100644
--- a/users.cpp
+++ b/users.cpp
@@ -33,7 +33,7 @@ int cUser::GetPasswordLength() const
 {
 	// format is <length>:<md5-hash of password>
 	std::vector<std::string> parts = StringSplit( m_PasswordMD5, '|' );
-	return (parts.size() > 0) ? lexical_cast<int>( parts[0] ) : 0;
+	return (parts.size() > 0) ? parse_int<int>( parts[0] ) : 0;
 }
 
 std::string const cUser::GetMD5HashPassword() const
@@ -74,14 +74,14 @@ bool cUser::Parse(const char *s)
         pos = pos_next;
 
 		switch (parameter) {
-		case 1: m_ID = lexical_cast<int>(value);
+		case 1: m_ID = parse_int<int>(value);
 			break;
 		case 2:  m_Name = value;
 			break;
 		case 3: m_PasswordMD5 = value;
 			break;
 		case 4:
-			m_Userrights = lexical_cast<int>(value);
+			m_Userrights = parse_int<int>(value);
 			break;
 		default:
 			break;