diff --git a/channels.conf.cable b/channels.conf.cable
index f9fec6e8..c60fb8f6 100644
--- a/channels.conf.cable
+++ b/channels.conf.cable
@@ -1,163 +1,167 @@
-Extreme Sport:346:h:0:6900:801:802:10002:1:50700
-Bloomberg:346:h:0:6900:811:812:10002:1:50701
-Fashion TV:346:h:0:6900:821:822:10002:1:50702
-BET ON JAZZ:346:h:0:6900:841:842:10002:1:50704
-LANDSCAPE:346:h:0:6900:831:832:10002:1:50703
-Einstein:346:h:0:6900:623:624:10002:1:50719
-Single TV:346:h:0:6900:621:622:10002:1:50706
-Einstein:346:h:0:6900:255:256:10002:1:40100
-GOLDSTAR TV:354:h:0:6900:3839:3840:17:1:518
-HEIMATKANAL:354:h:0:6900:2815:2816:17:1:517
-FILMPALAST:354:h:0:6900:2559:2560:17:1:516
-FILMPALAST:354:h:0:6900:1535:1536:17:1:195
-FILMPALAST:354:h:0:6900:1279:1280:17:1:194
-FILMPALAST:354:h:0:6900:255:256:17:1:177
-FILMPALAST:354:h:0:6900:767:768:17:1:179
-FILMPALAST:354:h:0:6900:511:513:17:1:178
-FILMPALAST:354:h:0:6900:1023:1024:17:1:193
-BLUE MOVIE 1:354:h:0:6900:255:256:17:1:513
-BLUE MOVIE 2:354:h:0:6900:255:256:17:1:514
-BLUE MOVIE 3:354:h:0:6900:255:256:17:1:515
-SPORT 1:362:h:0:6900:255:256:3:1:17
-F1 Boxenstrasse:362:h:0:6900:2815:2816:3:1:240
-F1 Cockpit:362:h:0:6900:2559:2560:3:1:242
-F1 Multikanal:362:h:0:6900:2047:2048:3:1:243
-SPORT 1:362:h:0:6900:255:256:3:1:180
-SPORT 1:362:h:0:6900:255:256:3:1:181
-SPORT 1:362:h:0:6900:255:256:3:1:182
-SPORT 1:362:h:0:6900:255:256:3:1:183
-SPORT 1:362:h:0:6900:255:256:3:1:176
-SPORT 1:362:h:0:6900:255:256:3:1:190
-PREMIERE:370:h:0:6900:511:512:2:1:10
-STAR KINO:370:h:0:6900:767:768:2:1:9
-CINE ACTION:370:h:0:6900:1023:1024:2:1:20
-CINE COMEDY:370:h:0:6900:1279:1280:2:1:29
-SCI-FANTASY:370:h:0:6900:1535:1536:2:1:41
-ROMANTIC MOVIES:370:h:0:6900:1791:1792:2:1:11
-BEATE-UHSE.TV:370:h:0:6900:2047:2048:2:1:21
-13 TH STREET:370:h:0:6900:2303:2304:2:1:43
-FOX KIDS:370:h:0:6900:255:256:2:1:22
-SUNSET:378:h:0:6900:1023:1024:4:1:16
-COMEDY:378:h:0:6900:1279:1280:4:1:28
-KRIMI &CO:378:h:0:6900:1535:1536:4:1:23
-DISCOVERY CHANNEL:378:h:0:6900:1791:1792:4:1:14
-CLASSICA:378:h:0:6900:767:768:4:1:15
-SUPERDOM:378:h:0:6900:2303:2304:4:1:42
-K-TOON:378:h:0:6900:511:512:4:1:12
-SUPERDOM:378:h:0:6900:2047:2048:4:1:192
-SUPERDOM:378:h:0:6900:2559:2560:4:1:187
-JUNIOR:378:h:0:6900:255:256:4:1:19
-SUPERDOM 5:378:h:0:6900:2815:2816:4:1:213
-KICK 1:386:h:0:6900:255:257:5:1:26
-KICK 4:386:h:0:6900:1279:1281:5:1:188
-KICK 4:386:h:0:6900:1535:1536:5:1:189
-SPORT 2:386:h:0:6900:2047:2048:5:1:27
-KICK 4:386:h:0:6900:1023:1024:5:1:186
-KICK 2:386:h:0:6900:2559:2560:5:1:300
-KICK 4:386:h:0:6900:767:769:5:1:185
-SPORT 3:386:h:0:6900:2303:2304:5:1:18
-SUPERDOM 3:386:h:0:6900:3583:3584:5:1:211
-SPORT 4:386:h:0:6900:255:256:5:1:24
-KICK 3:386:h:0:6900:255:256:5:1:301
-KICK 4:386:h:0:6900:255:256:5:1:302
-KICK 4:386:h:0:6900:255:256:5:1:184
-KICK 4:386:h:0:6900:255:256:5:1:191
-EuroNews:394:h:0:6900:255:256:1079:1:65039
-SEASONS:402:h:0:6900:1040:1044:1:1:33
-DISNEY CHANNEL:402:h:0:6900:1030:1034:1:1:34
-STUDIO UNIVERSAL:402:h:0:6900:1050:1054:1:1:36
-PLANET:402:h:0:6900:1100:1104:1:1:13
-BBC PRIME:402:h:0:6900:255:256:1:1:32
-ATV:402:h:0:6900:255:256:1:1:39
-Leitseite:346:h:0:6900:2254:0:10002:0:5004
-Via 1 - Schöner Reisen:346:h:0:6900:611:612:10002:0:50705
-PREMIERE WORLD:370:h:0:6900:255:256:2:0:8
-ZDF:394:h:0:6900:110:120:1079:0:28006
-3sat:394:h:0:6900:210:220:1079:0:28007
-KiKa:394:h:0:6900:255:256:1079:0:28008
-Eurosport:394:h:0:6900:410:420:1079:0:28009
-ZDF.info:394:h:0:6900:610:620:1079:0:28011
-EuroNews:394:h:0:6900:2221:2233:1079:0:28015
-ZDF Theaterkanal:394:h:0:6900:1110:1120:1079:0:28016
-ZDF.doku:394:h:0:6900:660:670:1079:0:28014
-Test-R:410:h:0:6900:901:902:1101:0:28130
-Bayerisches FS:410:h:0:6900:201:202:1101:0:28107
-WDR FERNSEHEN:410:h:0:6900:601:602:1101:0:28111
-arte:410:h:0:6900:401:402:1101:0:28109
-SR Fernsehen Suedwest:410:h:0:6900:501:502:1101:0:28110
-Das Erste:410:h:0:6900:101:102:1101:0:28106
-hessen fernsehen:410:h:0:6900:301:302:1101:0:28108
-BR-alpha:410:h:0:6900:701:702:1101:0:28112
-SWR Fernsehen:410:h:0:6900:801:802:1101:0:28113
-Phoenix:410:h:0:6900:255:256:1101:0:28114
-Phoenix:410:h:0:6900:255:256:1101:0:61225
-ARD-Online-Kanal:426:h:0:6900:0:1801:1073:0:28218
-EinsExtra:426:h:0:6900:101:102:1073:0:28201
-EinsFestival:426:h:0:6900:201:202:1073:0:28202
-EinsMuXx:426:h:0:6900:301:302:1073:0:28203
-MDR FERNSEHEN:426:h:0:6900:401:402:1073:0:28204
-ORB-Fernsehen:426:h:0:6900:501:502:1073:0:28205
-B1 Berlin:426:h:0:6900:601:602:1073:0:28206
-N3:426:h:0:6900:2401:2402:1073:0:28224
-TV Polonia:434:h:0:6900:641:642:10001:0:53204
-Kanal D:434:h:0:6900:651:652:10001:0:53205
-RTP international:434:h:0:6900:661:662:10001:0:53206
-ATV:434:h:0:6900:631:632:10001:0:53203
-ERT-Sat:434:h:0:6900:691:692:10001:0:53209
-CNE:434:h:0:6900:255:256:10001:0:53208
-ERT-Sat:434:h:0:6900:255:256:10001:0:48587
-ZEE TV:442:h:0:6900:517:773:10003:0:53301
-NTV i:442:h:0:6900:514:515:10003:0:53302
-LOVE SONGS:362:h:0:6900:0:320:3:1:163
-MUSICALS:362:h:0:6900:0:336:3:1:164
-EASY LISTENING:362:h:0:6900:0:304:3:1:162
-HITLISTE:362:h:0:6900:0:784:3:1:150
-ALTERNATIVE ROCK:362:h:0:6900:0:800:3:1:151
-DANCE:362:h:0:6900:0:816:3:1:152
-COUNTRY:362:h:0:6900:0:352:3:1:153
-CLASSIC ROCK:362:h:0:6900:0:544:3:1:154
-FILMMUSIK:362:h:0:6900:0:368:3:1:155
-DEUTSCHE HITS:362:h:0:6900:0:384:3:1:156
-SOUL CLASSICS:362:h:0:6900:0:400:3:1:157
-TÜRK MÜZIGI:362:h:0:6900:0:560:3:1:158
-GOLD:362:h:0:6900:0:576:3:1:159
-KLASSIK POPULÄR:362:h:0:6900:0:592:3:1:145
-KLASS. SYMPHONIEN:362:h:0:6900:0:608:3:1:146
-OPER & VOKALMUSIK:362:h:0:6900:0:624:3:1:147
-BAROCKMUSIK:362:h:0:6900:0:640:3:1:148
-SCHLAGER:378:h:0:6900:0:320:4:1:166
-VOLKSMUSIK:378:h:0:6900:0:336:4:1:167
-OLD GOLD:378:h:0:6900:0:304:4:1:165
-100,6:354:h:0:6900:0:1312:17:0:161
-DLR-Berlin:394:h:0:6900:0:710:1079:0:28012
-DLF-Köln:394:h:0:6900:0:810:1079:0:28013
-Österreich 1:394:h:0:6900:0:169:1079:0:28017
-Bayern 4 Klassik:410:h:0:6900:0:3001:1101:0:28120
-B5 aktuell:410:h:0:6900:0:3101:1101:0:28121
-Bremen 2:410:h:0:6900:0:3801:1101:0:28128
-Bayern 1:410:h:0:6900:0:3601:1101:0:28126
-NDR 4 Info:410:h:0:6900:0:3701:1101:0:28127
-SR 1:410:h:0:6900:0:3901:1101:0:28129
-HR2 plus:410:h:0:6900:0:3401:1101:0:28124
-HR2:410:h:0:6900:0:3301:1101:0:28123
-hr-chronos:410:h:0:6900:0:3201:1101:0:28122
-HR XXL:410:h:0:6900:0:3501:1101:0:28125
-Radio 3:426:h:0:6900:0:701:1073:0:28207
-MDR KULTUR:426:h:0:6900:0:801:1073:0:28208
-Fritz:426:h:0:6900:0:901:1073:0:28209
-JUMP:426:h:0:6900:0:1001:1073:0:28210
-MDR info:426:h:0:6900:0:1101:1073:0:28211
-SPUTNIK:426:h:0:6900:0:1201:1073:0:28212
-SFB4 Multikulti:426:h:0:6900:0:1301:1073:0:28213
-SWR-2:426:h:0:6900:0:1401:1073:0:28214
-WDR3:426:h:0:6900:0:1501:1073:0:28215
-WDR Radio 5:426:h:0:6900:0:1601:1073:0:28216
-All Jazz:442:h:0:6900:0:535:10003:0:53350
-Cristal New Age:442:h:0:6900:0:536:10003:0:53351
-Movie Sounds:442:h:0:6900:0:537:10003:0:53352
-Sinfonica:442:h:0:6900:0:538:10003:0:53353
-Opernfestival:442:h:0:6900:0:539:10003:0:53354
-Barock Fantasie:442:h:0:6900:0:540:10003:0:53355
-Musica Camerata:442:h:0:6900:0:541:10003:0:53356
-Musica Antica:442:h:0:6900:0:542:10003:0:53357
-Adagio:442:h:0:6900:0:543:10003:0:53358
+:verschlüsselte Fernsehprogramme
+Extreme Sport:346:h:0:6900:801:802:0:1:50700
+Bloomberg:346:h:0:6900:811:812:0:1:50701
+Fashion TV:346:h:0:6900:821:822:0:1:50702
+BET ON JAZZ:346:h:0:6900:841:842:0:1:50704
+LANDSCAPE:346:h:0:6900:831:832:0:1:50703
+Einstein:346:h:0:6900:623:624:0:1:50719
+Single TV:346:h:0:6900:621:622:0:1:50706
+Einstein:346:h:0:6900:255:256:0:1:40100
+GOLDSTAR TV:354:h:0:6900:3839:3840:0:1:518
+HEIMATKANAL:354:h:0:6900:2815:2816:0:1:517
+FILMPALAST:354:h:0:6900:2559:2560:0:1:516
+FILMPALAST:354:h:0:6900:1535:1536:0:1:195
+FILMPALAST:354:h:0:6900:1279:1280:0:1:194
+FILMPALAST:354:h:0:6900:255:256:0:1:177
+FILMPALAST:354:h:0:6900:767:768:0:1:179
+FILMPALAST:354:h:0:6900:511:513:0:1:178
+FILMPALAST:354:h:0:6900:1023:1024:0:1:193
+BLUE MOVIE 1:354:h:0:6900:255:256:0:1:513
+BLUE MOVIE 2:354:h:0:6900:255:256:0:1:514
+BLUE MOVIE 3:354:h:0:6900:255:256:0:1:515
+SPORT 1:362:h:0:6900:255:256:0:1:17
+F1 Boxenstrasse:362:h:0:6900:2815:2816:0:1:240
+F1 Cockpit:362:h:0:6900:2559:2560:0:1:242
+F1 Multikanal:362:h:0:6900:2047:2048:0:1:243
+SPORT 1:362:h:0:6900:255:256:0:1:180
+SPORT 1:362:h:0:6900:255:256:0:1:181
+SPORT 1:362:h:0:6900:255:256:0:1:182
+SPORT 1:362:h:0:6900:255:256:0:1:183
+SPORT 1:362:h:0:6900:255:256:0:1:176
+SPORT 1:362:h:0:6900:255:256:0:1:190
+PREMIERE:370:h:0:6900:511:512:0:1:10
+STAR KINO:370:h:0:6900:767:768:0:1:9
+CINE ACTION:370:h:0:6900:1023:1024:0:1:20
+CINE COMEDY:370:h:0:6900:1279:1280:0:1:29
+SCI-FANTASY:370:h:0:6900:1535:1536:0:1:41
+ROMANTIC MOVIES:370:h:0:6900:1791:1792:0:1:11
+BEATE-UHSE.TV:370:h:0:6900:2047:2048:0:1:21
+13 TH STREET:370:h:0:6900:2303:2304:0:1:43
+FOX KIDS:370:h:0:6900:255:256:0:1:22
+SUNSET:378:h:0:6900:1023:1024:0:1:16
+COMEDY:378:h:0:6900:1279:1280:0:1:28
+KRIMI &CO:378:h:0:6900:1535:1536:0:1:23
+DISCOVERY CHANNEL:378:h:0:6900:1791:1792:0:1:14
+CLASSICA:378:h:0:6900:767:768:0:1:15
+SUPERDOM:378:h:0:6900:2303:2304:0:1:42
+K-TOON:378:h:0:6900:511:512:0:1:12
+SUPERDOM:378:h:0:6900:2047:2048:0:1:192
+SUPERDOM:378:h:0:6900:2559:2560:0:1:187
+JUNIOR:378:h:0:6900:255:256:0:1:19
+SUPERDOM 5:378:h:0:6900:2815:2816:0:1:213
+KICK 1:386:h:0:6900:255:257:0:1:26
+KICK 4:386:h:0:6900:1279:1281:0:1:188
+KICK 4:386:h:0:6900:1535:1536:0:1:189
+SPORT 2:386:h:0:6900:2047:2048:0:1:27
+KICK 4:386:h:0:6900:1023:1024:0:1:186
+KICK 2:386:h:0:6900:2559:2560:0:1:300
+KICK 4:386:h:0:6900:767:769:0:1:185
+SPORT 3:386:h:0:6900:2303:2304:0:1:18
+SUPERDOM 3:386:h:0:6900:3583:3584:0:1:211
+SPORT 4:386:h:0:6900:255:256:0:1:24
+KICK 3:386:h:0:6900:255:256:0:1:301
+KICK 4:386:h:0:6900:255:256:0:1:302
+KICK 4:386:h:0:6900:255:256:0:1:184
+KICK 4:386:h:0:6900:255:256:0:1:191
+EuroNews:394:h:0:6900:255:256:0:1:65039
+SEASONS:402:h:0:6900:1040:1044:0:1:33
+DISNEY CHANNEL:402:h:0:6900:1030:1034:0:1:34
+STUDIO UNIVERSAL:402:h:0:6900:1050:1054:0:1:36
+PLANET:402:h:0:6900:1100:1104:0:1:13
+BBC PRIME:402:h:0:6900:255:256:0:1:32
+ATV:402:h:0:6900:255:256:0:1:39
+:Fernsehprogramme
+Leitseite:346:h:0:6900:2254:0:0:0:5004
+Via 1 - Schöner Reisen:346:h:0:6900:611:612:0:0:50705
+PREMIERE WORLD:370:h:0:6900:255:256:32:0:8
+ZDF:394:h:0:6900:110:120:130:0:28006
+3sat:394:h:0:6900:210:220:230:0:28007
+KiKa:394:h:0:6900:255:256:0:0:28008
+Eurosport:394:h:0:6900:410:420:430:0:28009
+ZDF.info:394:h:0:6900:610:620:0:0:28011
+EuroNews:394:h:0:6900:2221:2233:768:0:28015
+ZDF Theaterkanal:394:h:0:6900:1110:1120:0:0:28016
+ZDF.doku:394:h:0:6900:660:670:0:0:28014
+Test-R:410:h:0:6900:901:902:104:0:28130
+Bayerisches FS:410:h:0:6900:201:202:204:0:28107
+WDR FERNSEHEN:410:h:0:6900:601:602:604:0:28111
+arte:410:h:0:6900:401:402:404:0:28109
+SR Fernsehen Suedwest:410:h:0:6900:501:502:504:0:28110
+Das Erste:410:h:0:6900:101:102:104:0:28106
+hessen fernsehen:410:h:0:6900:301:302:304:0:28108
+BR-alpha:410:h:0:6900:701:702:704:0:28112
+SWR Fernsehen:410:h:0:6900:801:802:804:0:28113
+Phoenix:410:h:0:6900:255:256:0:0:28114
+Phoenix:410:h:0:6900:255:256:0:0:61225
+ARD-Online-Kanal:426:h:0:6900:0:1801:0:0:28218
+EinsExtra:426:h:0:6900:101:102:0:0:28201
+EinsFestival:426:h:0:6900:201:202:0:0:28202
+EinsMuXx:426:h:0:6900:301:302:0:0:28203
+MDR FERNSEHEN:426:h:0:6900:401:402:404:0:28204
+ORB-Fernsehen:426:h:0:6900:501:502:504:0:28205
+B1 Berlin:426:h:0:6900:601:602:604:0:28206
+N3:426:h:0:6900:2401:2402:2404:0:28224
+TV Polonia:434:h:0:6900:641:642:0:0:53204
+Kanal D:434:h:0:6900:651:652:0:0:53205
+RTP international:434:h:0:6900:661:662:0:0:53206
+ATV:434:h:0:6900:631:632:0:0:53203
+ERT-Sat:434:h:0:6900:691:692:0:0:53209
+CNE:434:h:0:6900:255:256:0:0:53208
+ERT-Sat:434:h:0:6900:255:256:0:0:48587
+ZEE TV:442:h:0:6900:517:773:0:0:53301
+NTV i:442:h:0:6900:514:515:0:0:53302
+:verschlüsselte Radioprogramme
+LOVE SONGS:362:h:0:6900:0:320:0:1:163
+MUSICALS:362:h:0:6900:0:336:0:1:164
+EASY LISTENING:362:h:0:6900:0:304:0:1:162
+HITLISTE:362:h:0:6900:0:784:0:1:150
+ALTERNATIVE ROCK:362:h:0:6900:0:800:0:1:151
+DANCE:362:h:0:6900:0:816:0:1:152
+COUNTRY:362:h:0:6900:0:352:0:1:153
+CLASSIC ROCK:362:h:0:6900:0:544:0:1:154
+FILMMUSIK:362:h:0:6900:0:368:0:1:155
+DEUTSCHE HITS:362:h:0:6900:0:384:0:1:156
+SOUL CLASSICS:362:h:0:6900:0:400:0:1:157
+TÜRK MÜZIGI:362:h:0:6900:0:560:0:1:158
+GOLD:362:h:0:6900:0:576:0:1:159
+KLASSIK POPULÄR:362:h:0:6900:0:592:0:1:145
+KLASS. SYMPHONIEN:362:h:0:6900:0:608:0:1:146
+OPER & VOKALMUSIK:362:h:0:6900:0:624:0:1:147
+BAROCKMUSIK:362:h:0:6900:0:640:0:1:148
+SCHLAGER:378:h:0:6900:0:320:0:1:166
+VOLKSMUSIK:378:h:0:6900:0:336:0:1:167
+OLD GOLD:378:h:0:6900:0:304:0:1:165
+:Radioprogramme
+100,6:354:h:0:6900:0:1312:0:0:161
+DLR-Berlin:394:h:0:6900:0:710:0:0:28012
+DLF-Köln:394:h:0:6900:0:810:0:0:28013
+Österreich 1:394:h:0:6900:0:169:0:0:28017
+Bayern 4 Klassik:410:h:0:6900:0:3001:0:0:28120
+B5 aktuell:410:h:0:6900:0:3101:0:0:28121
+Bremen 2:410:h:0:6900:0:3801:0:0:28128
+Bayern 1:410:h:0:6900:0:3601:0:0:28126
+NDR 4 Info:410:h:0:6900:0:3701:0:0:28127
+SR 1:410:h:0:6900:0:3901:0:0:28129
+HR2 plus:410:h:0:6900:0:3401:0:0:28124
+HR2:410:h:0:6900:0:3301:0:0:28123
+hr-chronos:410:h:0:6900:0:3201:0:0:28122
+HR XXL:410:h:0:6900:0:3501:0:0:28125
+Radio 3:426:h:0:6900:0:701:0:0:28207
+MDR KULTUR:426:h:0:6900:0:801:0:0:28208
+Fritz:426:h:0:6900:0:901:0:0:28209
+JUMP:426:h:0:6900:0:1001:0:0:28210
+MDR info:426:h:0:6900:0:1101:0:0:28211
+SPUTNIK:426:h:0:6900:0:1201:0:0:28212
+SFB4 Multikulti:426:h:0:6900:0:1301:0:0:28213
+SWR-2:426:h:0:6900:0:1401:0:0:28214
+WDR3:426:h:0:6900:0:1501:0:0:28215
+WDR Radio 5:426:h:0:6900:0:1601:0:0:28216
+All Jazz:442:h:0:6900:0:535:0:0:53350
+Cristal New Age:442:h:0:6900:0:536:0:0:53351
+Movie Sounds:442:h:0:6900:0:537:0:0:53352
+Sinfonica:442:h:0:6900:0:538:0:0:53353
+Opernfestival:442:h:0:6900:0:539:0:0:53354
+Barock Fantasie:442:h:0:6900:0:540:0:0:53355
+Musica Camerata:442:h:0:6900:0:541:0:0:53356
+Musica Antica:442:h:0:6900:0:542:0:0:53357
+Adagio:442:h:0:6900:0:543:0:0:53358