diff --git a/application/pom.xml b/application/pom.xml
index 6542605..c556595 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.psi</groupId>
         <artifactId>fda.ui</artifactId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>application</artifactId>
diff --git a/branding/pom.xml b/branding/pom.xml
index b2ca1a1..6d23b5d 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.psi</groupId>
         <artifactId>fda.ui</artifactId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>branding</artifactId>
diff --git a/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 60d691f..8ac3b45 100644
--- a/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,2 +1,2 @@
-CTL_MainWindow_Title=FDA 1.1.35
-CTL_MainWindow_Title_No_Project=FDA 1.1.35
+CTL_MainWindow_Title=FDA 1.1.36
+CTL_MainWindow_Title_No_Project=FDA 1.1.36
diff --git a/fda.ui.cdump/pom.xml b/fda.ui.cdump/pom.xml
index dc1b099..fd83def 100644
--- a/fda.ui.cdump/pom.xml
+++ b/fda.ui.cdump/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>fda.ui</artifactId>
         <groupId>ch.psi</groupId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>fda.ui.cdump</artifactId>
diff --git a/fda.ui.ce/pom.xml b/fda.ui.ce/pom.xml
index 1b7adca..e0a5ea1 100644
--- a/fda.ui.ce/pom.xml
+++ b/fda.ui.ce/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>fda.ui</artifactId>
         <groupId>ch.psi</groupId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>fda.ui.ce</artifactId>
diff --git a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
deleted file mode 100644
index da86d45..0000000
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
+++ /dev/null
@@ -1,262 +0,0 @@
-ShellActionPanel.jTextField1.text=Command
-ChannelActionPanel.jLabel2.text=Value:
-ChannelActionPanel.jLabel2.toolTipText=
-ChannelActionPanel.jLabel3.text=Operation:
-ChannelActionPanel.Operation.text=
-ChannelActionPanel.jLabel4.text=Type:
-ChannelActionPanel.jLabel5.text=Timeout [s]:
-ChannelActionPanel.jLabel6.text=Delay [s]:
-ChannelActionPanel.jButton1.text=
-ChannelActionPanel.Type.toolTipText=Type (Optional)
-ChannelActionPanel.Type.text=
-ChannelActionPanel.Timeout.toolTipText=Timeout in seconds (Optional)
-ChannelActionPanel.Timeout.text=
-ChannelActionPanel.Delay.toolTipText=Delay (in seconds) to wait after the action was executed (Optional)
-ChannelActionPanel.Delay.text=
-ShellActionPanel.jButton1.text=jButton1
-ShellActionPanel.jTextField1.toolTipText=Shell command
-ChannelAction2Panel.Timeout.text=
-RegionPanel.jLabel1.text=Start
-RegionPanel.jLabel2.text=End:
-RegionPanel.jLabel3.text=oen
-ChannelActionPanel.jTextFieldValue.toolTipText=Channel value
-ChannelActionPanel.jTextFieldValue.text=
-RegionPanel.jLabel1.text_1=Start:
-RegionPanel.jLabel2.text_1=End:
-RegionPanel.jLabel3.text_1=Step Size:
-DiscreteStepPositionerPanel.jLabel2.text=Readback:
-DiscreteStepPositionerPanel.jLabel3.text=Settling Time:
-DiscreteStepPositionerPanel.jButton1.text=
-DiscreteStepPositionerPanel.jLabel4.text=Done:
-DiscreteStepPositionerPanel.jLabel5.text=Done Value:
-DiscreteStepPositionerPanel.Settling\ Time.text=
-DiscreteStepPositionerPanel.Settling\ Time.toolTipText=Positioner settling time
-DiscreteStepPositionerPanel.Done.toolTipText=Channel indicating done of movement
-DiscreteStepPositionerPanel.Done.text=
-DiscreteStepPositionerPanel.Done\ Value.toolTipText=Value of done channel that indicated done (Integer)
-DiscreteStepPositionerPanel.Done\ Value.text=
-DiscreteStepPositionerPanel.Readback.toolTipText=Readback channel of the positioner
-DiscreteStepPositionerPanel.Readback.text=
-DiscreteStepPositionerPanel.Name.toolTipText=Name of positioner
-DiscreteStepPositionerPanel.Name.text=Channel Name
-RegionPanel.jButton1.text=
-ChannelActionPanel.jFormattedTextFieldChannel.text=Channel Name
-ChannelActionPanel.jFormattedTextFieldChannel.toolTipText=Channel name
-DiscreteStepPositionerPanel.jLabel6.text=Done Delay:
-DiscreteStepPositionerPanel.Done\ Delay.toolTipText=Delay before done channel is checked
-DiscreteStepPositionerPanel.Done\ Delay.text=
-RegionPanel.Step\ Size.toolTipText=Step size
-RegionPanel.Step\ Size.text=
-RegionPanel.Start.toolTipText=Start
-RegionPanel.Start.text=
-RegionPanel.End.toolTipText=End
-RegionPanel.End.text=
-LinearPositionerPanel.jLabel1.text=Start:
-LinearPositionerPanel.jLabel2.text=End:
-LinearPositionerPanel.jLabel3.text=Step Size:
-LinearPositionerPanel.Start.text=
-LinearPositionerPanel.End.text=
-LinearPositionerPanel.StepSize.text=
-ArrayPositionerPanel.jLabel2.text=Positions:
-ArrayPositionerPanel.Positions.toolTipText=Positions [space separated]
-ArrayPositionerPanel.Positions.text=
-ScalarDetectorPanel.jButton1.toolTipText=Add optional field(s)
-ScalarDetectorPanel.jButton1.text=
-ScalarDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jLabel2.text=Array Size:
-ArrayDetectorPanel.jButton1.text=
-ArrayDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.text=
-TimestampDetectorPanel.jLabel1.text=[ms]
-SimpleScalarDetectorPanel.jTextFieldName.text=Channel Name
-ScalerChannelPanel.jLabel1.text=Scaler Number:
-ScalerChannelPanel.jFormattedTextFieldNumber.text=
-ScalerChannelPanel.jFormattedTextFieldNumber.toolTipText=Number of the scaler
-PseudoPositionerPanel.jLabel1.text=Count:
-PseudoPositionerPanel.jFormattedTextFieldCount.toolTipText=Number of pseudo steps
-PseudoPositionerPanel.jFormattedTextFieldCount.text=
-ContinuousPositionerPanel.jLabel2.text=Readback:
-ContinuousPositionerPanel.jLabel3.text=Start:
-ContinuousPositionerPanel.jLabel4.text=End:
-ContinuousPositionerPanel.jLabel5.text=Step Size:
-ContinuousPositionerPanel.jLabel6.text=Integration Time:
-ContinuousPositionerPanel.jLabel7.text=Additional Backlash:
-ContinuousPositionerPanel.Name.toolTipText=Channel Name
-ContinuousPositionerPanel.Name.text=Channel Name
-ContinuousPositionerPanel.Readback.text=
-ContinuousPositionerPanel.jTextFieldReadback.toolTipText=Readback
-ContinuousPositionerPanel.Start.text=
-ContinuousPositionerPanel.End.text=
-ContinuousPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-ContinuousPositionerPanel.Step\ Size.toolTipText=Step Size
-ContinuousPositionerPanel.Step\ Size.text=
-ContinuousPositionerPanel.Integration\ Time.text=
-ContinuousPositionerPanel.jFormattedTextFieldIntegrationTime.toolTipText=Integration Time
-ContinuousPositionerPanel.Additional\ backlash.toolTipText=Additional backlash
-ContinuousPositionerPanel.Additional\ backlash.text=
-ContinuousPositionerPanel.jButton1.text=
-ContinuousPositionerPanel.jButton1.toolTipText=Add optional item
-ScanPanel.jButton1.text=
-ScanPanel.jButton1.toolTipText=Add optional items
-ScanPanel.collapsibleListContainerDimension.toolTipText=Dimensions
-ConfigurationPanel.Number\ of\ Execution.text=
-ConfigurationPanel.jLabel1.text=Number of Execution:
-GuardConditionPanel.jLabel2.text=Value:
-GuardConditionPanel.jLabel3.text=Type:
-GuardConditionPanel.Channel.toolTipText=Guard channel
-GuardConditionPanel.Channel.text=Channel Name
-GuardConditionPanel.Value.toolTipText=Value
-GuardConditionPanel.Value.text=
-GuardConditionPanel.jButton1.text=
-ConfigurationPanel.jLabel2.text=Data Format:
-ScriptActionPanel.jTextArea1.text=
-DiscreteStepDimensionPanel.jButton1.text=
-ScriptActionPanel.jTextArea1.toolTipText=Jython Script
-SimpleScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ChannelActionPanel.jFormattedTextFieldDelay.toolTipText=Delay in seconds
-ChannelActionPanel.jComboBoxType.toolTipText=Type of channel
-ChannelActionPanel.jComboBoxOperation.toolTipText=Operation to perform
-ArrayDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.toolTipText=Array Size
-ConfigurationPanel.jFormattedTextFieldNumber.toolTipText=Number of executions
-ContinuousPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-LinearPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-LinearPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-TimestampDetectorPanel.jLabel1.toolTipText=Timestamp in ms
-ConfigurationPanel.jLabel3.text=File Name:
-ConfigurationPanel.jTextFieldFileName.text=
-DiscreteStepDimensionPanel.ZigZag.text=ZigZag
-ContinuousDimensionPanel.jButton1.text=
-ContinuousDimensionPanel.jButton1.toolTipText=Add optional items
-LinePlotPanel.jLabel1.text=Title:
-LinePlotPanel.jLabel2.text=X:
-LinePlotPanel.jLabel3.text=Y:
-LinePlotPanel.jButton1.text=
-LinePlotPanel.Title.text=
-LinePlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-LinePlotPanel.jComboBoxX.toolTipText=x-Axis
-LinePlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jButton1.text=
-MatrixPlotPanel.jComboBoxX.toolTipText=x-Axis
-MatrixPlotPanel.jLabel3.text=Y:
-MatrixPlotPanel.jLabel2.text=X:
-MatrixPlotPanel.jLabel1.text=Title:
-MatrixPlotPanel.jLabel4.text=Z:
-MatrixPlotPanel.jComboBoxZ.toolTipText=Plot Value
-ConfigurationPanel.jButton1.text=
-ChannelParameterMappingPanel.jLabel1.text=Type:
-ChannelParameterMappingPanel.Type.toolTipText=Id to map this variable
-ChannelParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jTextField2.text=Variable
-IDParameterMappingPanel.jLabel1.text=Id:
-IDParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jLabel1.text_1=Id:
-IDParameterMappingPanel.jButton1.text_1=
-ScriptManipulationPanel.jButton1.text=
-ScriptManipulationPanel.jTextFieldId.text=Id
-ScriptManipulationPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jTextFieldId.text=Id
-ContinuousPositionerPanel.jLabel1.text=Id:
-ContinuousPositionerPanel.jTextFieldId.text=Id
-ArrayDetectorPanel.jLabel1.text=Id:
-ArrayDetectorPanel.jTextFieldId.text=Id
-PseudoPositionerPanel.jLabel2.text=Id:
-PseudoPositionerPanel.jTextFieldId.text=Id
-ScalarDetectorPanel.jLabel1.text=Id:
-ScalarDetectorPanel.jTextFieldId.text=Id
-ScalerChannelPanel.jLabel2.text=Id:
-ScalerChannelPanel.jTextFieldId.text=Id
-SimpleScalarDetectorPanel.jLabel1.text=Id:
-SimpleScalarDetectorPanel.jTextFieldId.text=Id
-TimestampDetectorPanel.jLabel2.text=Id:
-TimestampDetectorPanel.jTextFieldId.text=Id
-ConfigurationPanel.jCheckBoxFailOnSensorError.text=Fail on Sensor Error
-ScriptActionPanel.jButton1.text=
-ScriptActionPanel.jButton1.toolTipText=Add optional items
-ConfigurationPanel.jButton2.text=
-PseudoPositionerPanel.Settling\ Time.text=
-PseudoPositionerPanel.jLabel3.text=Settling Time:
-PseudoPositionerPanel.jButton1.text=
-PseudoPositionerPanel.jLabel4.text=Done:
-PseudoPositionerPanel.Done.text=
-PseudoPositionerPanel.jLabel5.text=Done Value:
-PseudoPositionerPanel.Done\ Value.text=
-PseudoPositionerPanel.jLabel6.text=Done Delay:
-PseudoPositionerPanel.Done\ Delay.text=
-DiscreteStepDimensionPanel.Data\ Group.text=Data Group
-ContinuousDimensionPanel.Data\ Group.text=Data Group
-ScalarDetectorPanel.Type.toolTipText=Data type
-ScalarDetectorPanel.jLabel2.text=Type:
-RecipientPanel.jButton1.text=Test
-RecipientPanel.jButton1.toolTipText=Send test notification
-ChannelParameterMappingPanel.jTextFieldVariable.text=Variable
-ChannelParameterMappingPanel.jTextFieldName.text=Channel Name
-DiscreteStepDimensionPanel.jCheckBoxZigZag.toolTipText=ZigZag Dimension
-IDParameterMappingPanel.jTextFieldVariable.text_1=Variable
-RecipientPanel.jTextFieldSms.toolTipText=email address or SMS number
-RecipientPanel.jTextFieldSms.text=SMS, E-Mail
-ContinuousDimensionPanel.ZigZag.toolTipText=ZigZag
-ContinuousDimensionPanel.ZigZag.text=ZigZag
-RecipientPanel.Error.text=Error
-RecipientPanel.Success.text=Success
-RecipientPanel.jButton2.text=
-RegionPanel.jLabel4.text=Function:
-FunctionPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-FunctionPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-FunctionPositionerPanel.jLabel3.text=Step Size:
-FunctionPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-FunctionPositionerPanel.jLabel1.text=Start:
-FunctionPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-FunctionPositionerPanel.jLabel2.text=End:
-SimpleScalarDetectorPanel.jButton1.text=
-SimpleScalarDetectorPanel.SCR.text=SCR
-LinePlotArrayPanel.jButton1.text=
-LinePlotArrayPanel.jLabel3.text=Y:
-LinePlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-LinePlotArrayPanel.jLabel1.text=Title:
-LinePlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jComboBoxZ.toolTipText=Array value to plot
-MatrixPlotArrayPanel.jLabel4.text=Z:
-MatrixPlotArrayPanel.jLabel1.text=Title:
-MatrixPlotArrayPanel.jButton1.text=
-MatrixPlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jLabel3.text=Y:
-MatrixPlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotArrayPanel.jLabel2.text=Size:
-LinePlotArrayPanel.jLabel2.text=Max Series:
-LinePlotArrayPanel.jLabel2.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.text=
-LinePlotPanel.jButton2.text=
-LinePlotArrayPanel.jLabel4.text=Offset:
-LinePlotArrayPanel.jLabel5.text=Size:
-LinePlotArrayPanel.Offset.text=
-LinePlotArrayPanel.Size.text=
-MatrixPlotArrayPanel.jLabel5.text=Offset:
-MatrixPlotArrayPanel.Offset.text=
-MatrixPlotArrayPanel.Size.toolTipText=Size of array specified as Z
-MatrixPlotArrayPanel.Size.text=
-LinePlotArrayPanel.jButton2.text=
-GlobalVariablePanel.jLabel1.text=Name:
-GlobalVariablePanel.jLabel2.text=Value:
-GlobalVariablePanel.jTextFieldName.text=
-GlobalVariablePanel.jTextFieldValue.text=
-FunctionPanel.jButton1.text=
-GlobalVariableParameterMappingPanel.jLabel1.text_1=Variable:
-GlobalVariableParameterMappingPanel.jButton1.text_1=
-GlobalVariableParameterMappingPanel.jTextFieldVariable.text_1=Variable
-ConfigurationPanel.Description.text=
-GlobalVariablePanel.jButton1.text=
-GlobalVariablePanel.jTextFieldDescription.text=Description
-ScriptManipulationPanel.Returns\ Array.text=Array
-LinearPositionerPanel.Asynchronous.toolTipText=Asynchronous move
-LinearPositionerPanel.Asynchronous.text=Asynchronous
-DiscreteStepPositionerPanel.Asynchronous.text=Asynchronous:
-DiscreteStepPositionerPanel.jLabel7.text=Type:
-PseudoPositionerPanel.jLabel7.text=Type:
diff --git a/fda.ui.cm/pom.xml b/fda.ui.cm/pom.xml
index 1b3abd8..79d4dee 100644
--- a/fda.ui.cm/pom.xml
+++ b/fda.ui.cm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>fda.ui</artifactId>
         <groupId>ch.psi</groupId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>fda.ui.cm</artifactId>
diff --git a/fda.ui.ee/pom.xml b/fda.ui.ee/pom.xml
index 92cd6ea..e2857ff 100644
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.ee/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>fda.ui</artifactId>
         <groupId>ch.psi</groupId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
     
     <artifactId>fda.ui.ee</artifactId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>ch.psi</groupId>
             <artifactId>fda</artifactId>
-            <version>1.1.35-SNAPSHOT</version>
+            <version>1.1.36-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
     </dependencies>
diff --git a/fda.ui.preferences/pom.xml b/fda.ui.preferences/pom.xml
index caaf836..1e101a2 100644
--- a/fda.ui.preferences/pom.xml
+++ b/fda.ui.preferences/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>fda.ui</artifactId>
         <groupId>ch.psi</groupId>
-        <version>1.1.35</version>
+        <version>1.1.36</version>
     </parent>
 
     <artifactId>fda.ui.preferences</artifactId>
diff --git a/pom.xml b/pom.xml
index b9b2e61..54025fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>ch.psi</groupId>
     <artifactId>fda.ui</artifactId>
-    <version>1.1.35</version>
+    <version>1.1.36</version>
     <packaging>pom</packaging>
 
     <name>fda.ui - NB App Parent</name>
@@ -69,12 +69,12 @@
         <snapshotRepository>
             <id>i.snapshots</id>
             <name>Artifactory Snapshots</name>
-            <url>http://slsyoke1/artifactory/libs-snapshots-local</url>
+            <url>http://yoke/artifactory/libs-snapshots-local</url>
         </snapshotRepository>
         <repository>
             <id>i.releases</id>
             <name>Atrifactory Releases</name>
-            <url>http://slsyoke1/artifactory/libs-releases-local</url>
+            <url>http://yoke/artifactory/libs-releases-local</url>
         </repository>
     </distributionManagement>