diff --git a/builder-product.cfg b/builder-product.cfg
index b5b848f..522c1d5 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -194,7 +194,7 @@ ICON_DL_INDEX=0
 # WINST_VALUE[0] is used in builder-target-cb.sh
 # if you change the index of this you also have to change it in the *.sh file
 WINST_NAME[0]="ImageTypesExt"
-WINST_VALUE[0]="bmp-bmp dds-dds gif-gif jpg-jpg jpe-jpe jpeg-jpeg pcx-pcx png-png psd-psd 8psd-8psd tga-tga tif-tif tiff-tiff dcx-dcx emf-emf exr-exr flc-flc fli-fli ico-ico jbg-jbg jbig-jbig jp2-jp2 jpc-jpc j2k-j2k mng-mng bpm-bpm pcd-pcd rgb-rgb wbmp-wbmp wbm-wbm webp-webp wmf-wmf wpg-wpg xbm-xbm xcf-xcf xpm-xpm"
+WINST_VALUE[0]="BMP-bmp DDS-dds GIF-gif JPG-jpg JPE-jpe JPEG-jpeg PCX-pcx PNG-png PSD-psd 8PSD-8psd TGA-tga TIF-tif TIFF-tiff DCX-dcx EMF-emf EXR-exr FLC-flc FLI-fli ICO-ico JBG-jbg JBIG-jbig JP2-jp2 JPC-jpc J2K-j2k MNG-mng BPM-bpm PCD-pcd RGB-rgb WBMP-wbmp WBM-wbm WEBP-webp WMF-wmf WPG-wpg XBM-xbm XCF-xcf XPM-xpm"
 
 
 OPSI_INI_SECTION[0]="X86"
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 6fdaafc..cddefaa 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -34,29 +34,29 @@ function create() {
     pushd $INST_DIR/CLIENT_DATA/ALL/
     for typenr in ${WINST_VALUE[0]}
     do
-	type=${typenr/-*/}
+	type=${typenr/*-/}
 	### 24bit #############################################################################################################################################
 	# 256x256
-	convert -verbose -size 256x256 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 68 -fill white -stroke grey -strokewidth 1 -draw "gravity south text 0,5 '$type'" $type-256x256-txt.png
+	convert -verbose -size 256x256 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 68 -fill white -stroke black -strokewidth 2 -draw "gravity south text 0,5 '$type'" $type-256x256-txt.png
 	composite -verbose -quality 100 $type-256x256-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_256x256.png $type-256x256-24bit.png
 	# 180x180
 	convert -verbose -resize 180x180 $type-256x256-24bit.png $type-180x180-24bit.png
 	# 150x150
 	convert -verbose -resize 150x150 $type-256x256-24bit.png $type-150x150-24bit.png
 	# 128x128
-	convert -verbose -size 128x128 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 37 -fill white -stroke grey -strokewidth 1 -draw "gravity south text 0,3 '$type'" $type-128x128-txt.png
+	convert -verbose -size 128x128 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 37 -fill white -stroke black -strokewidth 2 -draw "gravity south text 0,3 '$type'" $type-128x128-txt.png
 	composite -verbose -quality 100 $type-128x128-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_128x128.png $type-128x128-24bit.png
 	# 96x96
 	convert -verbose -resize 96x96 $type-256x256-24bit.png $type-96x96-24bit.png
 	# 72x72
 	convert -verbose -resize 72x72 $type-256x256-24bit.png $type-72x72-24bit.png
 	# 64x64
-	convert -verbose -size 64x64 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 18 -fill white -stroke grey -strokewidth 1 -draw "gravity south text 0,2 '$type'" $type-64x64-txt.png
+	convert -verbose -size 64x64 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 18 -fill white -stroke black -strokewidth 1 -draw "gravity south text 0,2 '$type'" $type-64x64-txt.png
 	composite -verbose -quality 100 $type-64x64-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_64x64.png $type-64x64-24bit.png
 	# 50x50
 	convert -verbose -resize 50x50 $type-64x64-24bit.png $type-50x50-24bit.png
 	# 48x48
-	convert -verbose -size 48x48 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 14 -fill white -stroke grey -strokewidth 1 -draw "gravity south text 0,1 '$type'" $type-48x48-txt.png
+	convert -verbose -size 48x48 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 14 -fill black -draw "gravity south text 0,1 '$type'" $type-48x48-txt.png
 	composite -verbose -quality 100 $type-48x48-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_48x48.png $type-48x48-24bit.png
 	# 40x40
 	convert -verbose -resize 40x40 $type-48x48-24bit.png $type-40x40-24bit.png
@@ -67,7 +67,7 @@ function create() {
 	# 24x24
 	convert -verbose -resize 24x24 $type-48x48-24bit.png $type-24x24-24bit.png
 	# 16x16
-	convert -verbose -size 16x16 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 5 -fill white -stroke grey -strokewidth 1  -draw "gravity south text 0,1 '$type'" $type-16x16-txt.png
+	convert -verbose -size 16x16 xc:transparent -font DejaVu-Sans-Condensed-Bold -pointsize 5 -fill black -draw "gravity south text 0,1 '$type'" $type-16x16-txt.png
 	composite -verbose -quality 100 $type-16x16-txt.png $INST_DIR/CLIENT_DATA/ALL/Template/icon_imagine_24bit_16x16.png $type-16x16-24bit.png
 
 	#### 8bit #############################################################################################################################################
@@ -192,14 +192,24 @@ function create() {
 
 	# combine the images into a icon
 	icotool -c -o $INST_DIR/CLIENT_DATA/ALL/Icons/$type.ico \
-	$type-256x256-24bit.png $type-180x180-24bit.png $type-150x150-24bit.png $type-128x128-24bit.png $type-96x96-24bit.png $type-72x72-24bit.png $type-64x64-24bit.png \
-	$type-50x50-24bit.png $type-48x48-24bit.png $type-40x40-24bit.png $type-32x32-24bit.png $type-30x30-24bit.png $type-24x24-24bit.png $type-16x16-24bit.png \
-	$type-256x256-8bit.png $type-180x180-8bit.png $type-150x150-8bit.png $type-128x128-8bit.png $type-96x96-8bit.png $type-72x72-8bit.png $type-64x64-8bit.png \
-	$type-50x50-8bit.png $type-48x48-8bit.png $type-40x40-8bit.png $type-32x32-8bit.png $type-30x30-8bit.png $type-24x24-8bit.png $type-16x16-8bit.png \
-	$type-256x256-4bit.png $type-180x180-4bit.png $type-150x150-4bit.png $type-128x128-4bit.png $type-96x96-4bit.png $type-72x72-4bit.png $type-64x64-4bit.png \
-	$type-50x50-4bit.png $type-48x48-4bit.png $type-40x40-4bit.png $type-32x32-4bit.png $type-30x30-4bit.png $type-24x24-4bit.png $type-16x16-4bit.png
+	$type-256x256-24bit.png $type-128x128-24bit.png $type-64x64-24bit.png \
+	$type-48x48-24bit.png $type-32x32-24bit.png $type-24x24-24bit.png $type-16x16-24bit.png \
+	$type-256x256-8bit.png $type-128x128-8bit.png $type-64x64-8bit.png \
+	$type-48x48-8bit.png $type-32x32-8bit.png $type-24x24-8bit.png $type-16x16-8bit.png \
+	$type-256x256-4bit.png $type-128x128-4bit.png $type-64x64-4bit.png \
+	$type-48x48-4bit.png $type-32x32-4bit.png $type-24x24-4bit.png $type-16x16-4bit.png
+
+
+#	$type-256x256-24bit.png $type-180x180-24bit.png $type-150x150-24bit.png $type-128x128-24bit.png $type-96x96-24bit.png $type-72x72-24bit.png $type-64x64-24bit.png \
+#	$type-50x50-24bit.png $type-48x48-24bit.png $type-40x40-24bit.png $type-32x32-24bit.png $type-30x30-24bit.png $type-24x24-24bit.png $type-16x16-24bit.png \
+#	$type-256x256-8bit.png $type-180x180-8bit.png $type-150x150-8bit.png $type-128x128-8bit.png $type-96x96-8bit.png $type-72x72-8bit.png $type-64x64-8bit.png \
+#	$type-50x50-8bit.png $type-48x48-8bit.png $type-40x40-8bit.png $type-32x32-8bit.png $type-30x30-8bit.png $type-24x24-8bit.png $type-16x16-8bit.png \
+#	$type-256x256-4bit.png $type-180x180-4bit.png $type-150x150-4bit.png $type-128x128-4bit.png $type-96x96-4bit.png $type-72x72-4bit.png $type-64x64-4bit.png \
+#	$type-50x50-4bit.png $type-48x48-4bit.png $type-40x40-4bit.png $type-32x32-4bit.png $type-30x30-4bit.png $type-24x24-4bit.png $type-16x16-4bit.png
+
+
     done
-    popd
+	popd
 
     cp $INST_DIR/CLIENT_DATA/ALL/Icons/*.ico $INST_DIR/CLIENT_DATA/X86/Icons
     cp $INST_DIR/CLIENT_DATA/ALL/Icons/*.ico $INST_DIR/CLIENT_DATA/X86_64/Icons