diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
new file mode 100644
index 0000000..a98f557
--- /dev/null
+++ b/CLIENT_DATA/delsub32.ins
@@ -0,0 +1,107 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/en/credits/
+
+
+Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$
+Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
+
+if FileExists($IniFile$)
+	Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+	Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+	Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
+
+if FileExists($IniFile$)
+        Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
+	Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
+	if FileExists($UninstallProgramOld$)
+		comment "Uninstall program found, starting uninstall"
+		Winbatch_uninstall_old
+		sub_check_exitcode
+	endif
+endif
+if FileExists($UninstallProgram$)
+	comment "Uninstall program found, starting uninstall"
+	Winbatch_uninstall
+	sub_check_exitcode
+endif
+
+comment "Delete files"
+Files_uninstall /32Bit
+
+comment "Disables the pop-up browser window"
+Winbatch_killtasks
+
+comment "Cleanup registry"
+Registry_uninstall /32Bit
+
+comment "Delete program shortcuts"
+LinkFolder_uninstall
+
+[Winbatch_uninstall_old]
+"$UninstallProgramOld32$" /uninstall /silent
+
+[Winbatch_uninstall]
+"$UninstallProgram32$" /uninstall /silent
+
+[Winbatch_killtasks]
+taskkill /F /IM iexplore.exe
+taskkill /F /IM iron.exe
+taskkill /F /IM firefox.exe
+taskkill /F /IM chrome.exe
+taskkill /F /IM opera.exe
+
+[Files_uninstall]
+; Example for recursively deleting the installation directory:
+;
+del -sf "$InstallDir$\"
+
+[Registry_uninstall]
+; Example of deleting a registry key:
+;
+; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
+
+[LinkFolder_uninstall]
+; Example of deleting a folder from AllUsers startmenu:
+;
+; set_basefolder common_programs
+; delete_subfolder $ProductId$
+;
+; Example of deleting a shortcut from AllUsers desktop:
+;
+; set_basefolder common_desktopdirectory
+; set_subfolder ""
+; delete_element $ProductId$
+
+[Sub_check_exitcode]
+comment "Test for installation success via exit code"
+set $ExitCode$ = getLastExitCode
+; informations to exit codes see
+; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
+; http://msdn.microsoft.com/en-us/library/aa368542.aspx
+if ($ExitCode$ = "0")
+	comment "Looks good: setup program gives exitcode zero"
+else
+	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
+	if ($ExitCode$ = "1605")
+		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
+		comment "Uninstall of a not installed product failed - no problem"
+	else
+		if ($ExitCode$ = "1641")
+			comment "looks good: setup program gives exitcode 1641"
+			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
+		else
+			if ($ExitCode$ = "3010")
+				comment "looks good: setup program gives exitcode 3010"
+				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
+			else
+				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
+				isFatalError
+			endif
+		endif
+	endif
+endif
+
diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
deleted file mode 100644
index 4992878..0000000
--- a/CLIENT_DATA/delsub3264.ins
+++ /dev/null
@@ -1,163 +0,0 @@
-; Copyright (c) uib gmbh (www.uib.de)
-; This sourcecode is owned by uib gmbh
-; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/en/credits/
-
-
-Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$
-Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
-
-Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$
-Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
-
-if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-	if FileExists($IniFile32$)
-    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","")
-	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","")
-	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","")
-	endif
-	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
-
-        if FileExists($IniFile32$)
-		Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe")
-		Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
-		if FileExists($UninstallProgramOld32$)
-			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_32
-			sub_check_exitcode
-		endif
-        endif
-	if FileExists($UninstallProgram32$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_32
-		sub_check_exitcode
-	endif
-
-	comment "Delete files"
-	Files_uninstall_32 /32Bit
-
-	comment "Disables the pop-up browser window"
-	Winbatch_killtasks_32
-
-	comment "Cleanup registry"
-	Registry_uninstall /32Bit
-endif
-
-if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-	if FileExists($IniFile64$)
-    		Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","")
-	        Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","")
-	        Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","")
-	endif
-	Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
-
-        if FileExists($IniFile64$)
-		Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe")
-		Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
-		if FileExists($UninstallProgramOld64$)
-			comment "Uninstall program found, starting uninstall"
-			Winbatch_uninstall_old_64
-			sub_check_exitcode
-		endif
-        endif
-	if FileExists($UninstallProgram64$)
-		comment "Uninstall program found, starting uninstall"
-		Winbatch_uninstall_64
-		sub_check_exitcode
-	endif
-
-	comment "Delete files"
-	Files_uninstall_64 /64Bit
-
-	comment "Disables the pop-up browser window"
-	Winbatch_killtasks_64
-
-	comment "Cleanup registry"
-	Registry_uninstall /64Bit
-endif
-
-comment "Delete program shortcuts"
-LinkFolder_uninstall
-
-[Winbatch_uninstall_old_32]
-"$UninstallProgramOld32$" /uninstall /silent
-
-[Winbatch_uninstall_32]
-"$UninstallProgram32$" /uninstall /silent
-
-[Winbatch_killtasks_32]
-taskkill /F /IM iexplore.exe
-taskkill /F /IM iron.exe
-taskkill /F /IM firefox.exe
-taskkill /F /IM chrome.exe
-taskkill /F /IM opera.exe
-
-[Files_uninstall_32]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
-;
-delete -sf "$InstallDir32$\"
-
-[Winbatch_uninstall_old_64]
-"$UninstallProgramOld64$" /uninstall /silent
-
-[Winbatch_uninstall_64]
-"$UninstallProgram64$" /uninstall /silent
-
-[Winbatch_killtasks_64]
-taskkill /F /IM iexplore.exe
-taskkill /F /IM iron.exe
-taskkill /F /IM firefox.exe
-taskkill /F /IM chrome.exe
-taskkill /F /IM opera.exe
-
-[Files_uninstall_64]
-; Example for recursively deleting the installation directory:
-;
-del -sf "$InstallDir64$\"
-
-[Registry_uninstall]
-; Example of deleting a registry key:
-;
-; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-
-[LinkFolder_uninstall]
-; Example of deleting a folder from AllUsers startmenu:
-;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
-;
-; Example of deleting a shortcut from AllUsers desktop:
-;
-; set_basefolder common_desktopdirectory
-; set_subfolder ""
-; delete_element $ProductId$
-
-[Sub_check_exitcode]
-comment "Test for installation success via exit code"
-set $ExitCode$ = getLastExitCode
-; informations to exit codes see
-; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx
-; http://msdn.microsoft.com/en-us/library/aa368542.aspx
-if ($ExitCode$ = "0")
-	comment "Looks good: setup program gives exitcode zero"
-else
-	comment "Setup program gives a exitcode unequal zero: " + $ExitCode$
-	if ($ExitCode$ = "1605")
-		comment "ERROR_UNKNOWN_PRODUCT	1605	This action is only valid for products that are currently installed."
-		comment "Uninstall of a not installed product failed - no problem"
-	else
-		if ($ExitCode$ = "1641")
-			comment "looks good: setup program gives exitcode 1641"
-			comment "ERROR_SUCCESS_REBOOT_INITIATED	1641	The installer has initiated a restart. This message is indicative of a success."
-		else
-			if ($ExitCode$ = "3010")
-				comment "looks good: setup program gives exitcode 3010"
-				comment "ERROR_SUCCESS_REBOOT_REQUIRED	3010	A restart is required to complete the install. This message is indicative of a success."
-			else
-				logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$
-				isFatalError
-			endif
-		endif
-	endif
-endif
-
diff --git a/CLIENT_DATA/opsi-opera.opera.ini b/CLIENT_DATA/opsi-opera.browser.ini
similarity index 100%
rename from CLIENT_DATA/opsi-opera.opera.ini
rename to CLIENT_DATA/opsi-opera.browser.ini
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup32.ins
similarity index 65%
rename from CLIENT_DATA/setup3264.ins
rename to CLIENT_DATA/setup32.ins
index e3027e9..52016ee 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -6,28 +6,19 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProgram32$
-DefVar $UninstallProgramOld32$
-DefVar $IniFile32$
-DefVar $UninstallProgram64$
-DefVar $UninstallProgramOld64$
-DefVar $IniFile64$
+DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
+DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ProductId$  
 DefVar $MinimumSpace$
-DefVar $InstallDir32$
-DefVar $InstallDir64$
+DefVar $InstallDir$
 DefVar $ExitCode$
-DefVar $INST_SystemType$
-DefVar $INST_architecture$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
-Set $INST_SystemType$ = GetSystemType
-set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -46,80 +37,54 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ;$ProductId$ should be the name of the product in opsi
 ; therefore please: only lower letters, no umlauts, 
 ; no white space use '-' as a seperator
-Set $MinimumSpace$    = "1 MB"
+Set $MinimumSpace$    = "30 MB"
 ; the path were we find the product after the installation
-Set $InstallDir32$      = "%ProgramFiles32Dir%\Opera"
-Set $InstallDir64$      = "%ProgramFiles64Dir%\Opera x64"
+Set $InstallDir$      = "%ProgramFiles32Dir%\Opera"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
 	LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
-	isFatalError
+	isFatalError "No Space"
 	; Stop process and set installation status to failed
 else
 	comment "Show product picture"
 	ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 	
-	if FileExists("%ScriptPath%\delsub3264.ins")
+	if FileExists("%ScriptPath%\delsub32.ins")
 		comment "Start uninstall sub section"
-		Sub "%ScriptPath%\delsub3264.ins"
+		Sub "%ScriptPath%\delsub32.ins"
 	endif
 	
-	comment "installing"
-
-	if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
-		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
-		comment "Start setup program"
-		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_install_32
-		Sub_check_exitcode
-		comment "Copy files"
-		Files_install_32 /32Bit
-		comment "Patch Registry"
-		Registry_install /32Bit
-		comment "Create shortcuts"
-		LinkFolder_install
-	endif
-
-	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-		Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
-		comment "Start setup program"
-		ChangeDirectory "%SCRIPTPATH%"
-		Winbatch_install_64
-		Sub_check_exitcode
-		comment "Copy files"
-		Files_install_64 /64Bit
-		comment "Patch Registry"
-		Registry_install /64Bit
-		comment "Create shortcuts"
-		LinkFolder_install
-	endif
+	Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
+	
+	comment "Start setup program"
+	ChangeDirectory "%SCRIPTPATH%"
+	Winbatch_install
+	Sub_check_exitcode
+	
+	comment "Copy files"
+	Files_install /32Bit
+	
+	comment "Patch Registry"
+	Registry_install /32Bit
+	
+	comment "Create shortcuts"
+	LinkFolder_install
 	
 endif
 
-[Winbatch_install_32]
+[Winbatch_install]
 "$Install32Exe$" /silent /launchopera 0 /desktopshortcut 0 /quicklaunchshortcut 0 /setdefaultbrowser 0 /allusers
 
-[Files_install_32]
+[Files_install]
 ; copy the ini file to the InstallDir
-copy "$IniCfgFile$" "$InstallDir32$"
+copy "$IniCfgFile$" "$InstallDir$"
 
 ; Example of recursively copying some files into the installation directory:
 ;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
-
-[Winbatch_install_64]
-"$Install364Exe$" /silent /launchopera 0 /desktopshortcut 0 /quicklaunchshortcut 0 /setdefaultbrowser 0 /allusers
-
-[Files_install_64]
-; copy the ini file to the InstallDir
-copy "$IniCfgFile$" "$InstallDir64$"
-
-; Example of recursively copying some files into the installation directory:
-;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"
+; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall32.ins
similarity index 69%
rename from CLIENT_DATA/uninstall3264.ins
rename to CLIENT_DATA/uninstall32.ins
index bef57bd..408d93f 100644
--- a/CLIENT_DATA/uninstall3264.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -6,29 +6,18 @@
 [Actions]
 requiredWinstVersion >= "4.11.2.6"
 
-DefVar $UninstallProg32$
-DefVar $UninstallProgram32$
-DefVar $UninstallProgramOld32$
-DefVar $IniFile32$
-DefVar $UninstallProg64$
-DefVar $UninstallProgram64$
-DefVar $UninstallProgramOld64$
-DefVar $IniFile64$
+DefVar $UninstallProgram$
+DefVar $UninstallProgramOld$
+DefVar $IniFile$
 DefVar $IniCfgFile$
 DefVar $LogDir$
 DefVar $ExitCode$
 DefVar $ProductId$
-DefVar $InstallDir32$
-DefVar $InstallDir64$
-DefVar $INST_SystemType$
-DefVar $INST_architecture$
+DefVar $InstallDir$
 DefVar $OLD_VERSION$
 DefVar $OLD_CREATOR_TAG$
 DefVar $OLD_RELEASE$
 
-Set $INST_SystemType$ = GetSystemType
-set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
-
 Set $LogDir$ = "%SystemDrive%\tmp"
 
 ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@@ -44,8 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
 ; ----------------------------------------------------------------
 ; - Please edit the following values                             -
 ; ----------------------------------------------------------------
-Set $InstallDir32$    = "%ProgramFiles32Dir%\Opera"
-Set $InstallDir64$    = "%ProgramFiles64Dir%\Opera x64"
+Set $InstallDir$      = "%ProgramFiles32Dir%\Opera"
 ; ----------------------------------------------------------------
 
 Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
@@ -55,8 +43,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
 
 Message "Uninstalling " + $ProductId$ + " ..."
 
-if FileExists("%ScriptPath%\delsub3264.ins")
+if FileExists("%ScriptPath%\delsub32.ins")
 	comment "Start uninstall sub section"
-	Sub "%ScriptPath%\delsub3264.ins"
+	Sub "%ScriptPath%\delsub32.ins"
 endif
 
diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt
index e69de29..bc69317 100644
--- a/OPSI/changelog.txt
+++ b/OPSI/changelog.txt
@@ -0,0 +1,2 @@
+Don't add cahngelog entries here!
+It get autogenerated by the opsi-builder.sh
\ No newline at end of file
diff --git a/OPSI/control b/OPSI/control
index b7aa8c1..48b5f43 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -1,37 +1,30 @@
 [Package]
-version: RELEASE
+version: 2
 depends: 
 incremental: False
 
 [Product]
 type: localboot
-id: opera.opera
-name: opera
-description: Der Browser der Zukunft 
-advice: ADVICE
-version: VERSION
-priority: PRIORITY
+id: opsi-template
+name: opsi template product
+description: A template for opsi products
+advice: 
+version: 4.0.2
+priority: 0
 licenseRequired: False
 productClasses: 
-setupScript: setup3264.ins
-uninstallScript: uninstall3264.ins
+setupScript: setup32.ins
+uninstallScript: uninstall32.ins
 updateScript: 
 alwaysScript: 
 onceScript: 
 customScript: 
-userLoginScript: 
-
-[ProductProperty]
-type: unicode
-name: install_architecture
-multivalue: False
-editable: False
-description: which architecture (32/64 bit) has to be installed
-values: ["32 only", "64 only", "both", "system specific"]
-default: ["system specific"]
+userLoginScript:
 
 [ProductDependency]
 action: setup
 requiredProduct: sereby.aio
 requiredStatus: installed
 requirementType: before
+
+
diff --git a/Opera_1215_int_Setup.exe.sha1sum b/Opera_1215_int_Setup.exe.sha1sum
deleted file mode 100644
index 0d1b0a8..0000000
--- a/Opera_1215_int_Setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-16b6eba8007f19a320d3c36a35b159e3c12cafce  /home/mario/.opsi-dist-cache/opera.opera-12.15/X86/Opera_1215_int_Setup.exe
diff --git a/Opera_1215_int_Setup_x64.exe.sha1sum b/Opera_1215_int_Setup_x64.exe.sha1sum
deleted file mode 100644
index ffed6da..0000000
--- a/Opera_1215_int_Setup_x64.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-0557e2a5f513a79417bfb6b43903f030af637cad  /home/mario/.opsi-dist-cache/opera.opera-12.15/X86_64/Opera_1215_int_Setup_x64.exe
diff --git a/Opera_15.0.1147.138_Setup.exe.sha1sum b/Opera_15.0.1147.138_Setup.exe.sha1sum
new file mode 100644
index 0000000..a6e7e37
--- /dev/null
+++ b/Opera_15.0.1147.138_Setup.exe.sha1sum
@@ -0,0 +1 @@
+ff3051f368a1f1736f5d8d719b3128c18a8fd566  /home/mario/.opsi-dist-cache/opera.browser-15.0.1147.138/X86/Opera_15.0.1147.138_Setup.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 796940f..c3d74f1 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -2,10 +2,10 @@
 # Setup product information 
 ############################
 VENDOR="opera.com"
-PN="opera.opera"
+PN="opera.browser"
 NAME="Opera"
 DESCRIPTION="Der Browser der Zukunft"
-VERSION="12.15"
+VERSION="15.0.1147.138"
 RELEASE="3"
 PRIORITY="0"
 ADVICE=""
@@ -18,23 +18,15 @@ TYPE="public"
 DL_FILE[0]="opera-logo.jpg"
 DL_SOURCE[0]="http://cordis.europa.eu/fp7/ict/organic-elec-visual-display/icons/opera-logo.jpg"
 
-DL_FILE[1]="Opera_${VERSION//./}_int_Setup.exe"
-DL_SOURCE[1]="ftp://ftp.opera.com/pub/opera/win/${VERSION//./}/int/Opera_${VERSION//./}_int_Setup.exe"
+DL_FILE[1]="Opera_${VERSION}_Setup.exe"
+DL_SOURCE[1]="ftp://ftp.opera.com/pub/opera/desktop/${VERSION}/win/Opera_${VERSION}_Setup.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Exe
 
-DL_FILE[2]="Opera_${VERSION//./}_int_Setup_x64.exe"
-DL_SOURCE[2]="ftp://ftp.opera.com/pub/opera/win/${VERSION//./}/int/Opera_${VERSION//./}_int_Setup_x64.exe"
-DL_ARCH[2]="X86_64"
-DL_WINST_NAME[2]=Install64Exe
-
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
-OPSI_INI_OPTION[0]="UninstallProg32"
+OPSI_INI_OPTION[0]="UninstallProg"
 OPSI_INI_VALUE[0]="Opera.exe"
 
-OPSI_INI_SECTION[1]="X86_64"
-OPSI_INI_OPTION[1]="UninstallProg64"
-OPSI_INI_VALUE[1]="Opera.exe"