diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
index 4c5b5a8aa..2cd5249f4 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_ru.properties
@@ -438,3 +438,17 @@ node.others = \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u0435
 
 #after version 1.8.1
 menu.tools.search = \u041f\u043e\u0438\u0441\u043a \u0442\u0435\u043a\u0441\u0442\u0430
+
+#after version 1.8.1u1
+menu.tools.timeline = Timeline
+
+dialog.selectcolor.title = \u0412\u044b\u0431\u043e\u0440 \u0446\u0432\u0435\u0442\u0430
+button.selectcolor.hint = \u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u0434\u043b\u044f \u0432\u044b\u0431\u043e\u0440\u0430 \u0446\u0432\u0435\u0442\u0430
+
+#default item name, will be used in following sentences
+generictag.array.item = \u044d\u043b\u0435\u043c\u0435\u043d\u0442
+generictag.array.insertbeginning = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u0432 \u043d\u0430\u0447\u0430\u043b\u043e
+generictag.array.insertbefore = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u043f\u0435\u0440\u0435\u0434
+generictag.array.remove = \u0423\u0434\u0430\u043b\u0438\u0442\u044c %item%
+generictag.array.insertafter = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u043f\u043e\u0441\u043b\u0435
+generictag.array.insertend = \u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c %item% \u0432 \u043a\u043e\u043d\u0435\u0446
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
index 7e0b4a371..8cc5c99a6 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript2AssemblerTest.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoActionTag;
 import com.jpexs.decompiler.graph.ExportMode;
@@ -60,10 +61,10 @@ public class ActionScript2AssemblerTest extends ActionStript2TestBase {
 
             DoActionTag doa = getFirstActionTag();
             doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
-            HilightedTextWriter writer = new HilightedTextWriter(false);
+            HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
             Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
             String actualResult = writer.toString();
-            writer = new HilightedTextWriter(false);
+            writer = new HilightedTextWriter(new CodeFormatting(), false);
             doa.getASMSource(swf.version, ExportMode.PCODE, writer, null);
             String decompiled = writer.toString();
 
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
index ff12acd31..3886e09bd 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java
@@ -20,6 +20,7 @@ import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.action.parser.ParseException;
 import com.jpexs.decompiler.flash.action.parser.pcode.ASMParser;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoActionTag;
 import java.io.BufferedInputStream;
@@ -77,7 +78,7 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase {
 
             DoActionTag doa = getFirstActionTag();
             doa.setActionBytes(Action.actionsToBytes(actions, true, swf.version));
-            HilightedTextWriter writer = new HilightedTextWriter(false);
+            HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
             Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
             String actualResult = writer.toString();
 
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java
index aa37516bb..36dcad71b 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript2Test.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoActionTag;
 import com.jpexs.decompiler.flash.tags.ShowFrameTag;
@@ -48,7 +49,7 @@ public class ActionScript2Test extends ActionStript2TestBase {
     private void compareSrc(int frame, String expectedResult) {
         DoActionTag doa = getFrameSource(frame);
         assertNotNull(doa);
-        HilightedTextWriter writer = new HilightedTextWriter(false);
+        HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
         try {
             Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
         } catch (InterruptedException ex) {
diff --git a/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java b/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
index d27ab783b..0fe3159cd 100644
--- a/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
+++ b/trunk/test/com/jpexs/decompiler/flash/ActionScript3Test.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash;
 
 import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.helpers.NulWriter;
 import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
@@ -71,7 +72,7 @@ public class ActionScript3Test {
         HilightedTextWriter writer = null;
         try {
             abc.bodies[bodyIndex].convert(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, new NulWriter(), new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits, true);
-            writer = new HilightedTextWriter(false);
+            writer = new HilightedTextWriter(new CodeFormatting(), false);
             abc.bodies[bodyIndex].toString(methodName, ExportMode.SOURCE, isStatic, -1/*FIX?*/, clsIndex, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, writer, new ArrayList<String>(), abc.instance_info[clsIndex].instance_traits);
         } catch (InterruptedException ex) {
             fail();
@@ -892,7 +893,7 @@ public class ActionScript3Test {
         int bodyIndex = abc.findMethodBodyByName(clsIndex, methodName);
         assertTrue(methodInfo > -1);
         assertTrue(bodyIndex > -1);
-        HilightedTextWriter writer = new HilightedTextWriter(false);
+        HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
         abc.method_info[methodInfo].getParamStr(writer, abc.constants, abc.bodies[bodyIndex], abc, new ArrayList<String>());
         String actualResult = writer.toString().replaceAll("[ \r\n]", "");
         String expectedResult = "p1:Event=null,p2:Number=1,p3:Number=-1,p4:Number=-1.1,p5:Number=-1.1,p6:String=\"a\"";
diff --git a/trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java b/trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java
index bf08d7214..bfdc47255 100644
--- a/trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java
+++ b/trunk/test/com/jpexs/decompiler/flash/generators/AS2Generator.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.generators;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.action.Action;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
 import com.jpexs.decompiler.flash.tags.DoActionTag;
@@ -53,7 +54,7 @@ public class AS2Generator {
                 if (doa == null) {
                     continue;
                 }
-                HilightedTextWriter writer = new HilightedTextWriter(false);
+                HilightedTextWriter writer = new HilightedTextWriter(new CodeFormatting(), false);
                 Action.actionsToSource(doa, doa.getActions(swf.version), swf.version, "", writer);
                 String src = writer.toString();
                 if (src.trim().isEmpty()) {
diff --git a/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java b/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
index 1b0fe3815..e318e27df 100644
--- a/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
+++ b/trunk/test/com/jpexs/decompiler/flash/generators/AS3Generator.java
@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.abc.ABC;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitMethodGetterSetter;
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.helpers.CodeFormatting;
 import com.jpexs.decompiler.flash.helpers.HilightedTextWriter;
 import com.jpexs.decompiler.flash.tags.DoABCDefineTag;
 import com.jpexs.decompiler.flash.tags.Tag;
@@ -62,7 +63,7 @@ public class AS3Generator {
                     s.append("(){\r\ndecompileMethod(\"");
                     s.append(name);
                     s.append("\", ");
-                    HilightedTextWriter src = new HilightedTextWriter(false);
+                    HilightedTextWriter src = new HilightedTextWriter(new CodeFormatting(), false);
                     abc.findBody(((TraitMethodGetterSetter) t).method_info).toString("", ExportMode.SOURCE, false, -1/*FIX?*/, classId, abc, null, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, src, new ArrayList<String>(), abc.instance_info[classId].instance_traits);
                     String[] srcs = src.toString().split("[\r\n]+");
                     for (int i = 0; i < srcs.length; i++) {