Version 5.7

CSS and JS files added plus settings added to make consistant with main
editor
Restore as new version button added
Load in new partial JS file to set the correct mode

.gitignore

@@ -1,7 +1,9 @@
 error-log.txt
-backups/*.zip
+backups/*
+!backups/index.php
 lib/config-*
 plugins/*
+!plugins/index.php
 test/test-file1.txt
 tmp/*
 !tmp/index.php

CodeMirror-4.7/theme/3024-day.css

@@ -1,38 +0,0 @@
-/*
-
-    Name:       3024 day
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror {background: #f7f7f7; color: #3a3432;}
-.cm-s-3024-day div.CodeMirror-selected {background: #d6d5d4 !important;}
-
-.cm-s-3024-day .CodeMirror-gutters {background: #f7f7f7; border-right: 0px;}
-.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber {color: #807d7c;}
-
-.cm-s-3024-day .CodeMirror-cursor {border-left: 1px solid #5c5855 !important;}
-
-.cm-s-3024-day span.cm-comment {color: #cdab53;}
-.cm-s-3024-day span.cm-atom {color: #a16a94;}
-.cm-s-3024-day span.cm-number {color: #a16a94;}
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute {color: #01a252;}
-.cm-s-3024-day span.cm-keyword {color: #db2d20;}
-.cm-s-3024-day span.cm-string {color: #fded02;}
-
-.cm-s-3024-day span.cm-variable {color: #01a252;}
-.cm-s-3024-day span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-day span.cm-def {color: #e8bbd0;}
-.cm-s-3024-day span.cm-bracket {color: #3a3432;}
-.cm-s-3024-day span.cm-tag {color: #db2d20;}
-.cm-s-3024-day span.cm-link {color: #a16a94;}
-.cm-s-3024-day span.cm-error {background: #db2d20; color: #5c5855;}
-
-.cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/3024-night.css

@@ -1,37 +0,0 @@
-/*
-
-    Name:       3024 night
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror {background: #090300; color: #d6d5d4;}
-.cm-s-3024-night div.CodeMirror-selected {background: #3a3432 !important;}
-.cm-s-3024-night .CodeMirror-gutters {background: #090300; border-right: 0px;}
-.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber {color: #5c5855;}
-
-.cm-s-3024-night .CodeMirror-cursor {border-left: 1px solid #807d7c !important;}
-
-.cm-s-3024-night span.cm-comment {color: #cdab53;}
-.cm-s-3024-night span.cm-atom {color: #a16a94;}
-.cm-s-3024-night span.cm-number {color: #a16a94;}
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute {color: #01a252;}
-.cm-s-3024-night span.cm-keyword {color: #db2d20;}
-.cm-s-3024-night span.cm-string {color: #fded02;}
-
-.cm-s-3024-night span.cm-variable {color: #01a252;}
-.cm-s-3024-night span.cm-variable-2 {color: #01a0e4;}
-.cm-s-3024-night span.cm-def {color: #e8bbd0;}
-.cm-s-3024-night span.cm-bracket {color: #d6d5d4;}
-.cm-s-3024-night span.cm-tag {color: #db2d20;}
-.cm-s-3024-night span.cm-link {color: #a16a94;}
-.cm-s-3024-night span.cm-error {background: #db2d20; color: #807d7c;}
-
-.cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/base16-dark.css

@@ -1,36 +0,0 @@
-/*
-
-    Name:       Base16 Default Dark
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror {background: #151515; color: #e0e0e0;}
-.cm-s-base16-dark div.CodeMirror-selected {background: #303030 !important;}
-.cm-s-base16-dark .CodeMirror-gutters {background: #151515; border-right: 0px;}
-.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber {color: #505050;}
-.cm-s-base16-dark .CodeMirror-cursor {border-left: 1px solid #b0b0b0 !important;}
-
-.cm-s-base16-dark span.cm-comment {color: #8f5536;}
-.cm-s-base16-dark span.cm-atom {color: #aa759f;}
-.cm-s-base16-dark span.cm-number {color: #aa759f;}
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute {color: #90a959;}
-.cm-s-base16-dark span.cm-keyword {color: #ac4142;}
-.cm-s-base16-dark span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-dark span.cm-variable {color: #90a959;}
-.cm-s-base16-dark span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-dark span.cm-def {color: #d28445;}
-.cm-s-base16-dark span.cm-bracket {color: #e0e0e0;}
-.cm-s-base16-dark span.cm-tag {color: #ac4142;}
-.cm-s-base16-dark span.cm-link {color: #aa759f;}
-.cm-s-base16-dark span.cm-error {background: #ac4142; color: #b0b0b0;}
-
-.cm-s-base16-dark .CodeMirror-activeline-background {background: #202020 !important;}
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/base16-light.css

@@ -1,36 +0,0 @@
-/*
-
-    Name:       Base16 Default Light
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror {background: #f5f5f5; color: #202020;}
-.cm-s-base16-light div.CodeMirror-selected {background: #e0e0e0 !important;}
-.cm-s-base16-light .CodeMirror-gutters {background: #f5f5f5; border-right: 0px;}
-.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber {color: #b0b0b0;}
-.cm-s-base16-light .CodeMirror-cursor {border-left: 1px solid #505050 !important;}
-
-.cm-s-base16-light span.cm-comment {color: #8f5536;}
-.cm-s-base16-light span.cm-atom {color: #aa759f;}
-.cm-s-base16-light span.cm-number {color: #aa759f;}
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute {color: #90a959;}
-.cm-s-base16-light span.cm-keyword {color: #ac4142;}
-.cm-s-base16-light span.cm-string {color: #f4bf75;}
-
-.cm-s-base16-light span.cm-variable {color: #90a959;}
-.cm-s-base16-light span.cm-variable-2 {color: #6a9fb5;}
-.cm-s-base16-light span.cm-def {color: #d28445;}
-.cm-s-base16-light span.cm-bracket {color: #202020;}
-.cm-s-base16-light span.cm-tag {color: #ac4142;}
-.cm-s-base16-light span.cm-link {color: #aa759f;}
-.cm-s-base16-light span.cm-error {background: #ac4142; color: #505050;}
-
-.cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/eclipse.css

@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta {color: #FF1717;}
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom {color: #219;}
-.cm-s-eclipse span.cm-number {color: #164;}
-.cm-s-eclipse span.cm-def {color: #00f;}
-.cm-s-eclipse span.cm-variable {color: black;}
-.cm-s-eclipse span.cm-variable-2 {color: #0000C0;}
-.cm-s-eclipse span.cm-variable-3 {color: #0000C0;}
-.cm-s-eclipse span.cm-property {color: black;}
-.cm-s-eclipse span.cm-operator {color: black;}
-.cm-s-eclipse span.cm-comment {color: #3F7F5F;}
-.cm-s-eclipse span.cm-string {color: #2A00FF;}
-.cm-s-eclipse span.cm-string-2 {color: #f50;}
-.cm-s-eclipse span.cm-qualifier {color: #555;}
-.cm-s-eclipse span.cm-builtin {color: #30a;}
-.cm-s-eclipse span.cm-bracket {color: #cc7;}
-.cm-s-eclipse span.cm-tag {color: #170;}
-.cm-s-eclipse span.cm-attribute {color: #00c;}
-.cm-s-eclipse span.cm-link {color: #219;}
-.cm-s-eclipse span.cm-error {color: #f00;}
-
-.cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}

CodeMirror-4.7/theme/elegant.css

@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
-.cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;}
-.cm-s-elegant span.cm-variable {color: black;}
-.cm-s-elegant span.cm-variable-2 {color: #b11;}
-.cm-s-elegant span.cm-qualifier {color: #555;}
-.cm-s-elegant span.cm-keyword {color: #730;}
-.cm-s-elegant span.cm-builtin {color: #30a;}
-.cm-s-elegant span.cm-link {color: #762;}
-.cm-s-elegant span.cm-error {background-color: #fdd;}
-
-.cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}

CodeMirror-4.7/theme/mbo.css

@@ -1,35 +0,0 @@
-/****************************************************************/
-/*   Based on mbonaci's Brackets mbo theme                      */
-/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
-/*   Create your own: http://tmtheme-editor.herokuapp.com       */
-/****************************************************************/
-
-.cm-s-mbo.CodeMirror {background: #2c2c2c; color: #ffffec;}
-.cm-s-mbo div.CodeMirror-selected {background: #716C62 !important;}
-.cm-s-mbo .CodeMirror-gutters {background: #4e4e4e; border-right: 0px;}
-.cm-s-mbo .CodeMirror-guttermarker { color: white; }
-.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber {color: #dadada;}
-.cm-s-mbo .CodeMirror-cursor {border-left: 1px solid #ffffec !important;}
-
-.cm-s-mbo span.cm-comment {color: #95958a;}
-.cm-s-mbo span.cm-atom {color: #00a8c6;}
-.cm-s-mbo span.cm-number {color: #00a8c6;}
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute {color: #9ddfe9;}
-.cm-s-mbo span.cm-keyword {color: #ffb928;}
-.cm-s-mbo span.cm-string {color: #ffcf6c;}
-.cm-s-mbo span.cm-string.cm-property {color: #ffffec;}
-
-.cm-s-mbo span.cm-variable {color: #ffffec;}
-.cm-s-mbo span.cm-variable-2 {color: #00a8c6;}
-.cm-s-mbo span.cm-def {color: #ffffec;}
-.cm-s-mbo span.cm-bracket {color: #fffffc; font-weight: bold;}
-.cm-s-mbo span.cm-tag {color: #9ddfe9;}
-.cm-s-mbo span.cm-link {color: #f54b07;}
-.cm-s-mbo span.cm-error {border-bottom: #636363; color: #ffffec;}
-.cm-s-mbo span.cm-qualifier {color: #ffffec;}
-
-.cm-s-mbo .CodeMirror-activeline-background {background: #494b41 !important;}
-.cm-s-mbo .CodeMirror-matchingbracket {color: #222 !important;}
-.cm-s-mbo .CodeMirror-matchingtag {background: rgba(255, 255, 255, .37);}

CodeMirror-4.7/theme/midnight.css

@@ -1,45 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/*<!--match-->*/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/*<!--activeline-->*/
-.cm-s-midnight .CodeMirror-activeline-background {background: #253540 !important;}
-
-.cm-s-midnight.CodeMirror {
-    background: #0F192A;
-    color: #D1EDFF;
-}
-
-.cm-s-midnight.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-
-.cm-s-midnight div.CodeMirror-selected {background: #314D67 !important;}
-.cm-s-midnight .CodeMirror-gutters {background: #0F192A; border-right: 1px solid;}
-.cm-s-midnight .CodeMirror-guttermarker { color: white; }
-.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber {color: #D0D0D0;}
-.cm-s-midnight .CodeMirror-cursor {
-    border-left: 1px solid #F8F8F0 !important;
-}
-
-.cm-s-midnight span.cm-comment {color: #428BDD;}
-.cm-s-midnight span.cm-atom {color: #AE81FF;}
-.cm-s-midnight span.cm-number {color: #D1EDFF;}
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute {color: #A6E22E;}
-.cm-s-midnight span.cm-keyword {color: #E83737;}
-.cm-s-midnight span.cm-string {color: #1DC116;}
-
-.cm-s-midnight span.cm-variable {color: #FFAA3E;}
-.cm-s-midnight span.cm-variable-2 {color: #FFAA3E;}
-.cm-s-midnight span.cm-def {color: #4DD;}
-.cm-s-midnight span.cm-bracket {color: #D1EDFF;}
-.cm-s-midnight span.cm-tag {color: #449;}
-.cm-s-midnight span.cm-link {color: #AE81FF;}
-.cm-s-midnight span.cm-error {background: #F92672; color: #F8F8F0;}
-
-.cm-s-midnight .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}

CodeMirror-4.7/theme/monokai.css

@@ -1,31 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
-.cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
-.cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
-.cm-s-monokai .CodeMirror-guttermarker { color: white; }
-.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber {color: #d0d0d0;}
-.cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
-
-.cm-s-monokai span.cm-comment {color: #75715e;}
-.cm-s-monokai span.cm-atom {color: #ae81ff;}
-.cm-s-monokai span.cm-number {color: #ae81ff;}
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute {color: #a6e22e;}
-.cm-s-monokai span.cm-keyword {color: #f92672;}
-.cm-s-monokai span.cm-string {color: #e6db74;}
-
-.cm-s-monokai span.cm-variable {color: #a6e22e;}
-.cm-s-monokai span.cm-variable-2 {color: #9effff;}
-.cm-s-monokai span.cm-def {color: #fd971f;}
-.cm-s-monokai span.cm-bracket {color: #f8f8f2;}
-.cm-s-monokai span.cm-tag {color: #f92672;}
-.cm-s-monokai span.cm-link {color: #ae81ff;}
-.cm-s-monokai span.cm-error {background: #f92672; color: #f8f8f0;}
-
-.cm-s-monokai .CodeMirror-activeline-background {background: #373831 !important;}
-.cm-s-monokai .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}

CodeMirror-4.7/theme/paraiso-dark.css

@@ -1,36 +0,0 @@
-/*
-
-    Name:       Paraíso (Dark)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror {background: #2f1e2e; color: #b9b6b0;}
-.cm-s-paraiso-dark div.CodeMirror-selected {background: #41323f !important;}
-.cm-s-paraiso-dark .CodeMirror-gutters {background: #2f1e2e; border-right: 0px;}
-.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber {color: #776e71;}
-.cm-s-paraiso-dark .CodeMirror-cursor {border-left: 1px solid #8d8687 !important;}
-
-.cm-s-paraiso-dark span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-dark span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-dark span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-dark span.cm-variable {color: #48b685;}
-.cm-s-paraiso-dark span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-dark span.cm-def {color: #f99b15;}
-.cm-s-paraiso-dark span.cm-bracket {color: #b9b6b0;}
-.cm-s-paraiso-dark span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-dark span.cm-link {color: #815ba4;}
-.cm-s-paraiso-dark span.cm-error {background: #ef6155; color: #8d8687;}
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background {background: #4D344A !important;}
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/paraiso-light.css

@@ -1,36 +0,0 @@
-/*
-
-    Name:       Paraíso (Light)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror {background: #e7e9db; color: #41323f;}
-.cm-s-paraiso-light div.CodeMirror-selected {background: #b9b6b0 !important;}
-.cm-s-paraiso-light .CodeMirror-gutters {background: #e7e9db; border-right: 0px;}
-.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
-.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber {color: #8d8687;}
-.cm-s-paraiso-light .CodeMirror-cursor {border-left: 1px solid #776e71 !important;}
-
-.cm-s-paraiso-light span.cm-comment {color: #e96ba8;}
-.cm-s-paraiso-light span.cm-atom {color: #815ba4;}
-.cm-s-paraiso-light span.cm-number {color: #815ba4;}
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute {color: #48b685;}
-.cm-s-paraiso-light span.cm-keyword {color: #ef6155;}
-.cm-s-paraiso-light span.cm-string {color: #fec418;}
-
-.cm-s-paraiso-light span.cm-variable {color: #48b685;}
-.cm-s-paraiso-light span.cm-variable-2 {color: #06b6ef;}
-.cm-s-paraiso-light span.cm-def {color: #f99b15;}
-.cm-s-paraiso-light span.cm-bracket {color: #41323f;}
-.cm-s-paraiso-light span.cm-tag {color: #ef6155;}
-.cm-s-paraiso-light span.cm-link {color: #815ba4;}
-.cm-s-paraiso-light span.cm-error {background: #ef6155; color: #776e71;}
-
-.cm-s-paraiso-light .CodeMirror-activeline-background {background: #CFD1C4 !important;}
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror-4.7/theme/the-matrix.css

@@ -1,28 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D !important; }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
-.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00 !important; }
-
-.cm-s-the-matrix span.cm-keyword {color: #008803; font-weight: bold;}
-.cm-s-the-matrix span.cm-atom {color: #3FF;}
-.cm-s-the-matrix span.cm-number {color: #FFB94F;}
-.cm-s-the-matrix span.cm-def {color: #99C;}
-.cm-s-the-matrix span.cm-variable {color: #F6C;}
-.cm-s-the-matrix span.cm-variable-2 {color: #C6F;}
-.cm-s-the-matrix span.cm-variable-3 {color: #96F;}
-.cm-s-the-matrix span.cm-property {color: #62FFA0;}
-.cm-s-the-matrix span.cm-operator {color: #999}
-.cm-s-the-matrix span.cm-comment {color: #CCCCCC;}
-.cm-s-the-matrix span.cm-string {color: #39C;}
-.cm-s-the-matrix span.cm-meta {color: #C9F;}
-.cm-s-the-matrix span.cm-qualifier {color: #FFF700;}
-.cm-s-the-matrix span.cm-builtin {color: #30a;}
-.cm-s-the-matrix span.cm-bracket {color: #cc7;}
-.cm-s-the-matrix span.cm-tag {color: #FFBD40;}
-.cm-s-the-matrix span.cm-attribute {color: #FFF700;}
-.cm-s-the-matrix span.cm-error {color: #FF0000;}
-
-.cm-s-the-matrix .CodeMirror-activeline-background {background: #040;}

CodeMirror-4.7/theme/tomorrow-night-eighties.css

@@ -1,36 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Eighties
-    Author:     Chris Kempson
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror {background: #000000; color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected {background: #2D2D2D !important;}
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters {background: #000000; border-right: 0px;}
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber {color: #515151;}
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor {border-left: 1px solid #6A6A6A !important;}
-
-.cm-s-tomorrow-night-eighties span.cm-comment {color: #d27b53;}
-.cm-s-tomorrow-night-eighties span.cm-atom {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-number {color: #a16a94;}
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-keyword {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-string {color: #ffcc66;}
-
-.cm-s-tomorrow-night-eighties span.cm-variable {color: #99cc99;}
-.cm-s-tomorrow-night-eighties span.cm-variable-2 {color: #6699cc;}
-.cm-s-tomorrow-night-eighties span.cm-def {color: #f99157;}
-.cm-s-tomorrow-night-eighties span.cm-bracket {color: #CCCCCC;}
-.cm-s-tomorrow-night-eighties span.cm-tag {color: #f2777a;}
-.cm-s-tomorrow-night-eighties span.cm-link {color: #a16a94;}
-.cm-s-tomorrow-night-eighties span.cm-error {background: #f2777a; color: #6A6A6A;}
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background {background: #343600 !important;}
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

CodeMirror/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

CodeMirror/addon/fold/foldcode.js

@@ -0,0 +1,149 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function doFold(cm, pos, options, force) {
+    if (options && options.call) {
+      var finder = options;
+      options = null;
+    } else {
+      var finder = getOption(cm, options, "rangeFinder");
+    }
+    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
+    var minSize = getOption(cm, options, "minFoldSize");
+
+    function getRange(allowFolded) {
+      var range = finder(cm, pos);
+      if (!range || range.to.line - range.from.line < minSize) return null;
+      var marks = cm.findMarksAt(range.from);
+      for (var i = 0; i < marks.length; ++i) {
+        if (marks[i].__isFold && force !== "fold") {
+          if (!allowFolded) return null;
+          range.cleared = true;
+          marks[i].clear();
+        }
+      }
+      return range;
+    }
+
+    var range = getRange(true);
+    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
+      pos = CodeMirror.Pos(pos.line - 1, 0);
+      range = getRange(false);
+    }
+    if (!range || range.cleared || force === "unfold") return;
+
+    var myWidget = makeWidget(cm, options);
+    CodeMirror.on(myWidget, "mousedown", function(e) {
+      myRange.clear();
+      CodeMirror.e_preventDefault(e);
+    });
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: true,
+      __isFold: true
+    });
+    myRange.on("clear", function(from, to) {
+      CodeMirror.signal(cm, "unfold", cm, from, to);
+    });
+    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
+  }
+
+  function makeWidget(cm, options) {
+    var widget = getOption(cm, options, "widget");
+    if (typeof widget == "string") {
+      var text = document.createTextNode(widget);
+      widget = document.createElement("span");
+      widget.appendChild(text);
+      widget.className = "CodeMirror-foldmarker";
+    }
+    return widget;
+  }
+
+  // Clumsy backwards-compatible interface
+  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
+  };
+
+  // New-style interface
+  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
+    doFold(this, pos, options, force);
+  });
+
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
+  CodeMirror.commands.toggleFold = function(cm) {
+    cm.foldCode(cm.getCursor());
+  };
+  CodeMirror.commands.fold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "fold");
+  };
+  CodeMirror.commands.unfold = function(cm) {
+    cm.foldCode(cm.getCursor(), null, "unfold");
+  };
+  CodeMirror.commands.foldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
+    });
+  };
+  CodeMirror.commands.unfoldAll = function(cm) {
+    cm.operation(function() {
+      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
+        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
+    });
+  };
+
+  CodeMirror.registerHelper("fold", "combine", function() {
+    var funcs = Array.prototype.slice.call(arguments, 0);
+    return function(cm, start) {
+      for (var i = 0; i < funcs.length; ++i) {
+        var found = funcs[i](cm, start);
+        if (found) return found;
+      }
+    };
+  });
+
+  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
+    var helpers = cm.getHelpers(start, "fold");
+    for (var i = 0; i < helpers.length; i++) {
+      var cur = helpers[i](cm, start);
+      if (cur) return cur;
+    }
+  });
+
+  var defaultOptions = {
+    rangeFinder: CodeMirror.fold.auto,
+    widget: "\u2194",
+    minFoldSize: 0,
+    scanUp: false
+  };
+
+  CodeMirror.defineOption("foldOptions", null);
+
+  function getOption(cm, options, name) {
+    if (options && options[name] !== undefined)
+      return options[name];
+    var editorOptions = cm.options.foldOptions;
+    if (editorOptions && editorOptions[name] !== undefined)
+      return editorOptions[name];
+    return defaultOptions[name];
+  }
+
+  CodeMirror.defineExtension("foldOption", function(options, name) {
+    return getOption(this, options, name);
+  });
+});

CodeMirror/addon/fold/foldgutter.css

@@ -0,0 +1,20 @@
+.CodeMirror-foldmarker {
+  color: blue;
+  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
+  font-family: arial;
+  line-height: .3;
+  cursor: pointer;
+}
+.CodeMirror-foldgutter {
+  width: .7em;
+}
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded {
+  cursor: pointer;
+}
+.CodeMirror-foldgutter-open:after {
+  content: "\25BE";
+}
+.CodeMirror-foldgutter-folded:after {
+  content: "\25B8";
+}

CodeMirror/addon/fold/foldgutter.js

@@ -0,0 +1,146 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("./foldcode"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "./foldcode"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.clearGutter(cm.state.foldGutter.options.gutter);
+      cm.state.foldGutter = null;
+      cm.off("gutterClick", onGutterClick);
+      cm.off("change", onChange);
+      cm.off("viewportChange", onViewportChange);
+      cm.off("fold", onFold);
+      cm.off("unfold", onFold);
+      cm.off("swapDoc", onChange);
+    }
+    if (val) {
+      cm.state.foldGutter = new State(parseOptions(val));
+      updateInViewport(cm);
+      cm.on("gutterClick", onGutterClick);
+      cm.on("change", onChange);
+      cm.on("viewportChange", onViewportChange);
+      cm.on("fold", onFold);
+      cm.on("unfold", onFold);
+      cm.on("swapDoc", onChange);
+    }
+  });
+
+  var Pos = CodeMirror.Pos;
+
+  function State(options) {
+    this.options = options;
+    this.from = this.to = 0;
+  }
+
+  function parseOptions(opts) {
+    if (opts === true) opts = {};
+    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
+    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
+    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
+    return opts;
+  }
+
+  function isFolded(cm, line) {
+    var marks = cm.findMarksAt(Pos(line));
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
+  }
+
+  function marker(spec) {
+    if (typeof spec == "string") {
+      var elt = document.createElement("div");
+      elt.className = spec + " CodeMirror-guttermarker-subtle";
+      return elt;
+    } else {
+      return spec.cloneNode(true);
+    }
+  }
+
+  function updateFoldInfo(cm, from, to) {
+    var opts = cm.state.foldGutter.options, cur = from;
+    var minSize = cm.foldOption(opts, "minFoldSize");
+    var func = cm.foldOption(opts, "rangeFinder");
+    cm.eachLine(from, to, function(line) {
+      var mark = null;
+      if (isFolded(cm, cur)) {
+        mark = marker(opts.indicatorFolded);
+      } else {
+        var pos = Pos(cur, 0);
+        var range = func && func(cm, pos);
+        if (range && range.to.line - range.from.line >= minSize)
+          mark = marker(opts.indicatorOpen);
+      }
+      cm.setGutterMarker(line, opts.gutter, mark);
+      ++cur;
+    });
+  }
+
+  function updateInViewport(cm) {
+    var vp = cm.getViewport(), state = cm.state.foldGutter;
+    if (!state) return;
+    cm.operation(function() {
+      updateFoldInfo(cm, vp.from, vp.to);
+    });
+    state.from = vp.from; state.to = vp.to;
+  }
+
+  function onGutterClick(cm, line, gutter) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    if (gutter != opts.gutter) return;
+    var folded = isFolded(cm, line);
+    if (folded) folded.clear();
+    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
+  }
+
+  function onChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    state.from = state.to = 0;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
+  }
+
+  function onViewportChange(cm) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var opts = state.options;
+    clearTimeout(state.changeUpdate);
+    state.changeUpdate = setTimeout(function() {
+      var vp = cm.getViewport();
+      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
+        updateInViewport(cm);
+      } else {
+        cm.operation(function() {
+          if (vp.from < state.from) {
+            updateFoldInfo(cm, vp.from, state.from);
+            state.from = vp.from;
+          }
+          if (vp.to > state.to) {
+            updateFoldInfo(cm, state.to, vp.to);
+            state.to = vp.to;
+          }
+        });
+      }
+    }, opts.updateViewportTimeSpan || 400);
+  }
+
+  function onFold(cm, from) {
+    var state = cm.state.foldGutter;
+    if (!state) return;
+    var line = from.line;
+    if (line >= state.from && line < state.to)
+      updateFoldInfo(cm, line, line + 1);
+  }
+});

CodeMirror/lib/codemirror.css

@@ -4,10 +4,7 @@
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
   height: 300px;
-}
-.CodeMirror-scroll {
-  /* Set scrolling behaviour here */
-  overflow: auto;
+  color: black;
 }
 
 /* PADDING */
@@ -36,8 +33,7 @@
   min-width: 20px;
   text-align: right;
   color: #999;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
+  white-space: nowrap;
 }
 
 .CodeMirror-guttermarker { color: black; }
@@ -45,19 +41,21 @@
 
 /* CURSOR */
 
-.CodeMirror div.CodeMirror-cursor {
+.CodeMirror-cursor {
   border-left: 1px solid black;
+  border-right: none;
+  width: 0;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+.cm-fat-cursor .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors {
+.cm-fat-cursor div.CodeMirror-cursors {
   z-index: 1;
 }
 
@@ -67,25 +65,26 @@
   -webkit-animation: blink 1.06s steps(1) infinite;
   -moz-animation: blink 1.06s steps(1) infinite;
   animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
 }
 @-moz-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 @-webkit-keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 @keyframes blink {
-  0% { background: #7e7; }
-  50% { background: none; }
-  100% { background: #7e7; }
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
 }
 
 /* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
+.CodeMirror-overwrite .CodeMirror-cursor {}
 
 .cm-tab { display: inline-block; text-decoration: inherit; }
 
@@ -96,6 +95,15 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 /* DEFAULT THEME */
 
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
 .cm-s-default .cm-keyword {color: #708;}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
@@ -115,20 +123,14 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-bracket {color: #997;}
 .cm-s-default .cm-tag {color: #170;}
 .cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
 .cm-s-default .cm-hr {color: #999;}
 .cm-s-default .cm-link {color: #00c;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
+.CodeMirror-composing { border-bottom: 2px solid; }
+
 /* Default styles for common addons */
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
@@ -142,14 +144,13 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
    the editor. You probably shouldn't touch them. */
 
 .CodeMirror {
-  line-height: 1;
   position: relative;
   overflow: hidden;
   background: white;
-  color: black;
 }
 
 .CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;
@@ -157,18 +158,14 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 .CodeMirror-sizer {
   position: relative;
   border-right: 30px solid transparent;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
@@ -194,26 +191,39 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
-  padding-bottom: 30px;
   z-index: 3;
 }
 .CodeMirror-gutter {
   white-space: normal;
   height: 100%;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  padding-bottom: 30px;
-  margin-bottom: -32px;
   display: inline-block;
+  vertical-align: top;
+  margin-bottom: -30px;
   /* Hack to make IE7 behave */
   *zoom:1;
   *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
   z-index: 4;
 }
+.CodeMirror-gutter-wrapper {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
 
 .CodeMirror-lines {
   cursor: text;
@@ -234,6 +244,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   z-index: 2;
   position: relative;
   overflow: visible;
+  -webkit-tap-highlight-color: transparent;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;
@@ -255,8 +266,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-widget {}
 
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }
 
 .CodeMirror-measure {
@@ -266,19 +287,19 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   overflow: hidden;
   visibility: hidden;
 }
-.CodeMirror-measure pre { position: static; }
 
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
+.CodeMirror-cursor { position: absolute; }
+.CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
   z-index: 3;
 }
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }
@@ -286,6 +307,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;
@@ -305,5 +328,8 @@ div.CodeMirror-cursors {
   }
 }
 
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
 /* Help users use markselection to safely style text background */
 span.CodeMirror-selectedtext { background: none; }

CodeMirror/theme/3024-day.css

@@ -0,0 +1,41 @@
+/*
+
+    Name:       3024 day
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
+.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
+
+.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
+.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
+
+.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
+.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
+.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
+
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
+
+.cm-s-3024-day span.cm-comment { color: #cdab53; }
+.cm-s-3024-day span.cm-atom { color: #a16a94; }
+.cm-s-3024-day span.cm-number { color: #a16a94; }
+
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
+.cm-s-3024-day span.cm-keyword { color: #db2d20; }
+.cm-s-3024-day span.cm-string { color: #fded02; }
+
+.cm-s-3024-day span.cm-variable { color: #01a252; }
+.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-day span.cm-def { color: #e8bbd0; }
+.cm-s-3024-day span.cm-bracket { color: #3a3432; }
+.cm-s-3024-day span.cm-tag { color: #db2d20; }
+.cm-s-3024-day span.cm-link { color: #a16a94; }
+.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
+
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }

CodeMirror/theme/3024-night.css

@@ -0,0 +1,39 @@
+/*
+
+    Name:       3024 night
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
+.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
+.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
+.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
+.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
+
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
+
+.cm-s-3024-night span.cm-comment { color: #cdab53; }
+.cm-s-3024-night span.cm-atom { color: #a16a94; }
+.cm-s-3024-night span.cm-number { color: #a16a94; }
+
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
+.cm-s-3024-night span.cm-keyword { color: #db2d20; }
+.cm-s-3024-night span.cm-string { color: #fded02; }
+
+.cm-s-3024-night span.cm-variable { color: #01a252; }
+.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-night span.cm-def { color: #e8bbd0; }
+.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
+.cm-s-3024-night span.cm-tag { color: #db2d20; }
+.cm-s-3024-night span.cm-link { color: #a16a94; }
+.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
+
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/abcdef.css

@@ -0,0 +1,32 @@
+.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
+.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
+.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
+.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
+.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
+.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
+.cm-s-abcdef span.cm-atom { color: #77F; }
+.cm-s-abcdef span.cm-number { color: violet; }
+.cm-s-abcdef span.cm-def { color: #fffabc; }
+.cm-s-abcdef span.cm-variable { color: #abcdef; }
+.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
+.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-property { color: #fedcba; }
+.cm-s-abcdef span.cm-operator { color: #ff0; }
+.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
+.cm-s-abcdef span.cm-string { color: #2b4; }
+.cm-s-abcdef span.cm-meta { color: #C9F; }
+.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
+.cm-s-abcdef span.cm-builtin { color: #30aabc; }
+.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
+.cm-s-abcdef span.cm-tag { color: #FFDD44; }
+.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
+.cm-s-abcdef span.cm-error { color: #FF0000; }
+.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
+.cm-s-abcdef span.cm-link { color: blueviolet; }
+
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }

CodeMirror/theme/ambiance.css

@@ -2,6 +2,9 @@
 
 /* Color scheme */
 
+.cm-s-ambiance .cm-header { color: blue; }
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
 .cm-s-ambiance .cm-keyword { color: #cda869; }
 .cm-s-ambiance .cm-atom { color: #CF7EA9; }
 .cm-s-ambiance .cm-number { color: #78CF8A; }
@@ -10,7 +13,7 @@
 .cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
 .cm-s-ambiance .cm-variable-3 { color: #faded3; }
 .cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator {color: #fa8d6a;}
+.cm-s-ambiance .cm-operator { color: #fa8d6a; }
 .cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
 .cm-s-ambiance .cm-string { color: #8f9d6a; }
 .cm-s-ambiance .cm-string-2 { color: #9d937c; }
@@ -18,10 +21,8 @@
 .cm-s-ambiance .cm-qualifier { color: yellow; }
 .cm-s-ambiance .cm-builtin { color: #9999cc; }
 .cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff }
-.cm-s-ambiance .cm-attribute {  color: #9B859D; }
-.cm-s-ambiance .cm-header {color: blue;}
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
+.cm-s-ambiance .cm-tag { color: #fee4ff; }
+.cm-s-ambiance .cm-attribute { color: #9B859D; }
 .cm-s-ambiance .cm-hr { color: pink; }
 .cm-s-ambiance .cm-link { color: #F4C20B; }
 .cm-s-ambiance .cm-special { color: #FF9D00; }
@@ -30,12 +31,10 @@
 .cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
 .cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
 
-.cm-s-ambiance .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.15);
-}
-.cm-s-ambiance.CodeMirror-focused .CodeMirror-selected {
-  background: rgba(255, 255, 255, 0.10);
-}
+.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
 
 /* Editor styling */
 
@@ -63,9 +62,7 @@
 .cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
 .cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
 
-.cm-s-ambiance .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #7991E8;
-}
+.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
 
 .cm-s-ambiance .CodeMirror-activeline-background {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);

CodeMirror/theme/base16-dark.css

@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Dark
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
+.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
+.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
+.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
+.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+
+.cm-s-base16-dark span.cm-comment { color: #8f5536; }
+.cm-s-base16-dark span.cm-atom { color: #aa759f; }
+.cm-s-base16-dark span.cm-number { color: #aa759f; }
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
+.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
+.cm-s-base16-dark span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-dark span.cm-variable { color: #90a959; }
+.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-dark span.cm-def { color: #d28445; }
+.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
+.cm-s-base16-dark span.cm-tag { color: #ac4142; }
+.cm-s-base16-dark span.cm-link { color: #aa759f; }
+.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
+
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/base16-light.css

@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Light
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
+.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
+.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
+
+.cm-s-base16-light span.cm-comment { color: #8f5536; }
+.cm-s-base16-light span.cm-atom { color: #aa759f; }
+.cm-s-base16-light span.cm-number { color: #aa759f; }
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
+.cm-s-base16-light span.cm-keyword { color: #ac4142; }
+.cm-s-base16-light span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-light span.cm-variable { color: #90a959; }
+.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-light span.cm-def { color: #d28445; }
+.cm-s-base16-light span.cm-bracket { color: #202020; }
+.cm-s-base16-light span.cm-tag { color: #ac4142; }
+.cm-s-base16-light span.cm-link { color: #aa759f; }
+.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
+
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/bespin.css

@@ -0,0 +1,34 @@
+/*
+
+    Name:       Bespin
+    Author:     Mozilla / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
+.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
+.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
+.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
+
+.cm-s-bespin span.cm-comment {color: #937121;}
+.cm-s-bespin span.cm-atom {color: #9b859d;}
+.cm-s-bespin span.cm-number {color: #9b859d;}
+
+.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
+.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
+.cm-s-bespin span.cm-string {color: #f9ee98;}
+
+.cm-s-bespin span.cm-variable {color: #54be0d;}
+.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
+.cm-s-bespin span.cm-def {color: #cf7d34;}
+.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
+.cm-s-bespin span.cm-bracket {color: #9d9b97;}
+.cm-s-bespin span.cm-tag {color: #cf6a4c;}
+.cm-s-bespin span.cm-link {color: #9b859d;}
+
+.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }

CodeMirror/theme/blackboard.css

@@ -1,19 +1,21 @@
 /* Port of TextMate's Blackboard theme */
 
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
 .cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
 .cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
 .cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
 .cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
 
 .cm-s-blackboard .cm-keyword { color: #FBDE2D; }
 .cm-s-blackboard .cm-atom { color: #D8FA3C; }
 .cm-s-blackboard .cm-number { color: #D8FA3C; }
 .cm-s-blackboard .cm-def { color: #8DA6CE; }
 .cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D;}
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
 .cm-s-blackboard .cm-comment { color: #AEAEAE; }
 .cm-s-blackboard .cm-string { color: #61CE3C; }
 .cm-s-blackboard .cm-string-2 { color: #61CE3C; }
@@ -26,5 +28,5 @@
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
 .cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
 
-.cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
-.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }

CodeMirror/theme/cobalt.css

@@ -1,10 +1,12 @@
 .cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
 .cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-cobalt span.cm-comment { color: #08f; }
 .cm-s-cobalt span.cm-atom { color: #845dc4; }
@@ -19,5 +21,5 @@
 .cm-s-cobalt span.cm-link { color: #845dc4; }
 .cm-s-cobalt span.cm-error { color: #9d1e15; }
 
-.cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
-.cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }

CodeMirror/theme/colorforth.css

@@ -0,0 +1,33 @@
+.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
+.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
+.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-colorforth span.cm-comment     { color: #ededed; }
+.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
+.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
+.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
+.cm-s-colorforth span.cm-variable    { color: #73ff00; }
+.cm-s-colorforth span.cm-string      { color: #007bff; }
+.cm-s-colorforth span.cm-number      { color: #00c4ff; }
+.cm-s-colorforth span.cm-atom        { color: #606060; }
+
+.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
+.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-property    {}
+.cm-s-colorforth span.cm-operator    {}
+
+.cm-s-colorforth span.cm-meta        { color: yellow; }
+.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
+.cm-s-colorforth span.cm-bracket     { color: #cc7; }
+.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
+.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
+.cm-s-colorforth span.cm-error       { color: #f00; }
+
+.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
+
+.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
+
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }

CodeMirror/theme/dracula.css

@@ -0,0 +1,41 @@
+/*
+
+    Name:       dracula
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
+
+*/
+
+
+.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
+  background-color: #282a36 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula span.cm-comment { color: #6272a4; }
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
+.cm-s-dracula span.cm-number { color: #bd93f9; }
+.cm-s-dracula span.cm-variable { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-2 { color: white; }
+.cm-s-dracula span.cm-def { color: #ffb86c; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-operator { color: #ff79c6; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-atom { color: #bd93f9; }
+.cm-s-dracula span.cm-meta { color: #f8f8f2; }
+.cm-s-dracula span.cm-tag { color: #ff79c6; }
+.cm-s-dracula span.cm-attribute { color: #50fa7b; }
+.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
+.cm-s-dracula span.cm-property { color: #66d9ef; }
+.cm-s-dracula span.cm-builtin { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
+
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/eclipse.css

@@ -0,0 +1,23 @@
+.cm-s-eclipse span.cm-meta { color: #FF1717; }
+.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom { color: #219; }
+.cm-s-eclipse span.cm-number { color: #164; }
+.cm-s-eclipse span.cm-def { color: #00f; }
+.cm-s-eclipse span.cm-variable { color: black; }
+.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-property { color: black; }
+.cm-s-eclipse span.cm-operator { color: black; }
+.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
+.cm-s-eclipse span.cm-string { color: #2A00FF; }
+.cm-s-eclipse span.cm-string-2 { color: #f50; }
+.cm-s-eclipse span.cm-qualifier { color: #555; }
+.cm-s-eclipse span.cm-builtin { color: #30a; }
+.cm-s-eclipse span.cm-bracket { color: #cc7; }
+.cm-s-eclipse span.cm-tag { color: #170; }
+.cm-s-eclipse span.cm-attribute { color: #00c; }
+.cm-s-eclipse span.cm-link { color: #219; }
+.cm-s-eclipse span.cm-error { color: #f00; }
+
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

CodeMirror/theme/elegant.css

@@ -0,0 +1,13 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
+.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-variable { color: black; }
+.cm-s-elegant span.cm-variable-2 { color: #b11; }
+.cm-s-elegant span.cm-qualifier { color: #555; }
+.cm-s-elegant span.cm-keyword { color: #730; }
+.cm-s-elegant span.cm-builtin { color: #30a; }
+.cm-s-elegant span.cm-link { color: #762; }
+.cm-s-elegant span.cm-error { background-color: #fdd; }
+
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

CodeMirror/theme/erlang-dark.css

@@ -1,11 +1,14 @@
 .cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
+.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
 .cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
 
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
 .cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
 .cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
@@ -18,7 +21,6 @@
 .cm-s-erlang-dark span.cm-operator   { color: #d55; }
 .cm-s-erlang-dark span.cm-property   { color: #ccc; }
 .cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
 .cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
 .cm-s-erlang-dark span.cm-string     { color: #3ad900; }
 .cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
@@ -28,5 +30,5 @@
 .cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
 .cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
 
-.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
-.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/hopscotch.css

@@ -0,0 +1,34 @@
+/*
+
+    Name:       Hopscotch
+    Author:     Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
+.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
+.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
+.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
+.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
+
+.cm-s-hopscotch span.cm-comment {color: #b33508;}
+.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
+.cm-s-hopscotch span.cm-number {color: #c85e7c;}
+
+.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
+.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
+.cm-s-hopscotch span.cm-string {color: #fdcc59;}
+
+.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
+.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
+.cm-s-hopscotch span.cm-def {color: #fd8b19;}
+.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
+.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
+.cm-s-hopscotch span.cm-tag {color: #dd464c;}
+.cm-s-hopscotch span.cm-link {color: #c85e7c;}
+
+.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }

CodeMirror/theme/icecoder.css

@@ -0,0 +1,43 @@
+/*
+ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
+*/
+
+.cm-s-icecoder { color: #666; background: #1d1d1b; }
+
+.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
+.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
+.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
+
+.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
+.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+
+.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
+.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
+
+.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
+.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
+
+.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
+
+.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
+.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
+.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
+
+.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
+
+.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
+.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
+.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
+.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
+
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
+.cm-s-icecoder .CodeMirror-gutters { background: #1d1d1b; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
+.cm-s-icecoder .CodeMirror-matchingbracket { color: #fff !important; background: #555 !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }

CodeMirror/theme/isotope.css

@@ -0,0 +1,34 @@
+/*
+
+    Name:       Isotope
+    Author:     David Desandro / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
+.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
+.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
+.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
+
+.cm-s-isotope span.cm-comment {color: #3300ff;}
+.cm-s-isotope span.cm-atom {color: #cc00ff;}
+.cm-s-isotope span.cm-number {color: #cc00ff;}
+
+.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
+.cm-s-isotope span.cm-keyword {color: #ff0000;}
+.cm-s-isotope span.cm-string {color: #ff0099;}
+
+.cm-s-isotope span.cm-variable {color: #33ff00;}
+.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
+.cm-s-isotope span.cm-def {color: #ff9900;}
+.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
+.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
+.cm-s-isotope span.cm-tag {color: #ff0000;}
+.cm-s-isotope span.cm-link {color: #cc00ff;}
+
+.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }

CodeMirror/theme/lesser-dark.css

@@ -6,8 +6,10 @@ Ported to CodeMirror by Peter Kroon
   line-height: 1.3em;
 }
 .cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
+.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
 .cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
 .cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
@@ -17,29 +19,29 @@ Ported to CodeMirror by Peter Kroon
 .cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
 .cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
+.cm-s-lesser-dark span.cm-header { color: #a0a; }
+.cm-s-lesser-dark span.cm-quote { color: #090; }
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
 .cm-s-lesser-dark span.cm-atom { color: #C2B470; }
 .cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def {color: white;}
+.cm-s-lesser-dark span.cm-def { color: white; }
 .cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
 .cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
 .cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property {color: #92A75C;}
-.cm-s-lesser-dark span.cm-operator {color: #92A75C;}
+.cm-s-lesser-dark span.cm-property { color: #92A75C; }
+.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
 .cm-s-lesser-dark span.cm-comment { color: #666; }
 .cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 {color: #f50;}
+.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
 .cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier {color: #555;}
+.cm-s-lesser-dark span.cm-qualifier { color: #555; }
 .cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
 .cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
 .cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute {color: #00c;}
-.cm-s-lesser-dark span.cm-header {color: #a0a;}
-.cm-s-lesser-dark span.cm-quote {color: #090;}
-.cm-s-lesser-dark span.cm-hr {color: #999;}
-.cm-s-lesser-dark span.cm-link {color: #00c;}
+.cm-s-lesser-dark span.cm-attribute { color: #00c; }
+.cm-s-lesser-dark span.cm-hr { color: #999; }
+.cm-s-lesser-dark span.cm-link { color: #00c; }
 .cm-s-lesser-dark span.cm-error { color: #9d1e15; }
 
-.cm-s-lesser-dark .CodeMirror-activeline-background {background: #3C3A3A !important;}
-.cm-s-lesser-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/liquibyte.css

@@ -0,0 +1,95 @@
+.cm-s-liquibyte.CodeMirror {
+	background-color: #000;
+	color: #fff;
+	line-height: 1.2em;
+	font-size: 1em;
+}
+.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
+	text-decoration: underline;
+	text-decoration-color: #0f0;
+	text-decoration-style: wavy;
+}
+.cm-s-liquibyte .cm-trailingspace {
+	text-decoration: line-through;
+	text-decoration-color: #f00;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .cm-tab {
+	text-decoration: line-through;
+	text-decoration-color: #404040;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
+.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
+.cm-s-liquibyte .CodeMirror-guttermarker {  }
+.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
+.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
+.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
+
+.cm-s-liquibyte span.cm-comment     { color: #008000; }
+.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-string      { color: #ff8000; }
+.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
+
+.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
+.cm-s-liquibyte span.cm-operator    { color: #fff; }
+
+.cm-s-liquibyte span.cm-meta        { color: #0f0; }
+.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
+.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
+.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
+.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-error       { color: #f00; }
+
+.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
+
+.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
+
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
+
+/* Default styles for common addons */
+.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
+.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
+/* Scrollbars */
+/* Simple */
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+	background-color: rgba(80, 80, 80, .7);
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+	background-color: rgba(80, 80, 80, .3);
+	border: 1px solid #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	border-top: 1px solid #404040;
+	border-bottom: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
+	border-left: 1px solid #404040;
+	border-right: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
+	background-color: #262626;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
+	background-color: #262626;
+	border-top: 1px solid #404040;
+}
+/* Overlay */
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+	background-color: #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
+	border: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
+	border: 1px solid #404040;
+}

CodeMirror/theme/material.css

@@ -0,0 +1,53 @@
+/*
+
+    Name:       material
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
+
+*/
+
+.cm-s-material {
+  background-color: #263238;
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material .CodeMirror-gutters {
+  background: #263238;
+  color: rgb(83,127,126);
+  border: none;
+}
+.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
+.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
+.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
+.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-variable-2 { color: #80CBC4; }
+.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-builtin { color: #DECB6B; }
+.cm-s-material .cm-atom { color: #F77669; }
+.cm-s-material .cm-number { color: #F77669; }
+.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-string { color: #C3E88D; }
+.cm-s-material .cm-string-2 { color: #80CBC4; }
+.cm-s-material .cm-comment { color: #546E7A; }
+.cm-s-material .cm-variable { color: #82B1FF; }
+.cm-s-material .cm-tag { color: #80CBC4; }
+.cm-s-material .cm-meta { color: #80CBC4; }
+.cm-s-material .cm-attribute { color: #FFCB6B; }
+.cm-s-material .cm-property { color: #80CBAE; }
+.cm-s-material .cm-qualifier { color: #DECB6B; }
+.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
+.cm-s-material .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #EC5F67;
+}
+.cm-s-material .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

CodeMirror/theme/mbo.css

@@ -0,0 +1,37 @@
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
+
+.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
+.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
+.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
+.cm-s-mbo .CodeMirror-guttermarker { color: white; }
+.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
+.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
+
+.cm-s-mbo span.cm-comment { color: #95958a; }
+.cm-s-mbo span.cm-atom { color: #00a8c6; }
+.cm-s-mbo span.cm-number { color: #00a8c6; }
+
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
+.cm-s-mbo span.cm-keyword { color: #ffb928; }
+.cm-s-mbo span.cm-string { color: #ffcf6c; }
+.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
+
+.cm-s-mbo span.cm-variable { color: #ffffec; }
+.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
+.cm-s-mbo span.cm-def { color: #ffffec; }
+.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
+.cm-s-mbo span.cm-tag { color: #9ddfe9; }
+.cm-s-mbo span.cm-link { color: #f54b07; }
+.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
+.cm-s-mbo span.cm-qualifier { color: #ffffec; }
+
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }

CodeMirror/theme/mdn-like.css

@@ -8,13 +8,15 @@
 
 */
 .cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
-.cm-s-mdn-like .CodeMirror-selected { background: #cfc !important; }
+.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
 
 .cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; margin-left: 3px; }
-div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 
-.cm-s-mdn-like .cm-keyword {  color: #6262FF; }
+.cm-s-mdn-like .cm-keyword { color: #6262FF; }
 .cm-s-mdn-like .cm-atom { color: #F90; }
 .cm-s-mdn-like .cm-number { color:  #ca7841; }
 .cm-s-mdn-like .cm-def { color: #8DA6CE; }
@@ -35,10 +37,10 @@ div.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
 .cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-mdn-like .cm-header { color: #FF6400; }
 .cm-s-mdn-like .cm-hr { color: #AEAEAE; }
-.cm-s-mdn-like .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
 .cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
 
-div.cm-s-mdn-like .CodeMirror-activeline-background {background: #efefff;}
-div.cm-s-mdn-like span.CodeMirror-matchingbracket {outline:1px solid grey; color: inherit;}
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
 
 .cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }

CodeMirror/theme/midnight.css

@@ -0,0 +1,45 @@
+/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
+
+/*<!--match-->*/
+.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
+.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
+
+/*<!--activeline-->*/
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
+
+.cm-s-midnight.CodeMirror {
+    background: #0F192A;
+    color: #D1EDFF;
+}
+
+.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
+
+.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
+.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
+.cm-s-midnight .CodeMirror-guttermarker { color: white; }
+.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
+.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
+
+.cm-s-midnight span.cm-comment { color: #428BDD; }
+.cm-s-midnight span.cm-atom { color: #AE81FF; }
+.cm-s-midnight span.cm-number { color: #D1EDFF; }
+
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
+.cm-s-midnight span.cm-keyword { color: #E83737; }
+.cm-s-midnight span.cm-string { color: #1DC116; }
+
+.cm-s-midnight span.cm-variable { color: #FFAA3E; }
+.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
+.cm-s-midnight span.cm-def { color: #4DD; }
+.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
+.cm-s-midnight span.cm-tag { color: #449; }
+.cm-s-midnight span.cm-link { color: #AE81FF; }
+.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
+
+.cm-s-midnight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

CodeMirror/theme/monokai.css

@@ -0,0 +1,36 @@
+/* Based on Sublime Text's Monokai theme */
+
+.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
+.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
+.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
+.cm-s-monokai .CodeMirror-guttermarker { color: white; }
+.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-monokai span.cm-comment { color: #75715e; }
+.cm-s-monokai span.cm-atom { color: #ae81ff; }
+.cm-s-monokai span.cm-number { color: #ae81ff; }
+
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
+.cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-builtin { color: #66d9ef; }
+.cm-s-monokai span.cm-string { color: #e6db74; }
+
+.cm-s-monokai span.cm-variable { color: #f8f8f2; }
+.cm-s-monokai span.cm-variable-2 { color: #9effff; }
+.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-def { color: #fd971f; }
+.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
+.cm-s-monokai span.cm-tag { color: #f92672; }
+.cm-s-monokai span.cm-header { color: #ae81ff; }
+.cm-s-monokai span.cm-link { color: #ae81ff; }
+.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
+
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
+.cm-s-monokai .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}

CodeMirror/theme/neat.css

@@ -5,8 +5,8 @@
 .cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
 .cm-s-neat span.cm-variable { color: black; }
 .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta {color: #555;}
+.cm-s-neat span.cm-meta { color: #555; }
 .cm-s-neat span.cm-link { color: #3a3; }
 
-.cm-s-neat .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-neat .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }

CodeMirror/theme/neo.css

@@ -7,12 +7,12 @@
   color:#2e383c;
   line-height:1.4375;
 }
-.cm-s-neo .cm-comment {color:#75787b}
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property {color:#1d75b3}
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number {color:#75438a}
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag {color:#9c3328}
-.cm-s-neo .cm-string {color:#b35e14}
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier {color:#047d65}
+.cm-s-neo .cm-comment { color:#75787b; }
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
+.cm-s-neo .cm-string { color:#b35e14; }
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
 
 
 /* Editor styling */
@@ -35,7 +35,7 @@
 .cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
 .cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
 
-.cm-s-neo div.CodeMirror-cursor {
+.cm-s-neo .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: rgba(155,157,162,0.37);

CodeMirror/theme/night.css

@@ -1,12 +1,14 @@
 /* Loosely based on the Midnight Textmate theme */
 
 .cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447 !important; }
+.cm-s-night div.CodeMirror-selected { background: #447; }
+.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
 .cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-night .CodeMirror-guttermarker { color: white; }
 .cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
 .cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-atom { color: #845dc4; }
@@ -22,5 +24,5 @@
 .cm-s-night span.cm-link { color: #845dc4; }
 .cm-s-night span.cm-error { color: #9d1e15; }
 
-.cm-s-night .CodeMirror-activeline-background {background: #1C005A !important;}
-.cm-s-night .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
+.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/paraiso-dark.css

@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Dark)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
+.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
+.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
+
+.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
+.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
+.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
+.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
+
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/paraiso-light.css

@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Light)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
+.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
+.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
+.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
+
+.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-light span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-light span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-light span.cm-variable { color: #48b685; }
+.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-light span.cm-def { color: #f99b15; }
+.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
+.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-light span.cm-link { color: #815ba4; }
+.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
+
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/pastel-on-dark.css

@@ -13,7 +13,10 @@
 	line-height: 1.5;
 	font-size: 14px;
 }
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2) !important; }
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
+
 .cm-s-pastel-on-dark .CodeMirror-gutters {
 	background: #34302f;
 	border-right: 0px;
@@ -22,7 +25,7 @@
 .cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
 .cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
 .cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
 .cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
 .cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
 .cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
@@ -42,7 +45,7 @@
 	background: #757aD8;
 	color: #f8f8f0;
 }
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031) !important; }
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
 .cm-s-pastel-on-dark .CodeMirror-matchingbracket {
 	border: 1px solid rgba(255,255,255,0.25);
 	color: #8F938F !important;

CodeMirror/theme/railscasts.css

@@ -0,0 +1,34 @@
+/*
+
+    Name:       Railscasts
+    Author:     Ryan Bates (http://railscasts.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
+.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
+.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
+.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
+.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+
+.cm-s-railscasts span.cm-comment {color: #bc9458;}
+.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
+.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+
+.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
+.cm-s-railscasts span.cm-keyword {color: #da4939;}
+.cm-s-railscasts span.cm-string {color: #ffc66d;}
+
+.cm-s-railscasts span.cm-variable {color: #a5c261;}
+.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
+.cm-s-railscasts span.cm-def {color: #cc7833;}
+.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
+.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
+.cm-s-railscasts span.cm-tag {color: #da4939;}
+.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+
+.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }

CodeMirror/theme/rubyblue.css

@@ -1,10 +1,12 @@
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
+.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
 .cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
 .cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
 .cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
 .cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
 
 .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
 .cm-s-rubyblue span.cm-atom { color: #F4C20B; }
@@ -20,4 +22,4 @@
 .cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
 .cm-s-rubyblue span.cm-error { color: #AF2018; }
 
-.cm-s-rubyblue .CodeMirror-activeline-background {background: #173047 !important;}
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }

CodeMirror/theme/seti.css

@@ -0,0 +1,44 @@
+/*
+
+    Name:       seti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
+
+*/
+
+
+.cm-s-seti.CodeMirror {
+  background-color: #151718 !important;
+  color: #CFD2D1 !important;
+  border: none;
+}
+.cm-s-seti .CodeMirror-gutters {
+  color: #404b53;
+  background-color: #0E1112;
+  border: none;
+}
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti span.cm-comment { color: #41535b; }
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
+.cm-s-seti span.cm-number { color: #cd3f45; }
+.cm-s-seti span.cm-variable { color: #55b5db; }
+.cm-s-seti span.cm-variable-2 { color: #a074c4; }
+.cm-s-seti span.cm-def { color: #55b5db; }
+.cm-s-seti span.cm-keyword { color: #ff79c6; }
+.cm-s-seti span.cm-operator { color: #9fca56; }
+.cm-s-seti span.cm-keyword { color: #e6cd69; }
+.cm-s-seti span.cm-atom { color: #cd3f45; }
+.cm-s-seti span.cm-meta { color: #55b5db; }
+.cm-s-seti span.cm-tag { color: #55b5db; }
+.cm-s-seti span.cm-attribute { color: #9fca56; }
+.cm-s-seti span.cm-qualifier { color: #9fca56; }
+.cm-s-seti span.cm-property { color: #a074c4; }
+.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-builtin { color: #9fca56; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/solarized.css

@@ -47,18 +47,20 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-shadow: none;
 }
 
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
 
-.cm-s-solarized .cm-keyword { color: #cb4b16 }
+.cm-s-solarized .cm-keyword { color: #cb4b16; }
 .cm-s-solarized .cm-atom { color: #d33682; }
 .cm-s-solarized .cm-number { color: #d33682; }
 .cm-s-solarized .cm-def { color: #2aa198; }
 
-.cm-s-solarized .cm-variable { color: #268bd2; }
+.cm-s-solarized .cm-variable { color: #839496; }
 .cm-s-solarized .cm-variable-2 { color: #b58900; }
 .cm-s-solarized .cm-variable-3 { color: #6c71c4; }
 
 .cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator {color: #6c71c4;}
+.cm-s-solarized .cm-operator { color: #6c71c4; }
 
 .cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
 
@@ -71,10 +73,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .cm-bracket { color: #cb4b16; }
 .cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
 .cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1 }
-.cm-s-solarized .cm-attribute {  color: #2aa198; }
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
+.cm-s-solarized .cm-tag { color: #93a1a1; }
+.cm-s-solarized .cm-attribute { color: #2aa198; }
 .cm-s-solarized .cm-hr {
   color: transparent;
   border-top: 1px solid #586e75;
@@ -88,24 +88,19 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   text-decoration-style: dotted;
 }
 .cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-tab:before {
-  content: "➤";   /*visualize tab character*/
-  color: #586e75;
-  position:absolute;
-}
 .cm-s-solarized .cm-error,
 .cm-s-solarized .cm-invalidchar {
   color: #586e75;
   border-bottom: 1px dotted #dc322f;
 }
 
-.cm-s-solarized.cm-s-dark .CodeMirror-selected {
-  background: #073642;
-}
+.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
 
-.cm-s-solarized.cm-s-light .CodeMirror-selected {
-  background: #eee8d5;
-}
+.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
 
 /* Editor styling */
 
@@ -154,9 +149,7 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
   color: #586e75;
 }
 
-.cm-s-solarized .CodeMirror-lines .CodeMirror-cursor {
-  border-left: 1px solid #819090;
-}
+.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
 
 /*
 Active line. Negative margin compensates left padding of the text in the

CodeMirror/theme/the-matrix.css

@@ -0,0 +1,30 @@
+.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
+.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
+.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
+.cm-s-the-matrix span.cm-atom { color: #3FF; }
+.cm-s-the-matrix span.cm-number { color: #FFB94F; }
+.cm-s-the-matrix span.cm-def { color: #99C; }
+.cm-s-the-matrix span.cm-variable { color: #F6C; }
+.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
+.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-property { color: #62FFA0; }
+.cm-s-the-matrix span.cm-operator { color: #999; }
+.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
+.cm-s-the-matrix span.cm-string { color: #39C; }
+.cm-s-the-matrix span.cm-meta { color: #C9F; }
+.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
+.cm-s-the-matrix span.cm-builtin { color: #30a; }
+.cm-s-the-matrix span.cm-bracket { color: #cc7; }
+.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
+.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
+.cm-s-the-matrix span.cm-error { color: #FF0000; }
+
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }

CodeMirror/theme/tomorrow-night-bright.css

@@ -0,0 +1,35 @@
+/*
+
+    Name:       Tomorrow Night - Bright
+    Author:     Chris Kempson
+
+    Port done by Gerard Braad <me@gbraad.nl>
+
+*/
+
+.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
+.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
+
+.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
+.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
+.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
+.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
+.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/tomorrow-night-eighties.css

@@ -0,0 +1,38 @@
+/*
+
+    Name:       Tomorrow Night - Eighties
+    Author:     Chris Kempson
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
+
+.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
+.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
+.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }

CodeMirror/theme/ttcn.css

@@ -0,0 +1,64 @@
+.cm-s-ttcn .cm-quote { color: #090; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-link { text-decoration: underline; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
+
+.cm-s-ttcn .cm-atom { color: #219; }
+.cm-s-ttcn .cm-attribute { color: #00c; }
+.cm-s-ttcn .cm-bracket { color: #997; }
+.cm-s-ttcn .cm-comment { color: #333333; }
+.cm-s-ttcn .cm-def { color: #00f; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-error { color: #f00; }
+.cm-s-ttcn .cm-hr { color: #999; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-keyword { font-weight:bold; }
+.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
+.cm-s-ttcn .cm-meta { color: #555; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-qualifier { color: #555; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-string { color: #006400; }
+.cm-s-ttcn .cm-string-2 { color: #f50; }
+.cm-s-ttcn .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-tag { color: #170; }
+.cm-s-ttcn .cm-variable { color: #8B2252; }
+.cm-s-ttcn .cm-variable-2 { color: #05a; }
+.cm-s-ttcn .cm-variable-3 { color: #085; }
+
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+
+/* ASN */
+.cm-s-ttcn .cm-accessTypes,
+.cm-s-ttcn .cm-compareTypes { color: #27408B; }
+.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
+.cm-s-ttcn .cm-modifier { color:#D2691E; }
+.cm-s-ttcn .cm-status { color:#8B4545; }
+.cm-s-ttcn .cm-storage { color:#A020F0; }
+.cm-s-ttcn .cm-tags { color:#006400; }
+
+/* CFG */
+.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
+.cm-s-ttcn .cm-fileNCtrlMaskOptions,
+.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
+
+/* TTCN */
+.cm-s-ttcn .cm-booleanConsts,
+.cm-s-ttcn .cm-otherConsts,
+.cm-s-ttcn .cm-verdictConsts { color: #006400; }
+.cm-s-ttcn .cm-configOps,
+.cm-s-ttcn .cm-functionOps,
+.cm-s-ttcn .cm-portOps,
+.cm-s-ttcn .cm-sutOps,
+.cm-s-ttcn .cm-timerOps,
+.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
+.cm-s-ttcn .cm-preprocessor,
+.cm-s-ttcn .cm-templateMatch,
+.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
+.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
+.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }

CodeMirror/theme/twilight.css

@@ -1,13 +1,15 @@
 .cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
+.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
+.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
 
 .cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
 .cm-s-twilight .CodeMirror-guttermarker { color: white; }
 .cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
 .cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
 
-.cm-s-twilight .cm-keyword {  color: #f9ee98; } /**/
+.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
 .cm-s-twilight .cm-atom { color: #FC0; }
 .cm-s-twilight .cm-number { color:  #ca7841; } /**/
 .cm-s-twilight .cm-def { color: #8DA6CE; }
@@ -16,15 +18,15 @@
 .cm-s-twilight .cm-operator { color: #cda869; } /**/
 .cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
 .cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
+.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
 .cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
 .cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
 .cm-s-twilight .cm-tag { color: #997643; } /**/
 .cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
 .cm-s-twilight .cm-header { color: #FF6400; }
 .cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
 .cm-s-twilight .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-twilight .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-twilight .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/vibrant-ink.css

@@ -1,24 +1,26 @@
 /* Taken from the popular Visual Studio Vibrant Ink Schema */
 
 .cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
+.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
+.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
 
 .cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
 .cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
 
-.cm-s-vibrant-ink .cm-keyword {  color: #CC7832; }
+.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
 .cm-s-vibrant-ink .cm-atom { color: #FC0; }
 .cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
 .cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
 .cm-s-vibrant-ink .cm-operator { color: #888; }
 .cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C }
-.cm-s-vibrant-ink .cm-string-2 { color: red }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
+.cm-s-vibrant-ink .cm-string-2 { color: red; }
 .cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
 .cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
 .cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
@@ -28,5 +30,5 @@
 .cm-s-vibrant-ink .cm-link { color: blue; }
 .cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
 
-.cm-s-vibrant-ink .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-vibrant-ink .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/xq-dark.css

@@ -21,31 +21,33 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 .cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-selected { background: #27007A !important; }
+.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
+.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
 .cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
 .cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
 
-.cm-s-xq-dark span.cm-keyword {color: #FFBD40;}
-.cm-s-xq-dark span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-dark span.cm-number {color: #164;}
-.cm-s-xq-dark span.cm-def {color: #FFF; text-decoration:underline;}
-.cm-s-xq-dark span.cm-variable {color: #FFF;}
-.cm-s-xq-dark span.cm-variable-2 {color: #EEE;}
-.cm-s-xq-dark span.cm-variable-3 {color: #DDD;}
+.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
+.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-dark span.cm-number { color: #164; }
+.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
+.cm-s-xq-dark span.cm-variable { color: #FFF; }
+.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
+.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
 .cm-s-xq-dark span.cm-property {}
 .cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment {color: gray;}
-.cm-s-xq-dark span.cm-string {color: #9FEE00;}
-.cm-s-xq-dark span.cm-meta {color: yellow;}
-.cm-s-xq-dark span.cm-qualifier {color: #FFF700;}
-.cm-s-xq-dark span.cm-builtin {color: #30a;}
-.cm-s-xq-dark span.cm-bracket {color: #cc7;}
-.cm-s-xq-dark span.cm-tag {color: #FFBD40;}
-.cm-s-xq-dark span.cm-attribute {color: #FFF700;}
-.cm-s-xq-dark span.cm-error {color: #f00;}
+.cm-s-xq-dark span.cm-comment { color: gray; }
+.cm-s-xq-dark span.cm-string { color: #9FEE00; }
+.cm-s-xq-dark span.cm-meta { color: yellow; }
+.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
+.cm-s-xq-dark span.cm-builtin { color: #30a; }
+.cm-s-xq-dark span.cm-bracket { color: #cc7; }
+.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
+.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
+.cm-s-xq-dark span.cm-error { color: #f00; }
 
-.cm-s-xq-dark .CodeMirror-activeline-background {background: #27282E !important;}
-.cm-s-xq-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }

CodeMirror/theme/xq-light.css

@@ -20,24 +20,24 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-.cm-s-xq-light span.cm-keyword {line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom {color: #6C8CD5;}
-.cm-s-xq-light span.cm-number {color: #164;}
-.cm-s-xq-light span.cm-def {text-decoration:underline;}
-.cm-s-xq-light span.cm-variable {color: black; }
-.cm-s-xq-light span.cm-variable-2 {color:black;}
-.cm-s-xq-light span.cm-variable-3 {color: black; }
+.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
+.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-light span.cm-number { color: #164; }
+.cm-s-xq-light span.cm-def { text-decoration:underline; }
+.cm-s-xq-light span.cm-variable { color: black; }
+.cm-s-xq-light span.cm-variable-2 { color:black; }
+.cm-s-xq-light span.cm-variable-3 { color: black; }
 .cm-s-xq-light span.cm-property {}
 .cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment {color: #0080FF; font-style: italic;}
-.cm-s-xq-light span.cm-string {color: red;}
-.cm-s-xq-light span.cm-meta {color: yellow;}
-.cm-s-xq-light span.cm-qualifier {color: grey}
-.cm-s-xq-light span.cm-builtin {color: #7EA656;}
-.cm-s-xq-light span.cm-bracket {color: #cc7;}
-.cm-s-xq-light span.cm-tag {color: #3F7F7F;}
-.cm-s-xq-light span.cm-attribute {color: #7F007F;}
-.cm-s-xq-light span.cm-error {color: #f00;}
+.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
+.cm-s-xq-light span.cm-string { color: red; }
+.cm-s-xq-light span.cm-meta { color: yellow; }
+.cm-s-xq-light span.cm-qualifier { color: grey; }
+.cm-s-xq-light span.cm-builtin { color: #7EA656; }
+.cm-s-xq-light span.cm-bracket { color: #cc7; }
+.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
+.cm-s-xq-light span.cm-attribute { color: #7F007F; }
+.cm-s-xq-light span.cm-error { color: #f00; }
 
-.cm-s-xq-light .CodeMirror-activeline-background {background: #e8f2ff !important;}
-.cm-s-xq-light .CodeMirror-matchingbracket {outline:1px solid grey;color:black !important;background:yellow;}
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }

CodeMirror/theme/yeti.css

@@ -0,0 +1,44 @@
+/*
+
+    Name:       yeti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
+
+*/
+
+
+.cm-s-yeti.CodeMirror {
+  background-color: #ECEAE8 !important;
+  color: #d1c9c0 !important;
+  border: none;
+}
+
+.cm-s-yeti .CodeMirror-gutters {
+  color: #adaba6;
+  background-color: #E5E1DB;
+  border: none;
+}
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
+.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
+.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
+.cm-s-yeti span.cm-comment { color: #d4c8be; }
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
+.cm-s-yeti span.cm-number { color: #a074c4; }
+.cm-s-yeti span.cm-variable { color: #55b5db; }
+.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
+.cm-s-yeti span.cm-def { color: #55b5db; }
+.cm-s-yeti span.cm-operator { color: #9fb96e; }
+.cm-s-yeti span.cm-keyword { color: #9fb96e; }
+.cm-s-yeti span.cm-atom { color: #a074c4; }
+.cm-s-yeti span.cm-meta { color: #96c0d8; }
+.cm-s-yeti span.cm-tag { color: #96c0d8; }
+.cm-s-yeti span.cm-attribute { color: #9fb96e; }
+.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
+.cm-s-yeti span.cm-property { color: #a074c4; }
+.cm-s-yeti span.cm-builtin { color: #a074c4; }
+.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }

CodeMirror/theme/zenburn.css

@@ -0,0 +1,37 @@
+/**
+ * "
+ *  Using Zenburn color palette from the Emacs Zenburn Theme
+ *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
+ *
+ *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
+ * "
+ * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
+ */
+
+.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
+.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
+.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
+.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
+.cm-s-zenburn span.cm-atom { color: #bfebbf; }
+.cm-s-zenburn span.cm-def { color: #dcdccc; }
+.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
+.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
+.cm-s-zenburn span.cm-string { color: #cc9393; }
+.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
+.cm-s-zenburn span.cm-number { color: #dcdccc; }
+.cm-s-zenburn span.cm-tag { color: #93e0e3; }
+.cm-s-zenburn span.cm-property { color: #dfaf8f; }
+.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
+.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
+.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
+.cm-s-zenburn span.cm-header { color: #f0efd0; }
+.cm-s-zenburn span.cm-operator { color: #f0efd0; }
+.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
+.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }

LICENSE.md

@@ -1,7 +1,7 @@
-Copyright: © 2014 Matt Pass  
-Website:   mattpass.com  
-Email:     matt@mattpass.com  
-Twitter:   @mattpass
+Copyright: © 2015 ICEcoder Ltd
+Website:   icecoder.net  
+Email:     info@icecoder.net
+Twitter:   @icecoder
 
 #ICEcoder License
 ##Standard Open Source Initiative MIT License

README.md

@@ -3,7 +3,7 @@
 
 ICEcoder is a web IDE / browser based code editor, which allows you to develop websites directly within the web browser. It uses the brilliant CodeMirror for code highlighting & editing, with a slick IDE wrapped around it to make the whole thing work.
 
-<img src="https://icecoder.net/images/icecoder-v5-0-beta-browser-code-editor.png" alt="ICEcoder web IDE">
+<img src="https://icecoder.net/images/icecoder-v5-7-browser-code-editor.png" alt="ICEcoder web IDE">
 
 ###Requirements
 You can run ICEcoder either online or locally, on Linux, Windows or Mac based platforms. The only requirement is to have PHP 5 available (5.3 recommended). You can have this either as a vanilla installation or via a program such as WAMP or XAMPP (for Windows) or MAMP (for Mac).

backups/index.php

@@ -0,0 +1,4 @@
+<?php
+header("Location: ../");
+die();
+?>

editor.php

@@ -5,7 +5,7 @@ $t = $text['editor'];
 ?>
 <!DOCTYPE html>
 
-<html style="margin: 0" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false; if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor');top.ICEcoder.canResizeFilesW()}" onDrop="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor')}">
+<html style="margin: 0" onMouseDown="top.ICEcoder.mouseDown=true; top.ICEcoder.resetAutoLogoutTimer()" onMouseUp="top.ICEcoder.mouseDown=false; top.ICEcoder.mouseDownInCM=false; top.ICEcoder.resetAutoLogoutTimer(); if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor'); top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.canResizeFilesW()}" onDrop="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor')}">
 <head>
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> editor</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -16,8 +16,8 @@ $t = $text['editor'];
 <!--
 codemirror-compressed.js
 incls:	codemirror
-modes:	clike, coffeescript, css, erlang, go, htmlmixed, javascript, julia, lua, markdown, perl, php, python, ruby, rust, sass, sql, xml, yaml
-addon:	brace-fold, closebrackets, closetag, css-hint, html-hint, javascript-hint, javascript-lint, lint, match-highlighter, searchcursor, show-hint, sql-hint, trailingspace, xml-fold, xml-hint
+modes:	clike, coffeescript, css, erlang, go, htmlmixed, javascript, julia, lua, markdown, perl, php, python, ruby, sass, sql, xml, yaml
+addon:	brace-fold, closebrackets, closetag, css-hint, html-hint, javascript-hint, javascript-lint, lint, match-highlighter, matchbrackets, searchcursor, show-hint, sql-hint, trailingspace, xml-fold, xml-hint
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
 <?php
@@ -25,7 +25,9 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint-2.5.6.min.js")) {
 	echo '<script src="plugins/jshint/jshint-2.5.6.min.js?microtime='.microtime(true).'></script>';
 };?>
 <script src="lib/mmd.js?microtime=<?php echo microtime(true);?>"></script>
-<script src="lib/foldcode.js?microtime=<?php echo microtime(true);?>"></script>
+<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldcode.js?microtime=<?php echo microtime(true);?>"></script>
+<script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.js?microtime=<?php echo microtime(true);?>"></script>
+<link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.css?microtime=<?php echo microtime(true);?>">
 <?php
 if (file_exists(dirname(__FILE__)."/plugins/emmet/emmet.min.js")) {
 	echo '<script src="plugins/emmet/emmet.min.js?microtime='.microtime(true).'"></script>';
@@ -38,15 +40,25 @@ if (file_exists(dirname(__FILE__)."/plugins/pesticide/pesticide.js")) {
 if (file_exists(dirname(__FILE__)."/plugins/stats.js/stats.min.js")) {
 	echo '<script src="plugins/stats.js/stats.min.js?microtime='.microtime(true).'"></script>';
 };?>
+<?php
+if (file_exists(dirname(__FILE__)."/plugins/responsive-helper/responsive-helper.js")) {
+	echo '<script src="plugins/responsive-helper/responsive-helper.js?microtime='.microtime(true).'"></script>';
+};?>
 <link rel="stylesheet" href="<?php
 if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
 echo "?microtime=".microtime(true);
-$activeLineBG = array_search($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","neat","solarized","xq-light")) !== false ? "#ccc" : "#000";
+if (array_search($ICEcoder["theme"],array("3024-day","base16-light","eclipse","elegant","mdn-like","neat","neo","paraiso-light","solarized","the-matrix","xq-light")) !== false) {
+	$activeLineBG = "#ccc";
+} elseif (array_search($ICEcoder["theme"],array("3024-night","blackboard","colorforth","liquibyte","night","tomorrow-night-bright","tomorrow-night-eighties","vibrant-ink")) !== false) {
+	$activeLineBG = "#888";
+} else {
+	$activeLineBG = "#000";
+}
 ?>">
 
 <style type="text/css">
 /* Make sure this next one remains the 1st item, updated with JS */
-.CodeMirror {position: absolute; top: 0; width: 100%; font-size: <?php echo $ICEcoder["fontSize"];?>; z-index: 1}
+.CodeMirror {position: absolute; top: 0; width: 100%; font-size: <?php echo $ICEcoder["fontSize"];?>; line-height: 1.3; z-index: 1}
 .CodeMirror-scroll {} /* was: height: auto; overflow: visible */
 /* Make sure this next one remains the 3rd item, updated with JS */
 .cm-s-activeLine {background: <?php echo $activeLineBG;?> !important}
@@ -61,29 +73,33 @@ $activeLineBG = array_search($ICEcoder["theme"],array("3024-day","base16-light",
 .CodeMirror-foldmarker {font-family: arial; line-height: .3; color: #b00; cursor: pointer;
 	text-shadow: #fff 1px 1px 2px, #fff -1px -1px 2px, #fff 1px -1px 2px, #fff -1px 1px 2px;
 }
-.folds {display: inline-block; width: 13px}
-.fold {position: absolute; display: inline-block; width: 13px; height: 13px; font-size: 14px; text-align: center; cursor: pointer}
-.foldOn {background: #800; color: #ddd}
-.foldOff {background: rgba(255,255,255,0.04); color: #666}
-.demoArrow {position: absolute; display: inline-block; width: 99px; height: 50px; top: 0; right: 30px; background: url('images/big-arrow.gif') 0 -10px no-repeat; text-align: center; font-family: arial; font-size: 10px; padding-top: 60px}
+.CodeMirror-foldgutter {display: inline-block; width: 13px}
+.CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded {position: absolute; display: inline-block; width: 13px; height: 13px; font-size: 14px; text-align: center; cursor: pointer}
+.CodeMirror-foldgutter-open {background: rgba(255,255,255,0.04); color: #666}
+.CodeMirror-foldgutter-open:after {position: relative; top: -2px}
+.CodeMirror-foldgutter-folded {background: #800; color: #ddd}
+.CodeMirror-foldgutter-folded:after {position: relative; top: -3px}
 h2 {color: rgba(0,198,255,0.7)}
 .heading {color:#888}
 .cm-s-diff {left: 50%}
 .diffGreen {background: #0b0 !important; color: #000 !important}
 .diffRed {background: #800 !important; color: #fff !important}
 .diffGrey {background: #444 !important; color: #fff !important}
-.diffGreyLighter {background: #888 !important; color: #222 !important}
+.diffGreyLighter {background: #888 !important; color: #1d1d1b !important}
 .diffNone {}
+.info {font-size: 10px; color: rgba(0,198,255,0.7); cursor: help}
+.trialBarContainer {display: inline-block; width: 170px; height: 8px; background: #0b0b0b; margin-bottom: 40px}
+.trialBarRemaining {display: inline-block; width: 170px; height: 8px; background: rgba(0,198,255,0.7); box-shadow: 0 0 10px 1px rgba(0,198,255,0.5);
+	transition: width 0.7s ease-in-out;
+}
+.trialBarText {margin-top: 6px; color: #888}
+.trialBarText a {color: #fff; text-decoration: none}
 </style>
 <link rel="stylesheet" href="lib/file-types.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" href="lib/file-type-icons.css?microtime=<?php echo microtime(true);?>">
 </head>
 
-<body style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">
-
-<?php if ($ICEcoder['demoMode']) {?>
-<div class="demoArrow"><?php echo $t['Click icons for...'];?></div>
-<?php ;}; ?>
+<body style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);" onload="if (document.getElementById('trialBarRemaining')) {setTimeout(function(){document.getElementById('trialBarRemaining').style.width = '<?php echo $tRemainingPerc*170;?>px';},150)}">
 
 <div style="display: none; margin: 32px 43px 0 43px; padding: 10px; width: 500px; font-family: arial; font-size: 10px; color: #ddd; background: #333" id="dataMessage"></div>
 
@@ -108,10 +124,18 @@ h2 {color: rgba(0,198,255,0.7)}
 	</div>
 
 	<div style="float: left">
+		<?php
+		// No valid license code - show the trial remaining bar
+		if (generateHash(strClean($ICEcoder['licenseEmail']),$ICEcoder['licenseCode'])!=$ICEcoder['licenseCode']) {?>
+		<h2><?php echo $t['trial remaining'];?></h2>
+		<div class="trialBarContainer"><div class="trialBarRemaining" id="trialBarRemaining"></div><br>
+			<div class="trialBarText"><?php echo $tDaysRemaining;?> <?php echo $t['days left'];?> - <a href="lib/login.php?get=code&csrf=<?php echo $_SESSION["csrf"];?>" target="_parent">Unlock now</a></div>
+		</div>
+		<?php ;}; ?>
+
 		<h2><?php echo $t['files'];?></h2>
 		<span class="heading"><?php echo $t['Last 10 files...'];?></span><br>
-		<ul class="fileManager" style="margin-left: 0; line-height: 20px">
-		<?php
+		<ul class="fileManager" id="last10Files" style="margin-left: 0; line-height: 20px"><?php
 			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
 			for ($i=0;$i<count($last10FilesArray);$i++) {
 				if ($ICEcoder["last10Files"]=="") {
@@ -121,14 +145,13 @@ h2 {color: rgba(0,198,255,0.7)}
 					// Get extension (prefix 'ext-' to prevent invalid classes from extensions that begin with numbers)
 					$ext = "ext-".pathinfo($docRoot.$iceRoot.$fileFolderName, PATHINFO_EXTENSION);
 					echo '<li class="pft-file '.strtolower($ext).'" style="margin-left: -21px">';
-					echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
+					echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i])).'\')">';
 					echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
-					echo '</a></li>'.PHP_EOL;
-					if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
+					echo '</a></li>';
+					if ($i<count($last10FilesArray)-1) {echo PHP_EOL;};
 				}
 			}
-		;?>
-		</ul>
+		;?></ul>
 	</div>
 
 	<div style="clear: both"></div>
@@ -158,7 +181,7 @@ h2 {color: rgba(0,198,255,0.7)}
 	<div style="float: left">
 		<h2><?php echo $t['dev mode'];?> <?php echo $ICEcoder['devMode'] ? "on" : "off";?></h2>
 		<span class="heading"><?php echo $t['Status'];?>:</span><br>
-		<?php echo $t['Using']?> <?php echo $ICEcoder['devMode'] ? "ice-coder.js" : "ice-coder.min.js";?> <a title="<?php echo $t['You can switch...'];?>" style="cursor: pointer">[?]</a>
+		<?php echo $t['Using']?> <?php echo $ICEcoder['devMode'] ? "ice-coder.js" : "ice-coder.min.js";?> <a title="<?php echo $t['You can switch...'];?>" class="info">[?]</a>
 	</div>
 	<div style="clear: both"></div>
 </div>
@@ -166,7 +189,12 @@ h2 {color: rgba(0,198,255,0.7)}
 <script>
 CodeMirror.keyMap.ICEcoder = {
 	"Tab": function(cm) {
-		return cm.somethingSelected() ? cm.execCommand("indentAuto") : CodeMirror.Pass // Falls through to default or Emmet plugin
+		return cm.somethingSelected()
+		? (top.ICEcoder.indentAuto
+			? cm.execCommand("indentAuto")	// Honour our own setting indentAuto
+			: cm.indentSelection("add")	// Add indent (this is default handler in CodeMirror)
+		  )
+		: CodeMirror.Pass 			// Falls through to default or Emmet plugin
 	},
 	"Shift-Tab": "indentLess",
 	"Ctrl-Space": "autocomplete",
@@ -176,6 +204,23 @@ CodeMirror.keyMap.ICEcoder = {
 	fallthrough: ["default"]
 };
 
+// CodeMirror does not honor indentWithTabs = false properly when handling Tab key
+// Marijn said that it is by design, so we need to make a workaround of our own
+(function(){
+	// let's back up original insertTab function which actually puts  
+	var originalInsertTabFunction = CodeMirror.commands.insertTab;
+	// and replace it with our own, which branches on whether our ICEcoder.indentWithTabs value is true or false
+	CodeMirror.commands.insertTab = function(cm){
+		if (top.ICEcoder.indentWithTabs){
+			// if it is true, then we should still put there, let's use original function 
+			return originalInsertTabFunction(cm);
+		} else {
+			// otherwise - let's call another handler, insertSoftTab which will do the job
+			return cm.execCommand("insertSoftTab");
+		}
+	}
+}());
+
 function createNewCMInstance(num) {
 	// Establish the filename for the tab
 	var fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
@@ -183,17 +228,20 @@ function createNewCMInstance(num) {
 	// Define our CodeMirror options
 	var cMOptions = {
 		mode: "application/x-httpd-php",
-		lineNumbers: true,
-		gutters: ["folds","CodeMirror-lint-markers","CodeMirror-linenumbers"],
+		lineNumbers: top.ICEcoder.lineNumbers,
+		gutters: ["CodeMirror-foldgutter","CodeMirror-lint-markers","CodeMirror-linenumbers"],
+		foldGutter: {gutter: "CodeMirror-foldgutter"},
+		foldOptions: {minFoldSize: 1},
 		lineWrapping: top.ICEcoder.lineWrapping,
 		indentWithTabs: top.ICEcoder.indentWithTabs,
 		indentUnit: top.ICEcoder.indentSize,
 		tabSize: top.ICEcoder.indentSize,
+		matchBrackets: top.ICEcoder.matchBrackets,
 		electricChars: false,
-		autoCloseTags: true,
-		autoCloseBrackets: true,
+		autoCloseTags: top.ICEcoder.autoCloseTags,
+		autoCloseBrackets: top.ICEcoder.autoCloseBrackets,
 		highlightSelectionMatches: true,
-		showTrailingSpace: true,
+		showTrailingSpace: top.ICEcoder.showTrailingSpace,
 		lint: false,
 		keyMap: "ICEcoder"
 	};
@@ -225,21 +273,33 @@ function createNewCMInstance(num) {
 	window['cM'+num+'diff']	.on("beforeSelectionChange", function(thisCM, changeObj) {top.ICEcoder.prevLineDiff = thisCM.getCursor().line;});
 
 	// Change
-	window['cM'+num]	.on("change", function(thisCM, changeObj) {top.ICEcoder.cMonChange(thisCM,'cM'+num,changeObj)});
-	window['cM'+num+'diff']	.on("change", function(thisCM, changeObj) {top.ICEcoder.cMonChange(thisCM,'cM'+num+'diff',changeObj)});
+	window['cM'+num]	.on("change", function(thisCM, changeObj) {top.ICEcoder.cMonChange(thisCM,'cM'+num,changeObj,CodeMirror)});
+	window['cM'+num+'diff']	.on("change", function(thisCM, changeObj) {top.ICEcoder.cMonChange(thisCM,'cM'+num+'diff',changeObj,CodeMirror)});
+
+	// Before change
+	window['cM'+num]	.on("beforeChange", function(thisCM, changeObj) {top.ICEcoder.cMonBeforeChange(thisCM,'cM'+num,changeObj,CodeMirror)});
+	window['cM'+num+'diff']	.on("beforeChange", function(thisCM, changeObj) {top.ICEcoder.cMonBeforeChange(thisCM,'cM'+num+'diff',changeObj,CodeMirror)});
 
 	// Scroll
 	window['cM'+num]	.on("scroll", function(thisCM) {top.ICEcoder.cMonScroll(thisCM,'cM'+num)});
 	window['cM'+num+'diff']	.on("scroll", function(thisCM) {top.ICEcoder.cMonScroll(thisCM,'cM'+num+'diff')});
 
-	// Gutter click
-	window['cM'+num]	.on("gutterClick", function(thisCM, line, gutter, clickEvent) {CodeMirror.doFold(thisCM.getLine(line).indexOf("{")>-1 ? "brace" : "xml",null,"+","-",false)(thisCM, line);});
-	window['cM'+num+'diff']	.on("gutterClick", function(thisCM, line, gutter, clickEvent) {CodeMirror.doFold(thisCM.getLine(line).indexOf("{")>-1 ? "brace" : "xml",null,"+","-",false)(thisCM, line);});
-
 	// Input read
 	window['cM'+num]	.on("inputRead", function(thisCM) {top.ICEcoder.cMonInputRead(thisCM,'cM'+num)});
 	window['cM'+num+'diff']	.on("inputRead", function(thisCM) {top.ICEcoder.cMonInputRead(thisCM,'cM'+num+'diff')});
 
+	// Gutter Click
+	window['cM'+num]	.on("gutterClick", function(thisCM,line,gutter,evt) {top.ICEcoder.cMonGutterClick(thisCM,line,gutter,evt,'cM'+num)});
+	window['cM'+num+'diff']	.on("gutterClick", function(thisCM,line,gutter,evt) {top.ICEcoder.cMonGutterClick(thisCM,line,gutter,evt,'cM'+num+'diff')});
+
+	// Mouse Down
+	window['cM'+num]	.on("mousedown", function(thisCM) {top.ICEcoder.cMonMouseDown(thisCM,'cM'+num)});
+	window['cM'+num+'diff']	.on("mousedown", function(thisCM) {top.ICEcoder.cMonMouseDown(thisCM,'cM'+num+'diff')});
+
+	// Drag Over
+	window['cM'+num]	.on("dragover", function(thisCM) {top.ICEcoder.cMonDragOver(thisCM,event,'cM'+num)});
+	window['cM'+num+'diff']	.on("dragover", function(thisCM) {top.ICEcoder.cMonDragOver(thisCM,event,'cM'+num+'diff')});
+
 	// Render line
 	window['cM'+num]	.on("renderLine", function(thisCM, line, element) {top.ICEcoder.cMonRenderLine(thisCM,'cM'+num,line,element)});
 	window['cM'+num+'diff']	.on("renderLine", function(thisCM, line, element) {top.ICEcoder.cMonRenderLine(thisCM,'cM'+num+'diff',line,element)});

files.php

@@ -8,7 +8,7 @@ $isGitHubRepoDir = in_array($ICEcoder["root"],$ICEcoder['githubLocalPaths']);
 ?>
 <!DOCTYPE html>
 
-<html onMouseDown="top.ICEcoder.mouseDown=true; top.ICEcoder.boxSelect(event,'down')" onMouseUp="top.ICEcoder.mouseDown=false; top.ICEcoder.boxSelect(event,'up'); if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files');top.ICEcoder.canResizeFilesW(); top.ICEcoder.boxSelect(event,'drag')}" onDrop="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files')}" onContextMenu="top.ICEcoder.selectFileFolder(event); return top.ICEcoder.showMenu(event)" onClick="if (!top.ICEcoder.fmDraggedBox) {top.ICEcoder.selectFileFolder(event)} else {top.ICEcoder.fmDraggedBox = false}" onDragStart="top.ICEcoder.selectFileFolder(event);" onDragOver="event.preventDefault();event.stopPropagation()">
+<html onMouseDown="top.ICEcoder.mouseDown=true; top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.boxSelect(event,'down')" onMouseUp="top.ICEcoder.mouseDown=false; top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.mouseDownInCM=false; top.ICEcoder.boxSelect(event,'up'); if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files'); top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.canResizeFilesW(); top.ICEcoder.boxSelect(event,'drag')}" onDrop="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files')}" onContextMenu="top.ICEcoder.selectFileFolder(event); return top.ICEcoder.showMenu(event)" onClick="if (!top.ICEcoder.fmDraggedBox) {top.ICEcoder.selectFileFolder(event)} else {top.ICEcoder.fmDraggedBox = false}" onDragStart="top.ICEcoder.selectFileFolder(event);" onDragOver="event.preventDefault();event.stopPropagation()">
 <head>
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> file manager</title>
 <meta name="robots" content="noindex, nofollow">
@@ -16,13 +16,17 @@ $isGitHubRepoDir = in_array($ICEcoder["root"],$ICEcoder['githubLocalPaths']);
 <link rel="stylesheet" type="text/css" href="lib/file-types.css?microtime=<?php echo microtime(true);?>">
 <link rel="stylesheet" type="text/css" href="lib/file-type-icons.css?microtime=<?php echo microtime(true);?>">
 <script src="lib/ice-coder<?php if (!$ICEcoder['devMode']) {echo '.min';}; echo ".js?microtime=".microtime(true);?>" type="text/javascript"></script>
+<!--Updated via settings so must remain 4th stylesheet//-->
+<style>
+    ul.fileManager li a span { font-size:  <?php echo $ICEcoder["fontSize"];?>; }
+</style>
 </head>
 
 <body onFocus="top.ICEcoder.files.style.background='#444'" onBlur="top.ICEcoder.files.style.background='#383838'" onload="top.ICEcoder.showHideGithubNav(top.ICEcoder.githubDiff ? 'show' : 'hide')" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);" onBlur="parent.ICEcoder.resetKeys(event);">
 
 <div title="<?php echo $t['Lock'];?>" onClick="top.ICEcoder.lockUnlockNav()" id="fmLock" class="lock"></div>
 <div title="<?php echo $t['Refresh'];?>" onClick="top.ICEcoder.refreshFileManager()" class="refresh"></div>
-<div title="Plugins" onClick="top.ICEcoder.showHidePlugins(top.get('plugins').style.width != '55px' ? 'show' : 'hide')" class="plugins"></div>
+<div title="<?php echo $t['Plugins'];?>" onClick="top.ICEcoder.showHidePlugins(top.get('plugins').style.width != '55px' ? 'show' : 'hide')" class="plugins"></div>
 <?php
 $_SESSION['githubDiff'] = false;
 if ($isGitHubRepoDir) {
@@ -52,6 +56,8 @@ $permColors = $thisPermVal == 777 ? 'background: #800; color: #eee' : 'color: #8
 
 <iframe name="processControl" style="display: none"></iframe>
 
+<iframe name="pingActive" style="display: none"></iframe>
+
 <div class="fmDragBox" id="fmDragBox"></div>
 
 </body>

index.php

@@ -3,28 +3,11 @@ include("lib/headers.php");
 include("lib/settings.php");
 $t = $text['index'];
 
-// Check IP permissions
-if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
-	header('Location: /');
-	die("Sorry, not in allowed IPs list");
-};
-
 $updateMsg = '';
 // Check for updates
 if ($ICEcoder["checkUpdates"]) {
 	$icv_url = "https://icecoder.net/latest-version?thisVersion=".$ICEcoder["versionNo"];
-	if (ini_get('allow_url_fopen')) {
-		$icvInfo = @file_get_contents($icv_url,false,$context);
-		if (!$icvInfo) {
-			$icvInfo = file_get_contents(str_replace("https:","http:",$icv_url), false, $context);
-		}
-		$icvInfo = explode("\n",$icvInfo);
-	} elseif (function_exists('curl_init')) {
-		$ch = curl_init($icv_url);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		$icvInfo = explode("\n", curl_exec($ch));
-	}
+	$icvInfo = explode("\n", getData($icv_url,'curl'));
 	$icv = $icvInfo[0];
 	$icvI = str_replace('"','\\\'',$icvInfo[1]);
 	$thisV = $ICEcoder["versionNo"];
@@ -37,9 +20,13 @@ if ($ICEcoder["checkUpdates"]) {
 $isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh")>-1 ? true : false;
 ?>
 <!DOCTYPE html>
-<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false; if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}" onMouseWheel="if (!top.ICEcoder.getcMInstance().hasFocus() && !top.ICEcoder.getcMdiffInstance().hasFocus()) {event.wheelDelta > 0 ? top.ICEcoder.nextTab() : top.ICEcoder.previousTab();}">
+<html onMouseDown="top.ICEcoder.mouseDown=true; top.ICEcoder.resetAutoLogoutTimer();" onMouseUp="top.ICEcoder.mouseDown=false; top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.mouseDownInCM=false; if (!top.ICEcoder.overCloseLink) {top.ICEcoder.tabDragEnd()}" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top'); top.ICEcoder.resetAutoLogoutTimer(); top.ICEcoder.canResizeFilesW()}" onMouseWheel="top.ICEcoder.resetAutoLogoutTimer(); if (top.ICEcoder.getcMInstance() && !top.ICEcoder.getcMInstance().hasFocus() && !top.ICEcoder.getcMdiffInstance().hasFocus()) {event.wheelDelta > 0 ? top.ICEcoder.nextTab() : top.ICEcoder.previousTab();}">
 <head>
 <title>ICEcoder v <?php echo $ICEcoder["versionNo"];?></title>
+<!--Updated via settings so must remain 1st stylesheet//-->
+<style>
+	#tabsBar.tabsBar .tab { font-size: <?php echo $ICEcoder["fontSize"];?>; }
+</style>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
 <meta name="viewport" content="width=device-width, initial-scale=0.5, user-scalable=no">
@@ -49,10 +36,13 @@ $isMac = strpos($_SERVER['HTTP_USER_AGENT'], "Macintosh")>-1 ? true : false;
 iceRoot = "<?php echo $ICEcoder['root']; ?>";
 
 window.onbeforeunload = function() {
-	for(var i=1;i<=ICEcoder.savedPoints.length;i++) {
-		if (ICEcoder.savedPoints[i-1]!=top.ICEcoder.getcMInstance(i).changeGeneration()) {
-			return "<?php echo $t['You have some...'];?>.";
+	if(top.ICEcoder.autoLogoutTimer < top.ICEcoder.autoLogoutMins*60) {
+		for(var i=1;i<=ICEcoder.savedPoints.length;i++) {
+			if (ICEcoder.savedPoints[i-1]!=top.ICEcoder.getcMInstance(i).changeGeneration()) {
+				return "<?php echo $t['You have some...'];?>.";
+			}
 		}
+		return "<?php echo $t['Are you sure...'];?>";
 	}
 }
 
@@ -87,13 +77,21 @@ $t = $text['index'];
 		}
 	echo "];";
 	echo "top.ICEcoder.theme = '".($ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"])."';".
+		"top.ICEcoder.autoLogoutMins = ".$ICEcoder["autoLogoutMins"].";".
 		"top.ICEcoder.fontSize = '".$ICEcoder["fontSize"]."';".
 		"top.ICEcoder.openLastFiles = ".($ICEcoder["openLastFiles"] ? 'true' : 'false').";".
 		"top.ICEcoder.updateDiffOnSave = ".($ICEcoder["updateDiffOnSave"] ? 'true' : 'false').";".
 		"top.ICEcoder.languageUser = '".$ICEcoder["languageUser"]."';".
 		"top.ICEcoder.codeAssist = ".($ICEcoder["codeAssist"] ? 'true' : 'false').";".
+		"top.ICEcoder.lockedNav = ".($ICEcoder["lockedNav"] ? 'true' : 'false').";".
 		"top.ICEcoder.lineWrapping = ".($ICEcoder["lineWrapping"] ? 'true' : 'false').";".
+		"top.ICEcoder.lineNumbers = ".($ICEcoder["lineNumbers"] ? 'true' : 'false').";".
+		"top.ICEcoder.showTrailingSpace = ".($ICEcoder["showTrailingSpace"] ? 'true' : 'false').";".
+		"top.ICEcoder.matchBrackets = ".($ICEcoder["matchBrackets"] ? 'true' : 'false').";".
+		"top.ICEcoder.autoCloseTags = ".($ICEcoder["autoCloseTags"] ? 'true' : 'false').";".
+		"top.ICEcoder.autoCloseBrackets = ".($ICEcoder["autoCloseBrackets"] ? 'true' : 'false').";".
 		"top.ICEcoder.indentWithTabs = ".($ICEcoder["indentWithTabs"] ? 'true' : 'false').";".
+		"top.ICEcoder.indentAuto = ".($ICEcoder["indentAuto"] ? 'true' : 'false').";".
 		"top.ICEcoder.indentSize = ".$ICEcoder["indentSize"].";".
 		"top.ICEcoder.demoMode = ".($ICEcoder["demoMode"] ? 'true' : 'false').";".
 		"top.ICEcoder.tagWrapperCommand = '".$ICEcoder["tagWrapperCommand"]."';".
@@ -101,6 +99,7 @@ $t = $text['index'];
 		"top.ICEcoder.bugFilePaths = ['".implode("','",$ICEcoder["bugFilePaths"])."'];".
 		"top.ICEcoder.bugFileCheckTimer = ".$ICEcoder["bugFileCheckTimer"].";".
 		"top.ICEcoder.bugFileMaxLines = ".$ICEcoder["bugFileMaxLines"].";".
+		"top.ICEcoder.fileDirResOutput = '".$ICEcoder["fileDirResOutput"]."';".
 		"top.ICEcoder.newDirPerms = ".$ICEcoder["newDirPerms"].";".
 		"top.ICEcoder.newFilePerms = ".$ICEcoder["newFilePerms"].";";
 		if($ICEcoder["githubAuthToken"] != "") {
@@ -114,6 +113,7 @@ $t = $text['index'];
 	<div class="popupVCenter">
 		<div class="popup" id="mediaContainer"></div>
 	</div>
+	<div class="floatingContainer" id="floatingContainer"></div>
 </div>
 
 <div id="loadingMask" class="blackMask" style="visibility: visible" onContextMenu="return false">
@@ -130,7 +130,7 @@ $t = $text['index'];
 		<a nohref onClick="top.ICEcoder.showColorPicker(top.document.getElementById('color') ? top.document.getElementById('color').value : '#123456')" title="Farbtastic
 <?php echo $t['Color picker'];?>"><img src="images/color-picker.png" style="cursor: pointer" alt="Color Picker"></a><br><br>
 		<div id="pluginsOptional"><?php echo $pluginsDisplay; ?></div>
-		<a nohref onclick="top.ICEcoder.pluginsManager()" title="Plugins Manager" style="color: #fff; cursor: pointer">+ / -</a>
+		<a nohref onclick="top.ICEcoder.pluginsManager()" title="<?php echo $t['Plugins Manager'];?>" style="color: #fff; cursor: pointer">+ / -</a>
 	</div>
 </div>
 
@@ -158,7 +158,7 @@ $t = $text['index'];
 	<span id="singleFileMenuItems">
 		<a href="javascript:top.ICEcoder.renameFile(top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1])" onMouseOver="ICEcoder.showFileMenu()"><?php echo $t['Rename'];?></a>
 		<div onMouseOver="ICEcoder.showFileMenu()" style="padding: 2px 0"><hr></div>
-		<a nohref onClick="window.open(iceRoot + top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1].replace(/\|/g,'/'))" onMouseOver="ICEcoder.showFileMenu()" style="cursor: pointer"><?php echo $t['View Webpage'];?></a>
+		<a nohref onClick="window.open('//<?php echo $_SERVER['HTTP_HOST'];?>' + iceRoot + top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1].replace(/\|/g,'/'))" onMouseOver="ICEcoder.showFileMenu()" style="cursor: pointer"><?php echo $t['View Webpage'];?></a>
 	</span>
 	<div onMouseOver="ICEcoder.showFileMenu()" style="padding: 2px 0"><hr></div>
 	<?php
@@ -224,14 +224,16 @@ $t = $text['index'];
 		</div>
 		<div id="optionsSource" class="optionsList" onmouseover="top.ICEcoder.showHideFileNav('show',this.id)" onmouseout="top.ICEcoder.showHideFileNav('hide',this.id);top.ICEcoder.canShowFMNav=false">
 			<ul>
-				<li><a nohref onclick="ICEcoder.refreshFileManager()">Localhost</a></li>
+				<li><a nohref onclick="ICEcoder.goLocalhostRoot()">Localhost</a></li>
+				<li><a nohref onclick="ICEcoder.ftpManager()">FTP</a></li>
 				<li><a nohref onclick="ICEcoder.githubManager()">GitHub</a></li>
+				<!--
 				<li><a nohref onclick="ICEcoder.message('SVN integration coming soon')">SVN</a></li>
 				<li><a nohref onclick="ICEcoder.message('Bitbucket integration coming soon\n\nCan you help with this? Get involved at icecoder.net')">Bitbucket</a></li>
 				<li><a nohref onclick="ICEcoder.message('Amazon AWS integration coming soon\n\nCan you help with this? Get involved at icecoder.net')">Amazon AWS</a></li>
 				<li><a nohref onclick="ICEcoder.message('Dropbox integration coming soon\n\nCan you help with this? Get involved at icecoder.net')">Dropbox</a></li>
-				<li><a nohref onclick="ICEcoder.message('FTP integration coming soon\n\nCan you help with this? Get involved at icecoder.net')">FTP</a></li>
 				<li><a nohref onclick="ICEcoder.message('SSH integration coming soon\n\nCan you help with this? Get involved at icecoder.net')">SSH</a></li>
+				//-->
 			</ul>
 		</div>
 		<div id="optionsHelp" class="optionsList" onmouseover="top.ICEcoder.showHideFileNav('show',this.id)" onmouseout="top.ICEcoder.showHideFileNav('hide',this.id);top.ICEcoder.canShowFMNav=false">
@@ -243,7 +245,7 @@ $t = $text['index'];
 			</ul>
 		</div>
 	</div>
-	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1';this.contentWindow.onscroll=function(){top.ICEcoder.mouseDown=false}"></iframe>
+	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1';this.contentWindow.onscroll=function(){top.ICEcoder.mouseDown=false; top.ICEcoder.mouseDownInCM=false}"></iframe>
 	<div class="serverMessage" id="serverMessage"></div>
 </div>
 
@@ -261,7 +263,7 @@ $t = $text['index'];
 		<form name="findAndReplace" onSubmit="ICEcoder.findReplace(top.document.getElementById('find').value,false,true);return false">
 			<div class="findReplace">
 				<div class="findText"><?php echo $t['Find'];?></div>
-				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace(top.document.getElementById('find').value,true,false)">
+				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace(top.document.getElementById('find').value,true,false,event.keyCode == 27)">
 				
 				<div class="selectWrapper" style="width: 41px">
 					<select name="connector" onChange="ICEcoder.findReplaceOptions()" style="width: 40px; margin-top: 4px">
@@ -288,7 +290,7 @@ $t = $text['index'];
 							<option><?php echo $t['all filenames'];?></option>
 						</select>
 					</div>
-				<input type="submit" name="submit" value="&gt;&gt;" class="submit">
+				<input type="submit" name="submit" id="findReplaceSubmit" value="&gt;&gt;" class="submit">
 				<div class="results" id="results"></div>
 			</div>
 			<input type="hidden" name="csrf" value="<?php echo $_SESSION["csrf"]; ?>">
@@ -309,7 +311,10 @@ $t = $text['index'];
 
 <div class="footer" id="footer" onContextMenu="return false">
 	<div class="nesting" id="nestValid"></div>
-	<div class="splitPaneControls" id="splitPaneControls"><div class="off" id="splitPaneControlsOff" onclick="top.ICEcoder.setSplitPane('off')"></div><div class="on" id="splitPaneControlsOn" onclick="top.ICEcoder.setSplitPane('on')" style="opacity: 0.5"></div></div>
+	<div class="versionsDisplay" id="versionsDisplay" onclick="top.ICEcoder.versionsScreen(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1].replace(/\//g,'|'))"></div>
+	<div class="splitPaneControls" id="splitPaneControls"><div class="off" id="splitPaneControlsOff" title="<?php echo $t['Single pane'];?>" onclick="top.ICEcoder.setSplitPane('off')"></div><div class="on" id="splitPaneControlsOn" title="<?php echo $t['Diff pane also'];?>" onclick="top.ICEcoder.setSplitPane('on')" style="opacity: 0.5"></div></div>
+	<div class="splitPaneNames" id="splitPaneNamesMain">Main Pane</div>
+	<div class="splitPaneNames" id="splitPaneNamesDiff">Diff Pane</div>
 	<div class="byteDisplay" id="byteDisplay" style="display: none" onClick="top.ICEcoder.showDisplay('char')"></div>
 	<div class="charDisplay" id="charDisplay" style="display: inline-block" onClick="top.ICEcoder.showDisplay('byte')"></div>
 </div>

lang/chinese-simplified.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // Chinese language translation
 // by: @lzh370 (GitHub)
 //     lzh370@qq.com
@@ -49,6 +49,7 @@ $text = array(
 		"Your version is"		=> "你的版本是",
 		"Update now"			=> "现在更新",
 		"You have some..."		=> "你有一些未保存的更改",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"			=> "载入中",
 		"Color picker"			=> "颜色选择器",
 		"New File"			=> "新建文件",
@@ -386,6 +387,7 @@ $text = array(
 		"indent type"			=> "缩进类型",
 		"indent size"			=> "缩进大小",
 		"font size"			=> "字体大小",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "布局",
 		"plugin panel aligned"		=> "插件板对齐",
 		"file manager"			=> "文件管理器",

lang/chinese-traditional.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // Traditional Chinese language translation
 // by: @lzh370 (GitHub)
 //     lzh370@qq.com
@@ -49,6 +49,7 @@ $text = array(
 		"Your version is"		=> "你的版本是",
 		"Update now"			=> "現在更新",
 		"You have some..."		=> "你有一些未保存的更改",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"			=> "裝載中",
 		"Color picker"			=> "顔色選擇器",
 		"New File"			=> "新建文件",
@@ -386,6 +387,7 @@ $text = array(
 		"indent type"			=> "縮進類型",
 		"indent size"			=> "縮進大小",
 		"font size"			=> "字體大小",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "佈局",
 		"plugin panel aligned"		=> "插件版對齊",
 		"file manager"			=> "文件管理器",

lang/dutch.php

@@ -1,7 +1,7 @@
 <?php
 // Dutch language translation
 // Door: Julian Kaagman
-//	@dutchwaters (GitHub)
+//	@JpaKaagman (GitHub)
 
 // Please preserve formatting, line breaks, special characters, anything in <tags> and HTML equivalents (eg &amp;). Translations on right side.
 // Special chars: http://www.ascii.cl/htmlcodes.htm
@@ -12,7 +12,6 @@ $text = array(
 
 	"editor" =>
 	array(
-		"Click icons for..."		=> "<strong>Klik op de icoontjes<br>voor hulp &amp;<br>gebruiks info</strong>",
 		"server"			=> "server",
 		"Server name, OS..."		=> "Server naam, besturingssysteem & IP:",
 		"Root"				=> "Root:",
@@ -22,6 +21,8 @@ $text = array(
 		"your device"			=> "Uw apparaat",
 		"Browser"			=> "Browser:",
 		"Your IP"			=> "Uw IP:",
+		"trial remaining"		=> "Resterende demo tijd",
+		"days left"			=> "dagen",
 		"files"				=> "bestanden",
 		"Last 10 files..."		=> "Laatste 10 geopende bestanden:",
 		"none"				=> "[none]",
@@ -30,9 +31,7 @@ $text = array(
 		"dev mode"			=> "Ontwikkelaars modus",
 		"Status"			=> "Status",
 		"Using"				=> "Gebruikt",
-		"You can switch..."		=> "U kunt de ontwikkelaars modus aan/uit zetten 
-in lib/config__settings.php",
-		"results"			=> "resultaten"
+		"You can switch..."		=> "U kunt de ontwikkelaars modus aan/uit zetten in lib/config__settings.php",
 
 	),
 
@@ -40,6 +39,7 @@ in lib/config__settings.php",
 	array(
 		"Lock"				=> "Vergrendelen",
 		"Refresh"			=> "Vernieuwen",
+		"Plugins"			=> "Plugins",
 		"ROOT"				=> "[ROOT]"
 
 	),
@@ -51,8 +51,10 @@ in lib/config__settings.php",
 		"Your version is"		=> "Uw versie is",
 		"Update now"			=> "Nu updaten",
 		"You have some..."		=> "Er zijn wijzigingen die niet opgeslagen zijn",
+		"Are you sure..."		=> "Weet u zeker dat u wilt sluiten ?",
 		"working"			=> "bezig",
 		"Color picker"			=> "Kleuren kiezer",
+		"Plugins Manager"		=> "Plugin beheer",
 		"New File"			=> "Nieuw bestand",
 		"New Folder"			=> "Nieuwe map",
 		"Upload File(s)"		=> "Upload bestand(en)",
@@ -67,14 +69,14 @@ in lib/config__settings.php",
 		"Properties"			=> "Eigenschappen",
 		"File"				=> "Bestand",
 		"Edit"				=> "Bewerken",
-		"Remote"			=> "Extern",
+		"Source"			=> "Bron",
 		"Help"				=> "Help",
 		"Save"				=> "Opslaan",
 		"Save As"			=> "Opslaan als",
 		"Live Preview"			=> "Voorbeeld",
 		"Upload"			=> "Upload",
 		"Zip"				=> "Zip",
-		"Print"				=> "Print",
+		"Print"				=> "Afdrukken",
 		"Fullscreen toggle"		=> "Schakelen volledig scherm",
 		"Logout"			=> "Uitloggen",
 		"Undo"				=> "Ongedaan maken",
@@ -85,30 +87,46 @@ in lib/config__settings.php",
 		"Comment/Uncomment"		=> "Commentaar maken",
 		"Jump to Definition"		=> "Spring naar definitie",
 		"Manual"			=> "Handleiding",
-		"Shortcuts"			=> "Snelkoppeling",
+		"Shortcuts"			=> "Sneltoetsen",
 		"Settings"			=> "Opties",
 		"Search for selected"		=> "Zoek naar geselecteerd",
 		"website"			=> "website",
 		"Close all tabs"		=> "Sluit alle tabbladen",
 		"Alphabetize tabs"		=> "Sorteer tabbladen",
-//		"Find"				=> "Zoek",
-//		"in"				=> "in",
-//		"and"				=> "en",
-//		"replace"			=> "vervangen",
-//		"replace all"			=> "alles vervangen",
-//		"this document"			=> "dit document",
-//		"open documents"		=> "open documenten",
-//		"all files"			=> "alle bestanden",
-//		"all filenames"			=> "alle bestandsnamen",
+		"Find"				=> "Zoek",
+		"in"				=> "in",
+		"and"				=> "en",
+		"replace"			=> "vervangen",
+		"replace all"			=> "alles vervangen",
+		"this document"			=> "dit document",
+		"open documents"		=> "open documenten",
+		"all files"			=> "alle bestanden",
+		"all filenames"			=> "alle bestandsnamen",
 		"Turn on/off..."		=> "Schakel codehulp aan/uit",
 		"Code Assist"			=> "Codehulp",
 		"Go to Line"			=> "Ga naar regel",
 		"View"				=> "Beeld",
-		"Bug reporting not active"	=> "Bug rapportage niet actief"
+		"Bug reporting not active"	=> "Bug rapportage niet actief",
+		"Single pane"			=> "Enkel pane",
+		"Diff pane also"		=> "Ook diff pane"
 	),
 
 // /LIB
 
+	"auto-logout-warning" =>
+	array(
+		"Auto Logout Warning"		=> "Auto logout waarschuwing",
+		"You will be..."		=> "U wordt uitgelogd na",
+		"seconds due to..."		=> "seconden ivm inactiviteit, voor veiligheids doeleinden. Gebruik de muis of druk op een toets om door te gaan.<br><br>U kunt deze functie aanpassen of uitschakelen in Bewerken > Opties."
+	),
+
+	"backup-versions" =>
+	array(
+		"backup"			=> "backup",
+		"backups"			=> "backups",
+		"available for"			=> "beschikbaar voor"
+	),
+
 	"bug-files-check" =>
 	array(
 		"Found in"			=> "Gevonden in:"
@@ -116,32 +134,34 @@ in lib/config__settings.php",
 
 	"file-control" =>
 	array(
+		"Sorry, bad filename..."	=> "Er is een ongeldige bestandsnaam opgegeven. Bekijk de dev tools console voor meer informatie.",
 		"Sorry"				=> "Sorry",
 		"does not seem..."		=> "bestaat niet op de server",
-		"Sorry, could not..."		=> "Sorry, kan geen gegevens ophalen van",
-		"Sorry, cannot create..."	=> "Sorry, kan geen map aanmaken op",
-		"Sorry, cannot copy"		=> "Sorry, kan niet het volgende niet kopi&euml;ren",
+		"Sorry, could not..."		=> "Het is niet mogelijk om de gegevens op te halen van",
+		"Sorry, cannot create..."	=> "Er kan geen map worden aangemaakt op",
+		"Sorry, cannot copy"		=> "Kan niet worden gekopie&euml;rd",
 		"into"				=> "naar",
 		"Uploaded file(s) OK"		=> "Ge&uuml;ploade bestand(en)",
-		"Sorry, cannot upload"		=> "Sorry, kan niet uploaden",
-		"Sorry, cannot upload..."	=> "Sorry, kan niet uploaden in de demo modus",
-		"Sorry, cannot rename"		=> "Sorry, kan niet hernoemen",
+		"Sorry, cannot upload"		=> "Kan niet uploaden",
+		"Sorry, cannot upload..."	=> "Kan niet uploaden in de demo modus",
+		"Sorry, cannot rename"		=> "Kan niet hernoemen",
 		"Maybe public write..."		=> "Misschien zijn er publieke schrijfrechten nodig voor deze, of de bovenliggende map?",
-		"Sorry, cannot move"		=> "Sorry, kan niet worden verplaatst",
-		"Sorry, cannot save"		=> "Sorry, kan niet opslaan",
-		"Sorry, cannot replace..."	=> "Sorry, Kan geen tekst vervangen in",
-		"Sorry, cannot change..."	=> "Sorry, kan de rechten niet wijzigen voor",
-		"Sorry, cannot delete..."	=> "Sorry, kan de root level niet verwijderen",
-		"Sorry, cannot delete"		=> "Sorry, kan niet verwijderd worden",
-		"Sorry, this file..."		=> "Sorry, het bestand is gewijzigd, maar kan niet worden opgeslagen",
+		"Sorry, cannot move"		=> "Kan niet worden verplaatst",
+		"Sorry, cannot save"		=> "Kan niet opslaan",
+		"Sorry, cannot replace..."	=> "Kan geen tekst vervangen in",
+		"Sorry, cannot change..."	=> "Kan de rechten niet wijzigen voor",
+		"Sorry, cannot delete more..."	=> "U kunt niet meer dan een bestand tegelijkertijd verwijderen in FTP modus",
+		"Sorry, cannot delete..."	=> "Kan de root level niet verwijderen",
+		"Sorry, cannot delete"		=> "Kan niet verwijderd worden",
+		"Sorry, this file..."		=> "Het bestand is gewijzigd, maar kan niet worden opgeslagen",
 		"Reload this file..."		=> "Vernieuw dit bestand en kopieer de huidige versie naar een nieuw bestand?",
 		"There was a..."		=> "Er was een technisch probleem, mogelijk was er iets niet gereed. ICEcodeer heeft bestandsbeheer opnieuw geladen.",
 		"displayed at"			=> "weergegeven op",
 		"Enter filename to..."		=> "Voer een bestandsnaam in om het op te slaan op",
 		"That file exists..."		=> "Dit bestand bestaat al, overschrijven?",
 		"Saving"			=> "Opslaan"
-	),	
-	
+	),
+
 	"get-branch" =>
 	array(
 		"There are no..."		=> "Er zijn geen verschillen aangetroffen tussen de lokale en de Github repo. Wilt u terug schakelen naar de normale modus?",
@@ -158,7 +178,9 @@ in lib/config__settings.php",
 		"github paths"			=> "Github paden",
 		"Choose existing path"		=> "Kies een bestaand pad",
 		"Local path"			=> "Lokaal pad",
+		"Slash prefixed"		=> "Slash prefix",
 		"Remote GitHub path"		=> "Extern Github pad",
+		"Absolute URL beginning..."	=> "Absolute link, beginnend met https://github.com",
 		"Choose"			=> "Kies",
 		"Set local and..."		=> "Maak het lokale en externe pad leeg, om te verwijderen",
 		"Update"			=> "Update",
@@ -168,12 +190,12 @@ in lib/config__settings.php",
 		"Enter relative local..."	=> "Voer relatieve lokale paden (bv /server/mijnbestanden) en absolute Github paden (bv https://github.com/user/repo of https://github.com/user/repo/tree/branch voor vertakkingen (branches)), zoals het voorbeeld. Als je dit doet worden de bron paden op beide locaties gevestigd als een paar.",
 		"You can then..."		=> "You can then choose a path pair and this then becomes your new root path in ICEcoder.",
 		"The file manager..."		=> "The file manager then displays a new GitHub icon, which you can click on to perform and show a diff check between the 2 sources. These diffs can then be committed and pushed to the remote path at GitHub or cloned to your local path, to sync your files.",
-		"If you want..."		=> "If you want to set another root path, this can be done in the Settings screen."
+		"If you want..."		=> "Als je een ander root pad wilt instellen kan je dit doen in Bewerken > Opties."
 	),
 
 	"github" =>
 	array(
-		"Sorry, you do..."		=> "Sorry, you do not appear to have OpenSSL loaded on your PHP instance, so https is not available. This is required for GitHub data transfer, please amend php.ini settings, restart your server and try again"
+		"Sorry, you do..."		=> "Sorry, het lijkt erop dat U OpenSSL niet beschikbaar heeft op uw server, https is dus niet beschikbaar. Dit is nodig voor GitHub gegevensoverdracht. Wijzig uw php.ini instellingen en herstart uw server en probeer opnieuw."
 	),
 
 	"headers" =>
@@ -183,7 +205,7 @@ in lib/config__settings.php",
 
 	"help" =>
 	array(
-		"shortcuts"			=> "snelkoppelingen",
+		"shortcuts"			=> "Sneltoetsen",
 		"Within document"		=> "Binnen het document",
 		"On Tabs"			=> "Op Tabs",
 		"Within file manager"		=> "Binnen bestandsbeheer",
@@ -209,6 +231,8 @@ in lib/config__settings.php",
 		"Jump to definition"		=> "Spring naar definitie / spring terug",
 		"Comment uncomment"		=> "Commentaar (ongedaan) maken",
 		"Insert tab indent"		=> "Invoegen tab / verspringen geselecteerd",
+		"Insert more"			=> "Inspringen verruimen",
+		"Insert less"			=> "Inspringen verkleinen",
 		"Wrap with div"			=> "Omhullen met &lt;div&gt;",
 		"Wrap with span"		=> "Omhullen met &lt;span&gt;",
 		"Wrap unwrap p"			=> "Omhullen / onthullen met &lt;p&gt;",
@@ -233,6 +257,7 @@ in lib/config__settings.php",
 		"Close current tab"		=> "Sluit huidige tab",
 		"Open file prompt"		=> "Open bestands prompt",
 		"Find"				=> "Zoek",
+		"Previous"			=> "Vorige",
 		"Focus on Go..."		=> "Focus op ga naar regel invoer",
 		"Save"				=> "Opslaan",
 		"Save as"			=> "Opslaan als...",
@@ -245,12 +270,18 @@ in lib/config__settings.php",
 
 	"ice-coder" =>
 	array(
+		"results"			=> "resultaten",
 		"No text selected..."		=> "Geen tekst geselecteerd om te zoeken",
+		"all files"			=> "alle bestanden",
+		"all filenames"			=> "alle bestandsnamen",
+		"selected files"		=> "geselecteerde bestanden",
+		"selected filenames"		=> "geselecteerde bestandsnamaen",
 		"Creating Folder"		=> "Aanmaken map",
 		"Sorry you can..."		=> "Sorry, je kan maximaal 100 bestanden open hebben staan!",
 		"Opening File"			=> "Openen bestand",
 		"Enter relative file..."	=> "Geef relatieve bestands pad (voorafgaand door een slash) of een externe URL",
 		"Getting"			=> "Ophalen",
+		"Saving"			=> "Opslaan:",
 		"Please enter the..."		=> "Voer de nieuwe naam in voor",
 		"Renaming to"			=> "Hernoemen naar",
 		"Moving to"			=> "Verplaatsen naar",
@@ -258,13 +289,19 @@ in lib/config__settings.php",
 		"Pasting File"			=> "Bestand plakken",
 		"Sorry cannot paste..."		=> "Sorry, kan niet de gehele root plakken",
 		"Nothing to paste..."		=> "Er is niets om te plakken, kopieer eerst een bestand of map!",
+		"and"				=> "en",
+		"this document"			=> "dit bestand",
+		"replace"			=> "vervang",
+		"replace all"			=> "vervang alle",
+		"file"				=> "bestand",
 		"Replacing text in"		=> "Wijzig de tekst in",
+		"Sorry there was..."		=> "Helaas er is een fout opgetreden met uw aanvraag.\\n\\nKijk in de dev tools console voor meer informatie.",
 		"Cancelled tasks"		=> "Geannuleerde taken",
 		"Open previous files"		=> "Open voorgaande bestand(en)?",
-		"Please enter your..."		=> "Please enter your GitHub token (either personal access token or client/secret pair token). See tooltip next to Github Auth Token on Help > Settings screen for more info",
-		"This will compare..."		=> "This will compare and show a diff view between your local dir and the repo. OK?",
+		"Please enter your..."		=> "Voer alstublieft uw GitHub token (personal access token of client/secret pair token). Zie ook de tooltip bij Github Auth Token binnen Bewerken > Opties voor meer informatie.",
+		"This will compare..."		=> "Er zullen vergelijkingen en veranderingen worden getoond tussen uw lokale map en de repo. Ok?",
 		"Please note for..."		=> "Let op: om de update goed te laten doorvoeren, moet je schrijfrechten hebben op alle bestanden en mappen van ICEcoder. Moet je deze versie van ICEcoder herstellen, dan vind je die in de map /tmp. Klik op ok om door te gaan met automatisch updaten, of druk op annuleren om af te breken. Voor een handmatige update kun je het zip bestand van de ICEcoder website downloaden.",
-		"You can start..."		=> "U kunt bug rapporteren aanzetten in: Help > Settings",
+		"You can start..."		=> "U kunt bug rapporteren aanzetten in: Bewerken > Opties",
 		"Error cannot find..."		=> "Fout: kan geen toegang krijgen of de bestands paden vinden",
 		"No new errors..."		=> "Geen nieuwe fouten gevonden",
 		"You have made..."		=> "Er zijn wijzigingen aangetroffen. Wilt u verder gaan zonder op te slaan?",
@@ -277,16 +314,17 @@ in lib/config__settings.php",
 		"login"				=> "login",
 		"To disable registration..."	=> "Om de registratie modus uit te zetten, open het menu opties of open lib/config___settings.php en wijzig enableRegistration naar false",
 		"Registration mode enabled"	=> "Registratie modus aan",
+		"disable further registrations"	=> "uitschakelen van verdere registraties",
 		"auto-check for updates"	=> "automatisch controleren op updates",
 		"To put into..."		=> "Om de multi-user modus te gebruiken, open het menu opties of open lib/config___settings.php en verander multiUser naar true",
 		"multi-user"			=> "multi-user"
-),
+	),
 
 	"multiple-results" =>
 	array(
 		"rename all"			=> "hernoem alles",
 		"replace all"			=> "vervang alles",
-		"document"			=> "document",
+		"document"			=> "bestand",
 		"Found"				=> "Gevonden",
 		"times"				=> "keer",
 		"replace"			=> "vervang",
@@ -359,14 +397,20 @@ in lib/config__settings.php",
 		"version"			=> "versie",
 		"website"			=> "website",
 		"git"				=> "git",
-		"codemirror dir"		=> "codemirror dir",
+		"codemirror dir"		=> "codemirror map",
 		"codemirror version"		=> "codemirror versie",
 		"file manager root"		=> "bestandsbeheer root",
-		"Free to use..."		=> "Vrij voor eigen gebruik, commercieel of persoonlijk. :)<br><br>Wij zijn niet aansprakelijk en bieden geen garantie, gebruik op eigen risico.<br><br>Een hoop fantastische mensen, en bedrijven hebben meegeholpen aan de ontwikkeling van ICEcoder waarvoor bedankt. Zie wie er allemaal heeft bijgedragen op",
+		"backups"			=> "backups",
+		"keep version control..."	=> "gebruik versiebeheer backups voor",
+		"day"				=> "dag",
+		"days"				=> "dagen",
+		"of backups stored..."		=> "of backups stored currently",
+		"Get in contact..."		=> "Kom in contact via...",
+		"You may use..."		=> "Vrij voor eigen gebruik, commercieel of persoonlijk. Laat het ons weten als je toffe aanpassingen maakt :)<br><br>Wij zijn niet aansprakelijk en bieden geen garantie, gebruik op eigen risico.",
 		"functionality"			=> "functionaliteit",
 		"check for updates..."		=> "check voor updates bij laden",
 		"auto open last..."		=> "automatisch openen laatst geopende bestanden na inloggen",
-		"when finding in..."		=> "when finding in files, exclude",
+		"when finding in..."		=> "Uitgesloten bestand typen",
 		"assisting"			=> "assisteren",
 		"code assist"			=> "codehulp",
 		"visible tabs"			=> "zichtbare tabs",
@@ -380,18 +424,27 @@ in lib/config__settings.php",
 		"banned files/folders"		=> "uitgesloten bestanden/mappen",
 		"banned paths"			=> "uitgesloten paden",
 		"ip addresses"			=> "ip adressen",
+		"auto-logout after"		=> "auto-logout na",
+		"mins of inactivity..."		=> "minuten in actief, tenzij er niet opgeslagen bestanden geopend zijn",
 		"Slash prefixed comma..."	=> "Slash prefixed, komma gescheiden",
 		"Comma delimited"		=> "komma gescheiden",
 		"style"				=> "style",
 		"theme"				=> "thema",
 		"line wrapping"			=> "regel omslag",
+		"line numbers"			=> "regel nummers",
 		"indent type"			=> "inspring type",
 		"indent size"			=> "inspring size",
+		"match brackets"		=> "match brackets",
+		"show trailing space"		=> "show trailing space",
 		"font size"			=> "lettergrootte",
+		"auto indent"			=> "automatisch inspringen",
+		"auto close tags"		=> "automatisch tags sluiten",
+		"auto close brackets"		=> "automatsich brackets sluiten",
 		"layout"			=> "lay-out",
 		"plugin panel aligned"		=> "plug-in paneel positie",
 		"file manager"			=> "bestandsbeheer",
 		"root"				=> "root",
+		"Set 0 to..."			=> "Set 0 to disable",
 		"Slash prefixed"		=> "Slash prefixed",
 		"bug reporting"			=> "bug rapportage",
 		"check in files"		=> "check in bestanden",
@@ -420,8 +473,20 @@ in lib/config__settings.php",
 
 	"updater" =>
 	array(
-		"Update appears to..."		=> "Update lijkt succesvol te zijn verlopen"
+		"Update appears to..."		=> "Update succesvol uitgevoerd!"
+	),
+    
+	"find-in-files" =>
+	array(
+		"Enter path to search in" => "Voer het door te zoeken pad in",
+		"Enter semicolon-separated masks of files to look at (e.g. *.php;*.html;*.js)" => "Voer de te zoeken bestandstypen in, en scheid deze met een puntcomma (bijvoorbeeld: *.php;*.html;*.js)",
+		"Type of text" => "Type tekst",
+		"Fixed text" => "Fixed tekst",
+		"Regular expression" => "Reguliere expressie",
+		"Case sensitive" => "Hoofdletter gevoelig",
+		"Yes" => "Ja",
+		"No" => "Nee",
+		"Search" => "Zoek",
 	)
-
 );
 ?>

lang/english.php

@@ -11,7 +11,6 @@ $text = array(
 
 	"editor" =>
 	array(
-		"Click icons for..."		=> "<b>Click icons<br>for help &amp;<br>usage info</b>",
 		"server"			=> "server",
 		"Server name, OS..."		=> "Server name, OS & IP:",
 		"Root"				=> "Root:",
@@ -21,6 +20,8 @@ $text = array(
 		"your device"			=> "your device",
 		"Browser"			=> "Browser:",
 		"Your IP"			=> "Your IP:",
+		"trial remaining"		=> "trial remaining",
+		"days left"			=> "days left",
 		"files"				=> "files",
 		"Last 10 files..."		=> "Last 10 files opened:",
 		"none"				=> "[none]",
@@ -37,6 +38,7 @@ $text = array(
 	array(
 		"Lock"				=> "Lock",
 		"Refresh"			=> "Refresh",
+		"Plugins"			=> "Plugins",
 		"ROOT"				=> "[ROOT]"
 
 	),
@@ -48,8 +50,10 @@ $text = array(
 		"Your version is"		=> "Your version is",
 		"Update now"			=> "Update now",
 		"You have some..."		=> "You have some unsaved changes",
+		"Are you sure..."		=> "Are you sure you want to close?",
 		"working"			=> "working",
 		"Color picker"			=> "Color picker",
+		"Plugins Manager"		=> "Plugins Manager",
 		"New File"			=> "New File",
 		"New Folder"			=> "New Folder",
 		"Upload File(s)"		=> "Upload File(s)",
@@ -101,11 +105,27 @@ $text = array(
 		"Code Assist"			=> "Code Assist",
 		"Go to Line"			=> "Go to Line",
 		"View"				=> "View",
-		"Bug reporting not active"	=> "Bug reporting not active"
+		"Bug reporting not active"	=> "Bug reporting not active",
+		"Single pane"			=> "Single pane",
+		"Diff pane also"		=> "Diff pane also"
 	),
 
 // /LIB
 
+	"auto-logout-warning" =>
+	array(
+		"Auto Logout Warning"		=> "Auto logout warning",
+		"You will be..."		=> "You will be logged out after",
+		"seconds due to..."		=> "seconds due to inactivity, for security purposes. Use the mouse or hit a key to continue.<br><br>You can adjust or disable this from the Edit > Settings section."
+	),
+
+	"backup-versions" =>
+	array(
+		"backup"			=> "backup",
+		"backups"			=> "backups",
+		"available for"			=> "available for"
+	),
+
 	"bug-files-check" =>
 	array(
 		"Found in"			=> "Found in:"
@@ -113,6 +133,7 @@ $text = array(
 
 	"file-control" =>
 	array(
+		"Sorry, bad filename..."	=> "Sorry, bad filename provided. Check the dev tools console for more info?",
 		"Sorry"				=> "Sorry",
 		"does not seem..."		=> "does not seem to exist on the server",
 		"Sorry, could not..."		=> "Sorry, could not get contents of",
@@ -128,10 +149,11 @@ $text = array(
 		"Sorry, cannot save"		=> "Sorry, cannot save",
 		"Sorry, cannot replace..."	=> "Sorry, cannot replace text in",
 		"Sorry, cannot change..."	=> "Sorry, cannot change permissions on",
+		"Sorry, cannot delete more..."	=> "Sorry, cannot delete more then one item at a time under FTP mode",
 		"Sorry, cannot delete..."	=> "Sorry, cannot delete the root level",
 		"Sorry, cannot delete"		=> "Sorry, cannot delete",
-		"Sorry, this file..."		=> "Sorry, this file has changed, cannot save",
-		"Reload this file..."		=> "Reload this file and copy your version to a diff pane?",
+		"Sorry, this file..."		=> "Sorry, this file has changed outside of ICEcoder, cannot save",
+		"Reload this file..."		=> "Reload this file and copy your version to a diff pane?\\\\n(left side = file from server, right side = unsaved file)",
 		"There was a..."		=> "There was a tech hiccup, likely something was not quite ready. So ICEcoder reloaded its file control again.",
 		"displayed at"			=> "displayed at",
 		"Enter filename to..."		=> "Enter filename to save at",
@@ -139,6 +161,37 @@ $text = array(
 		"Saving"			=> "Saving"
 	),
 
+	"ftp-manager" =>
+	array(
+		"Saving FTP sites"		=> "Saving FTP sites",
+		"Cannot update config..."	=> "Cannot update config file. Please set public write permissions on",
+		"and try again"			=> "and try again",
+		"ftp manager"			=> "ftp manager",
+		"Choose existing site"		=> "Choose existing site",
+		"Are you sure..."		=> "Are you sure you wish to remove this site?",
+		"Add new site"			=> "Add new site",
+		"Edit site"			=> "Edit site",
+		"Site base"			=> "Site base",
+		"Host"				=> "Host",
+		"Username"			=> "Username",
+		"Password"			=> "Password",
+		"PASV and mode"			=> "PASV and mode",
+		"Root"				=> "Root",
+		"eg http://yourdomain.com"	=> "eg http://yourdomain.com",
+		"eg ftp.yourdomain.com"		=> "eg ftp.yourdomain.com",
+		"eg user123"			=> "eg user123",
+		"eg pass123"			=> "eg pass123",
+		"Use PASV mode..."		=> "Use PASV mode if your FTP site requires it and choose the data transfer type - ASCII or binary",
+		"eg /htdocs"			=> "eg /htdocs",
+		"PASV connection off"		=> "PASV connection off",
+		"PASV connection on"		=> "PASV connection on",
+		"ASCII transfer"		=> "ASCII transfer",
+		"Binary transfer"		=> "Binary transfer",
+		"Add"				=> "Add",
+		"Choose"			=> "Choose",
+		"Update"			=> "Update"
+	),
+
 	"get-branch" =>
 	array(
 		"There are no..."		=> "There are no differences between the local and GitHub repo. Switch back to regular mode?",
@@ -155,7 +208,9 @@ $text = array(
 		"github paths"			=> "github paths",
 		"Choose existing path"		=> "Choose existing path",
 		"Local path"			=> "Local path",
+		"Slash prefixed"		=> "Slash prefixed",
 		"Remote GitHub path"		=> "Remote GitHub path",
+		"Absolute URL beginning..."	=> "Absolute URL, beginning https://github.com",
 		"Choose"			=> "Choose",
 		"Set local and..."		=> "Set local and remote path to blank to remove",
 		"Update"			=> "Update",
@@ -232,6 +287,7 @@ $text = array(
 		"Close current tab"		=> "Close current tab",
 		"Open file prompt"		=> "Open file prompt",
 		"Find"				=> "Find",
+		"Previous"			=> "Previous",
 		"Focus on Go..."		=> "Focus on Go to line input",
 		"Save"				=> "Save",
 		"Save as"			=> "Save as...",
@@ -244,6 +300,7 @@ $text = array(
 
 	"ice-coder" =>
 	array(
+		"results"			=> "results",
 		"No text selected..."		=> "No text selected to search on",
 		"all files"			=> "all files",
 		"all filenames"			=> "all filenames",
@@ -252,8 +309,9 @@ $text = array(
 		"Creating Folder"		=> "Creating Folder",
 		"Sorry you can..."		=> "Sorry, you can only have 100 files open at a time!",
 		"Opening File"			=> "Opening File",
-		"Enter relative file..."	=> "Enter relative file path (prefixed with /) or remote URL",
+		"Enter relative file..."	=> "Enter relative file path (prefixed with /) or remote URL\\nYou can enter \\n'/path/file:123' or \\n'/path/file(123)' or \\n'/path/file.ext line 123' \\nto go directly to particular line",
 		"Getting"			=> "Getting",
+		"Saving"			=> "Saving:",
 		"Please enter the..."		=> "Please enter the new name for",
 		"Renaming to"			=> "Renaming to",
 		"Moving to"			=> "Moving to",
@@ -267,6 +325,7 @@ $text = array(
 		"replace all"			=> "replace all",
 		"file"				=> "file",
 		"Replacing text in"		=> "Replacing text in",
+		"Sorry there was..."		=> "Sorry, there was an error with your request.\\n\\nPlease check your dev tools console for more info.",
 		"Cancelled tasks"		=> "Cancelled tasks",
 		"Open previous files"		=> "Open previous files?",
 		"Please enter your..."		=> "Please enter your GitHub token (either personal access token or client/secret pair token). See tooltip next to Github Auth Token on Help > Settings screen for more info",
@@ -276,8 +335,7 @@ $text = array(
 		"Error cannot find..."		=> "Error: cannot find/access the error file paths",
 		"No new errors..."		=> "No new errors found",
 		"You have made..."		=> "You have made changes. Are you sure you want to close without saving?",
-		"Close all tabs"		=> "Close all tabs?",
-		"results"			=> "results"
+		"Close all tabs"		=> "Close all tabs?"
 	),
 
 	"login" =>
@@ -286,6 +344,7 @@ $text = array(
 		"login"				=> "login",
 		"To disable registration..."	=> "To disable registration mode, open the settings menu or open lib/config___settings.php and change enableRegistration to false then reload this page",
 		"Registration mode enabled"	=> "Registration mode enabled",
+		"disable further registrations"	=> "disable further registrations",
 		"auto-check for updates"	=> "auto-check for updates",
 		"To put into..."		=> "To put into multi-user mode, open the settings menu or open lib/config___settings.php and change multiUser to true then reload this page",
 		"multi-user"			=> "multi-user"
@@ -371,7 +430,13 @@ $text = array(
 		"codemirror dir"		=> "codemirror dir",
 		"codemirror version"		=> "codemirror version",
 		"file manager root"		=> "file manager root",
-		"Free to use..."		=> "Free to use it for your own purposes, commercial or not, just let me know of any cool uses or customisations. :)<br><br>No warranty or liability accepted for anything, all responsibility of use is your own.<br><br>A lot of fantastic people and companies have helped build ICEcoder and there is too many to thank here. Please see the full list at",
+		"backups"			=> "backups",
+		"keep version control..."	=> "keep version control backups for",
+		"day"				=> "day",
+		"days"				=> "days",
+		"of backups stored..."		=> "of backups stored currently",
+		"Get in contact..."		=> "Get in contact by...",
+		"You may use..."		=> "You may use ICEcoder for your own purposes, commercial or not, just let us know of any cool uses or customisations. :)<br><br>No warranty or liability accepted for anything, all responsibility of use is your own.",
 		"functionality"			=> "functionality",
 		"check for updates..."		=> "check for updates on load",
 		"auto open last..."		=> "auto open last files on login",
@@ -389,18 +454,27 @@ $text = array(
 		"banned files/folders"		=> "banned files/folders",
 		"banned paths"			=> "banned paths",
 		"ip addresses"			=> "ip addresses",
+		"auto-logout after"		=> "auto-logout after",
+		"mins of inactivity..."		=> "mins of inactivity if no unsaved files",
 		"Slash prefixed comma..."	=> "Slash prefixed, comma delimited",
 		"Comma delimited"		=> "Comma delimited",
 		"style"				=> "style",
 		"theme"				=> "theme",
 		"line wrapping"			=> "line wrapping",
+		"line numbers"			=> "line numbers",
 		"indent type"			=> "indent type",
 		"indent size"			=> "indent size",
+		"match brackets"		=> "match brackets",
+		"show trailing space"		=> "show trailing space",
 		"font size"			=> "font size",
+		"auto indent"			=> "auto indent",
+		"auto close tags"		=> "auto close tags",
+		"auto close brackets"		=> "auto close brackets",
 		"layout"			=> "layout",
 		"plugin panel aligned"		=> "plugin panel aligned",
 		"file manager"			=> "file manager",
 		"root"				=> "root",
+		"Set 0 to..."			=> "Set 0 to disable",
 		"Slash prefixed"		=> "Slash prefixed",
 		"bug reporting"			=> "bug reporting",
 		"check in files"		=> "check in files",
@@ -430,7 +504,19 @@ $text = array(
 	"updater" =>
 	array(
 		"Update appears to..."		=> "Update appears to be successful"
+	),
+    
+	"find-in-files" =>
+	array(
+		"Enter path to search in" => "Enter path to search in",
+		"Enter semicolon-separated masks of files to look at (e.g. *.php;*.html;*.js)" => "Enter semicolon-separated masks of files to look at (e.g. *.php;*.html;*.js)",
+		"Type of text" => "Type of text",
+		"Fixed text" => "Fixed text",
+		"Regular expression" => "Regular expression",
+		"Case sensitive" => "Case sensitive",
+		"Yes" => "Yes",
+		"No" => "No",
+		"Search" => "Search",
 	)
-
 );
 ?>

lang/french.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // French language translation
 // par: @krisxoofoo (GitHub)
 //  @kris_fr Twitter)
@@ -48,6 +48,7 @@ dans lib/config__settings.php",
 		"Your version is"		=> "Votre version est la",
 		"Update now"			=> "Mettre &agrave; jour maintenant",
 		"You have some..."		=> "Vous avez quelques changements non sauvegard&eacute;s",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"				=> "en progression",
 		"Color picker"			=> "S&eacute;lecteur de couleur",
 		"New File"			=> "Nouveau fichier",
@@ -384,6 +385,7 @@ dans lib/config__settings.php",
 		"indent type"			=> "indent type",
 		"indent size"			=> "indent size",
 		"font size"			=> "font size",
+		"auto indent"			=> "auto indent",
 		"layout"				=> "disposition",
 		"plugin panel aligned"	=> "panneau des plugins align&eacute;",
 		"file manager"			=> "gestionnaire de fichiers",

lang/german.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // German language translation
 // by: @olliiee (GitHub)
 //     @trolliusgigant (Twitter)
@@ -49,6 +49,7 @@ $text = array(
 		"Your version is"		=> "Deine Version ist",
 		"Update now"			=> "Jetzt aktualisieren",
 		"You have some..."		=> "Du hast einige nicht gespeicherete Dateien",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"			=> "arbeite",
 		"Color picker"			=> "Farbauswahl",
 		"New File"			=> "Neue Datei",
@@ -357,6 +358,7 @@ $text = array(
 		"indent type"			=> "Einr&uuml;ckung mit",
 		"indent size"			=> "Tabweite",
 		"font size"			=> "Schriftgr&ouml;&szlig;e",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "Layout",
 		"plugin panel aligned"		=> "Ausrichtung Plugin-Panel",
 		"file manager"			=> "Dateimanager",

lang/italian.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // Italian language translation
 // by: @pietrondo (GitHub)
 //     @pietrobravo (Twitter)
@@ -11,7 +11,6 @@ $text = array(
 
 	"editor" =>
 	array(
-	"Click icons for..."	=> "<b>Clicca le icone<br>per l&#39;aiuto &amp;<br>la guida</b>",
 	"server"			=> "server",
 	"Server name, OS..."	=> "Nome server, Sistema operativo e indirizzo IP...",
 	"Root"				=> "Root:",
@@ -25,6 +24,8 @@ $text = array(
 		"Last 10 files..."		=> "Ultimi 10 file aperti:",
 		"none"				=> "[none]",
 		"test suite"			=> "prova suite",
+		"trial remaining"		=> "tempo rimanente alla fine del periodo di prova",
+		"days left"			=> "giorni rimanenti",
 		"Run unit tests"		=> "Esegui test di unità",
 		"dev mode"			=> "modalit&agrave; sviluppo",
 		"Status"			=> "Stato",
@@ -37,6 +38,7 @@ $text = array(
 	array(
 		"Lock"				=> "Blocca",
 		"Refresh"			=> "Aggiorna",
+		"Plugins"			=> "Plugins",
 		"ROOT"				=> "[ROOT]"
 
 	),
@@ -48,8 +50,10 @@ $text = array(
 		"Your version is"		=> "La tua versione Egrave;",
 		"Update now"			=> "Aggiorna ora",
 		"You have some..."		=> "Ci sono modifiche non salvate",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"			=> "working",
 		"Color picker"			=> "Selettore di colore",
+		"Plugins Manager"		=> "Plugins Manager",
 		"New File"			=> "Nuovo file",
 		"New Folder"			=> "Nuova cartella",
 		"Upload File(s)"		=> "Carica File",
@@ -101,7 +105,9 @@ $text = array(
 		"Code Assist"			=> "Code Assist",
 		"Go to Line"			=> "Vai alla linea",
 		"View"				=> "Visualizza",
-		"Bug reporting not active"	=> "Segnalazione bug non attiva"
+		"Bug reporting not active"	=> "Segnalazione bug non attiva",
+"Single pane"			=> "Pannello singolo",
+		"Diff pane also"		=> "Pannello delle differenze"
 	),
 
 // /LIB
@@ -132,7 +138,7 @@ $text = array(
 		"Sorry, cannot delete"		=> "Siamo spiacenti, non è possibile cancellare",
 		"Sorry, this file..."		=> "Siamo spiacenti, questo file è stato cambiato, non è possibile salvarlo",
 		"Reload this file..."		=> "Ricarica questo file e copia la tua versione in un pannello differente",
-		"There was a..."		=> "C'è stato un problema tecnico, probabilmente qualcosa che non era ancora pronto. Così ICEcoder ha  ricaricato di nuovo il file.",
+		"There was a..."		=> "C\'è stato un problema tecnico, probabilmente qualcosa che non era ancora pronto. Così ICEcoder ha  ricaricato di nuovo il file.",
 		"displayed at"			=> "visualizzato in",
 		"Enter filename to..."		=> "Inserisci il nome del file da salvare in",
 		"That file exists..."		=> "Questo file esiste già, sovrascrivere??",
@@ -142,7 +148,7 @@ $text = array(
 	"get-branch" =>
 	array(
 		"There are no..."		=> "Non ci sono differenze tra il repo locale e GitHub. Tornare alla modalità normale??",
-		"Sorry, there was..."		=> "Spiacente, c'è stato un errore, il codice:",
+		"Sorry, there was..."		=> "Spiacente, c\'è stato un errore, il codice:",
 		"Your local folder..."		=> "La cartella locale è vuota, ti piacerebbe clonare"
 	),
 
@@ -156,6 +162,7 @@ $text = array(
 		"Choose existing path"		=> "Scegli il percorso esistente",
 		"Local path"			=> "Percorso locale",
 		"Remote GitHub path"		=> "Remote GitHub path",
+		"Absolute URL beginning..."	=> "Url assoluto che comincia con https://github.com",
 		"Choose"			=> "Scegli",
 		"Set local and..."		=> "Imposta percorso locale e remoto, lasciare vuoto per per rimuovere",
 		"Update"			=> "Aggiorna",
@@ -175,15 +182,15 @@ $text = array(
 
 	"headers" =>
 	array(
-		"Bad CSRF token..."		=> "Bad CSRF token. Per favore riporta l'errore a https://github.com/mattpass/ICEcoder così che possa essere fixato."
+		"Bad CSRF token..."		=> "Bad CSRF token. Per favore riporta l\'errore a https://github.com/mattpass/ICEcoder così che possa essere fixato."
 	),
 
 	"help" =>
 	array(
 		"shortcuts"			=> "shortcuts",
-		"Within document"		=> "all'interno del documento",
+		"Within document"		=> "all\'interno del documento",
 		"On Tabs"			=> "Sulle Tabs",
-		"Within file manager"		=> "All'interno del file manager",
+		"Within file manager"		=> "All\'interno del file manager",
 		"Anywhere"			=> "Dappertutto",
 		"Space"				=> "Spazio",
 		"Click"				=> "Click",
@@ -242,6 +249,7 @@ $text = array(
 
 	"ice-coder" =>
 	array(
+		"results"			=> "risultati",
 		"No text selected..."		=> "Nessun testo selezionato per la ricerc",
 		"all files"			=> "tutti i file",
 		"all filenames"			=> "tutti i nomi dei file",
@@ -250,7 +258,7 @@ $text = array(
 		"Creating Folder"		=> "Sto creando una cartla",
 		"Sorry you can..."		=> "Spiacente, puoi avere solo 100 file aperti a volta!",
 		"Opening File"			=> "Apertura file",
-		"Enter relative file..."	=> "Digita il percorso relativo (con / di prefisso) o l'url remoto",
+		"Enter relative file..."	=> "Digita il percorso relativo (con / di prefisso) o l\'url remoto",
 		"Getting"			=> "Getting",
 		"Please enter the..."		=> "Per favore digita un nuovo nome per",
 		"Renaming to"			=> "Rinominando a ",
@@ -269,7 +277,7 @@ $text = array(
 		"Open previous files"		=> "Aprire i file precedenti?",
 		"Please enter your..."		=> "Please enter your GitHub token (either personal access token or client/secret pair token). See tooltip next to Github Auth Token on Help > Settings screen for more info",
 		"This will compare..."		=> "Questo confronterà e mostrarà la diff tra il dir locale e il repository. Ok?",
-		"Please note for..."		=> "Si prega di notare: affinche l'aggiornamento funzioni correttamente, è necessario disporre dei permessi di scrittura e cancellazione su tutti le cartelle e file di ICEcoder e. Se è necessario ripristinare questa versione di ICEcoder per qualsiasi motivo, lo troverete nella directory / tmp dir. Fare clic su OK per procedere con l'aggiornamento automatico o annullare a visitare il sito ICEcoder in modo da poter utilizzare la zip e aggiornare manualmente.",
+		"Please note for..."		=> "Si prega di notare: affinche l\'aggiornamento funzioni correttamente, è necessario disporre dei permessi di scrittura e cancellazione su tutti le cartelle e file di ICEcoder e. Se è necessario ripristinare questa versione di ICEcoder per qualsiasi motivo, lo troverete nella directory / tmp dir. Fare clic su OK per procedere con l\'aggiornamento automatico o annullare a visitare il sito ICEcoder in modo da poter utilizzare la zip e aggiornare manualmente.",
 		"You can start..."		=> "Puoi ripoertare il bug in Help >  Settings",
 		"Error cannot find..."		=> "Error: cannot find/access the error file paths",
 		"No new errors..."		=> "Nessun nuovo errore trovato",
@@ -371,7 +379,7 @@ $text = array(
 		"file manager root"		=> "root di file manager ",
 		"Free to use..."		=> "Libero di usarlo per i propri scopi, commerciali e non, facendomelo solo sapere per eventuali nuovi e interessanti utilizzi o personalizzazioni. :) <br> Nessuna garanzia o responsabilità, tutte le responsabilità di utilizzo è vostra. <br> Un sacco di aziende e persone fantastiche hanno contribuito a costruire ICEcoder e ce ne sarebbero troppi da ringraziare. Si prega di consultare la lista completa a",
 		"functionality"			=> "funzionalità",
-		"check for updates..."		=> "controlla aggiornamenti all'avvio",
+		"check for updates..."		=> "controlla aggiornamenti all\'avvio",
 		"auto open last..."		=> "Apri automaticamente ultimi file al login",
 		"when finding in..."		=> "quando trovi nei file, escludi",
 		"assisting"			=> "assisting",
@@ -395,6 +403,7 @@ $text = array(
 		"indent type"			=> "tipo di rientro",
 		"indent size"			=> "dimensioni rientro",
 		"font size"			=> "dimensione font ",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "layout",
 		"plugin panel aligned"		=> "Pannello plug inallineato",
 		"file manager"			=> "file manager",
@@ -421,14 +430,27 @@ token di accesso personale (https://help.github.com/articles/creating-an-access-
 
 	"settings-update" =>
 	array(
-		"Cannot update config..."	=> "Non posso aggiornare il file config. Per favore permetti l'accesso pubblico di scrittura",
+		"Cannot update config..."	=> "Non posso aggiornare il file config. Per favore permetti l\'accesso pubblico di scrittura",
 		"and try again"			=> "e prova ancora",
 		"and press refresh"		=> "e premi aggiorna"
 	),
 
 	"updater" =>
 	array(
-		"Update appears to..."		=> "L'aggiornamento sembra andato bene"
+		"Update appears to..."		=> "L\'aggiornamento sembra andato bene"
+	),
+	"find-in-files" =>
+	array(
+		"Enter path to search in" => "Inserire il percorso in cui ricercare",
+		"Enter semicolon-separated masks of files to look at (e.g. *.php;*.html;*.js)" => "
+Inserisci maschere separate da punto e virgola i dei file da cercare (e.s. *.php;*.html;*.js)",
+		"Type of text" => "Tipo di testo",
+		"Fixed text" => "Testo fisso",
+		"Regular expression" => "Espressione regolare",
+		"Case sensitive" => "Case sensitive",
+		"Yes" => "Si",
+		"No" => "No",
+		"Search" => "Cerca",
 	)
 
 );

lang/norwegian.php

@@ -49,6 +49,7 @@ $text = array(
 		"Your version is"		=> "Din versjon er",
 		"Update now"			=> "Oppdater nå",
 		"You have some..."		=> "Du har noe ulagrede endringer",
+		"Are you sure you want to close?" => "Are you sure you want to close?",
 		"working"			=> "arbeider",
 		"Color picker"			=> "Fargevelger",
 		"New File"			=> "Ny Fil",
@@ -386,6 +387,7 @@ $text = array(
 		"indent type"			=> "innrykk type",
 		"indent size"			=> "innrykk størr.",
 		"font size"			=> "skrift størr.",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "layout",
 		"plugin panel aligned"		=> "programtilleggspanel justert",
 		"file manager"			=> "filbehandler",

lang/persian.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 // Persian language translation
 // by: @voltan (GitHub)
 //     @azizabadi_ (Twitter)
@@ -49,6 +49,7 @@ $text = array(
         "Your version is"       => "نسخه مورد استفاده شما",
         "Update now"            => "به روز کنید",
         "You have some..."      => "شما چند تغییر ذخیره نشده دارید",
+        "Are you sure you want to close?" => "Are you sure you want to close?",
         "working"           => "در حال کار",
         "Color picker"          => "اشاره گر رنگ",
         "New File"          => "فایل جدید",
@@ -385,6 +386,7 @@ $text = array(
         "indent type"           => "نوع برجسته کردن",
         "indent size"           => "اندازه برجسته کردن",
         "font size"         => "اندازه فونت",
+        "auto indent"           => "auto indent",
         "layout"            => "لایه",
         "plugin panel aligned"      => "تراز پنل پلاگین",
         "file manager"          => "مدیریت فایل",

lang/portuguese-brazilian.php

@@ -1,5 +1,5 @@
 <?php
-// Português do Brasil
+// Portugu&ecirc;s do Brasil
 // by: @leonardoroese (GitHub)
 
 
@@ -11,25 +11,25 @@ $text = array(
 
 	"editor" =>
 	array(
-		"Click icons for..."		=> "<b>Ícones<br>para ajuda &amp;<br>info. utilização</b>",
+		"Click icons for..."		=> "<b>&Iacute;cones<br>para ajuda &amp;<br>info. utiliza&ccedil;&atilde;o</b>",
 		"server"			=> "Servidor",
 		"Server name, OS..."		=> "Nome do Servidor, OS & IP:",
 		"Root"				=> "Raiz:",
 		"ICEcoder root"			=> "ICEcoder raiz:",
-		"PHP version"			=> "Versâo do PHP:",
+		"PHP version"			=> "Vers&atilde;o do PHP:",
 		"Date & time"			=> "Data e Hora:",
 		"your device"			=> "seu dispositivo",
 		"Browser"			=> "Exibir:",
 		"Your IP"			=> "Seu IP:",
 		"files"				=> "arquivos",
-		"Last 10 files..."		=> "ùltimos 10 arquivos abertos:",
+		"Last 10 files..."		=> "&uacute;ltimos 10 arquivos abertos:",
 		"none"				=> "[nenhum]",
-		"test suite"			=> "suíte de teste",
-		"Run unit tests"		=> "Executar testes unitários",
+		"test suite"			=> "su&iacute;te de teste",
+		"Run unit tests"		=> "Executar testes unit&atilde;rios",
 		"dev mode"			=> "modo desenv.",
 		"Status"			=> "Status",
 		"Using"				=> "Usando",
-		"You can switch..."		=> "Você pode alterar modo desenv. on/off em lib/config__settings.php"
+		"You can switch..."		=> "Voc&ecirc; pode alterar modo desenv. on/off em lib/config__settings.php"
 
 	),
 
@@ -43,13 +43,14 @@ $text = array(
 
 	"index" =>
 	array(
-		"UPDATE INFO"			=> "INFO ATUALIZAÇÃO",
-		"now available"			=> "disponível agora",
-		"Your version is"		=> "Sua versão é",
-		"Update now"			=> "Atualizar já",
-		"You have some..."		=> "Voce possui alterações não salvas",
+		"UPDATE INFO"			=> "INFORMA&Ccedil;&Atilde; DE ATUALIZA&Ccedil;&Atilde;O",
+		"now available"			=> "dispon&iacute;vel agora",
+		"Your version is"		=> "Sua vers&atilde;o &eacute;",
+		"Update now"			=> "Atualizar j&atilde;",
+		"You have some..."		=> "Voce possui altera&ccedil;&otilde;es n&atilde;o salvas",
+		"Are you sure you want to close?" => "Voc&ecirc; tem certeza que deseja fechar?",
 		"working"			=> "trabalhando",
-		"Color picker"			=> "Color picker",
+		"Color picker"			=> "Seletor de Cores",
 		"New File"			=> "Novo Arquivo",
 		"New Folder"			=> "Nova Pasta",
 		"Upload File(s)"		=> "Carregar arquivo(s)",
@@ -59,7 +60,7 @@ $text = array(
 		"Duplicate"			=> "Duplicar",
 		"Delete"			=> "Excluir",
 		"Rename"			=> "Renomear",
-		"View Webpage"			=> "Exibir Página Web",
+		"View Webpage"			=> "Exibir P&atilde;gina Web",
 		"Download"			=> "Download",
 		"Properties"			=> "Propriedades",
 		"File"				=> "Arquivo",
@@ -69,8 +70,8 @@ $text = array(
 		"Help"				=> "Ajuda",
 		"Save"				=> "Salvar",
 		"Save As"			=> "Salvar Como",
-		"Live Preview"			=> "Preview",
-		"Upload"			=> "Upload",
+		"Live Preview"			=> "Visualizar",
+		"Upload"			=> "Enviar",
 		"Zip"				=> "Zip",
 		"Print"				=> "Imprimir",
 		"Fullscreen toggle"		=> "Exibir tela cheia",
@@ -81,10 +82,10 @@ $text = array(
 		"Indent less"			=> "Indentar -",
 		"Autocomplete"			=> "Autocompletar",
 		"Comment/Uncomment"		=> "Comentar/Descomentar",
-		"Jump to Definition"		=> "Ir para definição",
+		"Jump to Definition"		=> "Ir para defini&ccedil;&atilde;o",
 		"Manual"			=> "Manual",
 		"Shortcuts"			=> "Atalhos",
-		"Settings"			=> "Configurações",
+		"Settings"			=> "Configura&ccedil;&otilde;es",
 		"Search for selected"		=> "Procurar por selecionado",
 		"website"			=> "website",
 		"Close all tabs"		=> "Fechar todas as abas",
@@ -102,7 +103,7 @@ $text = array(
 		"Code Assist"			=> "Assistente",
 		"Go to Line"			=> "Ir para linha",
 		"View"				=> "Exibir",
-		"Bug reporting not active"	=> "Relatório de Bug desativado"
+		"Bug reporting not active"	=> "Relat&oacute;rio de Bug desativado"
 	),
 
 // /LIB
@@ -115,42 +116,42 @@ $text = array(
 	"file-control" =>
 	array(
 		"Sorry"				=> "Desculpe",
-		"does not seem..."		=> "Não encontrado no servidor",
-		"Sorry, could not..."		=> "Desculpe, conteudo não encontrado para",
-		"Sorry, cannot create..."	=> "Desculpe, não é possível criar pasta",
-		"Sorry, cannot copy"		=> "Desculpe, não é possível copy",
+		"does not seem..."		=> "N&atilde;o encontrado no servidor",
+		"Sorry, could not..."		=> "Desculpe, conteudo n&atilde;o encontrado para",
+		"Sorry, cannot create..."	=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel criar pasta",
+		"Sorry, cannot copy"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel copy",
 		"into"				=> "into",
 		"Uploaded file(s) OK"		=> "Arquivos carregados",
-		"Sorry, cannot upload"		=> "Desculpe, não é possível carregar",
-		"Sorry, cannot upload..."	=> "Desculpe, não é possível carregar lista no modo DEMO",
-		"Sorry, cannot rename"		=> "Desculpe, não é possível renomear",
-		"Maybe public write..."		=> "A pasta superior possui permissão de escrita?",
-		"Sorry, cannot move"		=> "Desculpe, não é possível mover",
-		"Sorry, cannot save"		=> "Desculpe, não é possível salvar",
-		"Sorry, cannot replace..."	=> "Desculpe, não é possível substituir texto em",
-		"Sorry, cannot change..."	=> "Desculpe, não é possível mudar permissões para",
-		"Sorry, cannot delete..."	=> "Desculpe, não é possível excluir nível raiz",
-		"Sorry, cannot delete"		=> "Desculpe, não é possível remover",
-		"Sorry, this file..."		=> "Desculpe, este arquivo foi modificado, não é possível salvar",
-		"Reload this file..."		=> "Recarregar e copiar sua versão?",
+		"Sorry, cannot upload"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel carregar",
+		"Sorry, cannot upload..."	=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel carregar lista no modo DEMO",
+		"Sorry, cannot rename"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel renomear",
+		"Maybe public write..."		=> "A pasta superior possui permiss&atilde;o de escrita?",
+		"Sorry, cannot move"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel mover",
+		"Sorry, cannot save"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel salvar",
+		"Sorry, cannot replace..."	=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel substituir texto em",
+		"Sorry, cannot change..."	=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel mudar permiss&otilde;es para",
+		"Sorry, cannot delete..."	=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel excluir n&iacute;vel raiz",
+		"Sorry, cannot delete"		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel remover",
+		"Sorry, this file..."		=> "Desculpe, este arquivo foi modificado, n&atilde;o &eacute; poss&iacute;vel salvar",
+		"Reload this file..."		=> "Recarregar e copiar sua vers&atilde;o?",
 		"There was a..."		=> "Ocorreu algum problema. O ICEcoder recarregou o arquivo de controle novamente",
 		"displayed at"			=> "exibido em",
 		"Enter filename to..."		=> "Informe o nome do aquivo para salvar",
-		"That file exists..."		=> "Este arquivo já existe, sobrescrever?",
+		"That file exists..."		=> "Este arquivo j&atilde; existe, sobrescrever?",
 		"Saving"			=> "Salvando"
 	),
 
 	"get-branch" =>
 	array(
-		"There are no..."		=> "Não há diferenças entre loca/Github. Retornar para modo normal?",
-		"Sorry, there was..."		=> "Desculpe, ocorreu um erro, código:",
-		"Your local folder..."		=> "Sua pasta local está vazia, gostaria de clonar"
+		"There are no..."		=> "N&atilde;o h&atilde; diferen&ccedil;as entre loca/Github. Retornar para modo normal?",
+		"Sorry, there was..."		=> "Desculpe, ocorreu um erro, c&oacute;digo:",
+		"Your local folder..."		=> "Sua pasta local est&atilde; vazia, gostaria de clonar"
 	),
 
 	"github-manager" =>
 	array(
-		"Sorry, cannot create..."	=> "Desculpe, não foi possível criar em",
-		"Cannot update config..."	=> "Não é possível atualizar config. Habilitar permissões públicas",
+		"Sorry, cannot create..."	=> "Desculpe, n&atilde;o foi poss&iacute;vel criar em",
+		"Cannot update config..."	=> "N&atilde;o &eacute; poss&iacute;vel atualizar config. Habilitar permiss&otilde;es p&uacute;blicas",
 		"and try again"			=> "e tentar novamente",
 		"saving github paths"		=> "salvando caminhos Github...",
 		"github paths"			=> "caminhos Github",
@@ -158,20 +159,20 @@ $text = array(
 		"Local path"			=> "Caminho local",
 		"Remote GitHub path"		=> "Caminho remoto Github",
 		"Choose"			=> "Selecione",
-		"Set local and..."		=> "Alterar caminho local e remoto como vazio para excluír",
+		"Set local and..."		=> "Alterar caminho local e remoto como vazio para exclu&iacute;r",
 		"Update"			=> "Atualizar",
 		"Add new path"			=> "Adicionar novo caminho",
 		"Add"				=> "Adicionar",
-		"Usage Info"			=> "Info. de utilização:",
+		"Usage Info"			=> "Info. de utiliza&ccedil;&atilde;o:",
 		"Enter relative local..."	=> "Informe os caminhos relativos (ex.: /server/myfiles) e absolutos do GitHub (ex.: https://github.com/user/repo ou https://github.com/user/repo/tree/branch for branches).Com isso estabelece os caminho dos fontes em ambos locais, como pares.",
-		"You can then..."		=> "Você pode então escolher um caminho par para ser a raiz do ICEcoder.",
-		"The file manager..."		=> "O gerenciador de arquivo exibirá o ícone GitHub, você pode clicar para verificar a diferença entre arquivos.Essas diferenças podem ser efetivadas e enviadas ao diretório remoto do GitHub ou clonado para pasta local, para sincronizar seus arquivos.",
-		"If you want..."		=> "Se quiser configurar novo caminho raiz, pode ser feito na tela de configurações."
+		"You can then..."		=> "Voc&ecirc; pode ent&atilde;o escolher um caminho par para ser a raiz do ICEcoder.",
+		"The file manager..."		=> "O gerenciador de arquivo exibir&atilde; o &iacute;cone GitHub, voc&ecirc; pode clicar para verificar a diferen&ccedil;a entre arquivos.Essas diferen&ccedil;as podem ser efetivadas e enviadas ao diret&oacute;rio remoto do GitHub ou clonado para pasta local, para sincronizar seus arquivos.",
+		"If you want..."		=> "Se quiser configurar novo caminho raiz, pode ser feito na tela de configura&ccedil;&otilde;es."
 	),
 
 	"github" =>
 	array(
-		"Sorry, you do..."		=> "Desculpe, o OpenSSL não foi encontrado, https indisponível. Isso é necessário para o GitHub transferir dados, verificar php.ini, reinicie o sistema e tente novamente"
+		"Sorry, you do..."		=> "Desculpe, o OpenSSL n&atilde;o foi encontrado, https indispon&iacute;vel. Isso &eacute; necess&atilde;rio para o GitHub transferir dados, verificar php.ini, reinicie o sistema e tente novamente"
 	),
 
 	"headers" =>
@@ -186,7 +187,7 @@ $text = array(
 		"On Tabs"			=> "Em abas",
 		"Within file manager"		=> "No gerenciador de arquivos",
 		"Anywhere"			=> "Qualquer Lugar",
-		"Space"				=> "Espaço",
+		"Space"				=> "Espa&ccedil;o",
 		"Click"				=> "Clique",
 		"or"				=> "ou",
 		"Left click"			=> "Clique esquerdo",
@@ -196,16 +197,16 @@ $text = array(
 		"Middle scrollwheel"		=> "Meio scroll",
 		"Drag"				=> "Arrastar",
 		"Autocomplete add snippet"	=> "Auto-completar / adicionar snippet",
-		"Multiple select"		=> "Multipla seleção",
+		"Multiple select"		=> "Multipla sele&ccedil;&atilde;o",
 		"Move line up"			=> "Move linha acima",
 		"Move line down"		=> "Move linha abaixo",
 		"Duplicate lines"		=> "Duplicar linha(s)",
 		"Remove lines"			=> "Remover linha(s)",
 		"Insert line before"		=> "Inserir linha antes",
-		"Insert line after"		=> "Inserir linha após",
+		"Insert line after"		=> "Inserir linha ap&oacute;s",
 		"Search for selected"		=> "Procurar selecionado",
-		"Jump to definition"		=> "Ir para definição / voltar",
-		"Comment uncomment"		=> "Commentar / descomentar",
+		"Jump to definition"		=> "Ir para defini&ccedil;&atilde;o / voltar",
+		"Comment uncomment"		=> "Comentar / Descomentar",
 		"Insert tab indent"		=> "Inserir aba / auto indent selected",
 		"Insert more"			=> "Indentar +",
 		"Insert less"			=> "Indentar -",
@@ -223,11 +224,11 @@ $text = array(
 		"Close tab"			=> "Fechar aba",
 		"Select file folder"		=> "Selecionar arquivo / pasta",
 		"Open file"			=> "Abrir arquivo",
-		"Range select"			=> "Seleção",
-		"Options for selected"		=> "Opções para seleção",
+		"Range select"			=> "Sele&ccedil;&atilde;o",
+		"Options for selected"		=> "Op&ccedil;&otilde;es para sele&ccedil;&atilde;o",
 		"Delete selected"		=> "Excluir selecionado",
-		"Next previous tab"		=> "Próxima aba / anterior",
-		"Next tab"			=> "Próxima aba",
+		"Next previous tab"		=> "Pr&oacute;xima aba / anterior",
+		"Next tab"			=> "Pr&oacute;xima aba",
 		"Previous tab"			=> "Aba anterior",
 		"New tab"			=> "Nova aba",
 		"Close current tab"		=> "Fechar aba atual",
@@ -236,7 +237,7 @@ $text = array(
 		"Focus on Go..."		=> "Foco campo ir para linha",
 		"Save"				=> "Salvar",
 		"Save as"			=> "Salvar como...",
-		"View webpage"			=> "Exibir página",
+		"View webpage"			=> "Exibir p&atilde;gina",
 		"Contract expand file..."	=> "Contrair / expandir gerenciador de arquivos",
 		"Fold unfold current..."	=> "Contrair / expandir linha atual",
 		"Refocus on document"		=> "Foco no documento",
@@ -251,7 +252,7 @@ $text = array(
 		"selected files"		=> "arquivos selecionados",
 		"selected filenames"		=> "nomes de arquivos selecionados",
 		"Creating Folder"		=> "Criando pasta",
-		"Sorry you can..."		=> "Deculpe, permitido abrir máx. 100 arquivos!",
+		"Sorry you can..."		=> "Deculpe, permitido abrir m&atilde;x. 100 arquivos!",
 		"Opening File"			=> "Abrindo arquivo",
 		"Enter relative file..."	=> "Informe caminho relativo (prefixado por /) ou URL remota",
 		"Getting"			=> "Selecionando",
@@ -260,7 +261,7 @@ $text = array(
 		"Moving to"			=> "Movendo para",
 		"Deleting File"			=> "Excluindo arquivo",
 		"Pasting File"			=> "Colando arquivo",
-		"Sorry cannot paste..."		=> "Desculpe, não é possível colar em toda raiz",
+		"Sorry cannot paste..."		=> "Desculpe, n&atilde;o &eacute; poss&iacute;vel colar em toda raiz",
 		"Nothing to paste..."		=> "Nada para colar,copiar arquivo/pasta primeiro!",
 		"and"				=> "e",
 		"this document"			=> "este documento",
@@ -270,13 +271,13 @@ $text = array(
 		"Replacing text in"		=> "Substituindo texto em",
 		"Cancelled tasks"		=> "Tarefas canceladas",
 		"Open previous files"		=> "Abrir arquivos anteriores?",
-		"Please enter your..."		=> "Informe sua chave GitHub (chave pessoal ou par). Veja dica próximo à chave Github em Ajuda > Configurações para mais informações",
-		"This will compare..."		=> "Esta ação irá comparar e exibir diferenças do seu repositório local. OK?",
-		"Please note for..."		=> "Atenção: para atualizar corretamente, é necessário permissâo de escrita em todos os diretórios/arquivos do ICEcoder. \\n\\nSe por algum motivo necessite recuperar esta versão do ICEcoder, estará disponível na pasta /tmp.\\n\\nClique OK para prosseguir com a atualização, ou cancelar para visitar a página do ICEcoder na internet onde poderá baixar a atualização manualmente.",
-		"You can start..."		=> "Voce pode reportar um bug em Ajuda > Configurações",
-		"Error cannot find..."		=> "Erro: não é possível acessar caminho/arquivo de erros",
+		"Please enter your..."		=> "Informe sua chave GitHub (chave pessoal ou par). Veja dica pr&oacute;ximo à chave Github em Ajuda > Configura&ccedil;&otilde;es para mais informa&ccedil;&otilde;es",
+		"This will compare..."		=> "Esta a&ccedil;&atilde;o ir&atilde; comparar e exibir diferen&ccedil;as do seu reposit&oacute;rio local. OK?",
+		"Please note for..."		=> "Aten&ccedil;&atilde;o: para atualizar corretamente, &eacute; necess&atilde;rio permiss&atilde;o de escrita em todos os diret&oacute;rios/arquivos do ICEcoder. \\n\\nSe por algum motivo necessite recuperar esta vers&atilde;o do ICEcoder, estar&atilde; dispon&iacute;vel na pasta /tmp.\\n\\nClique OK para prosseguir com a atualiza&ccedil;&atilde;o, ou cancelar para visitar a p&atilde;gina do ICEcoder na internet onde poder&atilde; baixar a atualiza&ccedil;&atilde;o manualmente.",
+		"You can start..."		=> "Voce pode reportar um bug em Ajuda > Configura&ccedil;&otilde;es",
+		"Error cannot find..."		=> "Erro: n&atilde;o &eacute; poss&iacute;vel acessar caminho/arquivo de erros",
 		"No new errors..."		=> "Nenhum erro encontrado",
-		"You have made..."		=> "Voce fez alterações. Deseja realmente fechar sem salvar?",
+		"You have made..."		=> "Voce fez altera&ccedil;&otilde;es. Deseja realmente fechar sem salvar?",
 		"Close all tabs"		=> "Fechar todas as abas?",
 		"results"			=> "resultados"
 	),
@@ -285,11 +286,11 @@ $text = array(
 	array(
 		"set password"			=> "altera senha",
 		"login"				=> "login",
-		"To disable registration..."	=> "Para desabilitar modo registro, acesse menu/configurações ou em lib/config___settings.php altere enableRegistration para false e recarregue esta página",
+		"To disable registration..."	=> "Para desabilitar modo registro, acesse menu/configura&ccedil;&otilde;es ou em lib/config___settings.php altere enableRegistration para false e recarregue esta p&atilde;gina",
 		"Registration mode enabled"	=> "Modo registro habilitado",
-		"auto-check for updates"	=> "verificar atualizações auto.",
-		"To put into..."		=> "Para habilitar multi-usuários, acesse menu/configurações ou em lib/config___settings.php altere multiUser para true e recarregue esta página",
-		"multi-user"			=> "multi-usuários"
+		"auto-check for updates"	=> "verificar atualiza&ccedil;&otilde;es auto.",
+		"To put into..."		=> "Para habilitar multi-usu&atilde;rios, acesse menu/configura&ccedil;&otilde;es ou em lib/config___settings.php altere multiUser para true e recarregue esta p&atilde;gina",
+		"multi-user"			=> "multi-usu&atilde;rios"
 	),
 
 	"multiple-results" =>
@@ -307,17 +308,17 @@ $text = array(
 		"No matches found"		=> "Nenhum resultado encontrado",
 		"selected"			=> "selecionado",
 		"found in"			=> "encontrado em",
-		"Replaced"			=> "Substituído(s)"
+		"Replaced"			=> "Substitu&iacute;do(s)"
 	),
 
 	"plugins-manager" =>
 	array(
 		"ICEcoder needs to..."		=> "ICEcoder deve ser reiniciado para habilitar plugin. Deseja Reiniciar?",
 		"saving plugins"		=> "salvando plugins...",
-		"Cannot update config..."	=> "Não foi possível atualizar arquivo de configuração. Verifique permissões de escrita.",
+		"Cannot update config..."	=> "N&atilde;o foi poss&iacute;vel atualizar arquivo de configura&ccedil;&atilde;o. Verifique permiss&otilde;es de escrita.",
 		"and try again"			=> "e tente novamente",
-		"couldnt delete dir"		=> "não foi possível excluir pasta",
-		"couldnt delete file"		=> "não foi possível excluir arquivo",
+		"couldnt delete dir"		=> "n&atilde;o foi poss&iacute;vel excluir pasta",
+		"couldnt delete file"		=> "n&atilde;o foi poss&iacute;vel excluir arquivo",
 		"plugins"			=> "plugins",
 		"Guide to writing..."		=> "Guia para criar plugins",
 		"Manage Installed"		=> "Gerenciar plugins",
@@ -327,7 +328,7 @@ $text = array(
 		"Update"			=> "Atualizar",
 		"Install"			=> "Instalar",
 		"Uninstall"			=> "Desinstalar",
-		"Reload after install..."	=> "Atualização necessária após instalação"
+		"Reload after install..."	=> "Atualiza&ccedil;&atilde;o necess&atilde;ria ap&oacute;s instala&ccedil;&atilde;o"
 	),
 
 	"properties" =>
@@ -341,10 +342,10 @@ $text = array(
 		"Relative path"			=> "Caminho relativo",
 		"Absolute path"			=> "Caminho absoluto",
 		"Contains"			=> "Contem",
-		"Permissions"			=> "Permissões",
-		"Owner"				=> "Proprietário",
+		"Permissions"			=> "Permiss&otilde;es",
+		"Owner"				=> "Propriet&atilde;rio",
 		"Group"				=> "Grupo",
-		"Public"			=> "Público",
+		"Public"			=> "P&uacute;blico",
 		"Read"				=> "Ler",
 		"Write"				=> "Salvar",
 		"Execute"			=> "Executar",
@@ -354,50 +355,51 @@ $text = array(
 
 	"settings-common" =>
 	array(
-		"Your document does..."		=> "Seu arquivo não está no formato UTF-8, deve ser convertido"
+		"Your document does..."		=> "Seu arquivo n&atilde;o est&atilde; no formato UTF-8, deve ser convertido"
 	),
 
 	"settings-save-current-files" =>
 	array(
-		"Cannot update config..."	=> "Não foi possível atualizar arquivo de configuração. Verifique permissões de acesso (públicas)",
+		"Cannot update config..."	=> "N&atilde;o foi poss&iacute;vel atualizar arquivo de configura&ccedil;&atilde;o. Verifique permiss&otilde;es de acesso (p&uacute;blicas)",
 		"and try again"			=> "e tente novamente"
 	),
 
 	"settings-screen" =>
 	array(
-		"settings"			=> "configurações",
-		"version"			=> "versão",
+		"settings"			=> "configura&ccedil;&otilde;es",
+		"version"			=> "vers&atilde;o",
 		"website"			=> "website",
 		"git"				=> "git",
 		"codemirror dir"		=> "pasta codemirror",
-		"codemirror version"		=> "versão codemirror",
+		"codemirror version"		=> "vers&atilde;o codemirror",
 		"file manager root"		=> "Raiz gerenciador de arquivos",
-		"Free to use..."		=> "Livre para utilização para seus propósitos, comercial ou não, mas aviseme sobre sua implementação se puder. :)<br><br>Sem garantias, Muitas empresas e pessoas fantásticas contribuiram para desenvolver o ICEcoder, há muito o que agradecermos aqui. Veja a lista completa aqui",
+		"Free to use..."		=> "Livre para utiliza&ccedil;&atilde;o para seus prop&oacute;sitos, comercial ou n&atilde;o, mas aviseme sobre sua implementa&ccedil;&atilde;o se puder. :)<br><br>Sem garantias, Muitas empresas e pessoas fant&atilde;sticas contribuiram para desenvolver o ICEcoder, h&atilde; muito o que agradecermos aqui. Veja a lista completa aqui",
 		"functionality"			=> "funcionalidade",
-		"check for updates..."		=> "verificar atualizações ao iniciar",
-		"auto open last..."		=> "carregar últimos arquvos abertos ao iniciar",
+		"check for updates..."		=> "verificar atualiza&ccedil;&otilde;es ao iniciar",
+		"auto open last..."		=> "carregar &uacute;ltimos arquvos abertos ao iniciar",
 		"when finding in..."		=> "ao buscar arquivos, excluir",
 		"assisting"			=> "assistindo",
-		"code assist"			=> "Assist. de cód.",
-		"visible tabs"			=> "Abas visíveis",
+		"code assist"			=> "Assist. de c&oacute;d.",
+		"visible tabs"			=> "Abas vis&iacute;veis",
 		"locked nav"			=> "Trava Nav.",
 		"tag wrapper command"		=> "comando de quebra",
 		"auto-complete on"		=> "hab. auto-completar",
-		"security"			=> "segurança",
+		"security"			=> "seguran&ccedil;a",
 		"new password"			=> "nova senha",
-		"8 chars min"			=> "mín. 8 carac.",
+		"8 chars min"			=> "m&iacute;n. 8 carac.",
 		"confirm password"		=> "confirmar senha",
 		"banned files/folders"		=> "arquivos/pastas bloqueados",
 		"banned paths"			=> "caminhos bloqueados",
-		"ip addresses"			=> "endereços IP",
-		"Slash prefixed comma..."	=> "Prefixo barra, separado por vígula",
-		"Comma delimited"		=> "Separado por vírgula",
+		"ip addresses"			=> "endere&ccedil;os IP",
+		"Slash prefixed comma..."	=> "Prefixo barra, separado por v&iacute;gula",
+		"Comma delimited"		=> "Separado por v&iacute;rgula",
 		"style"				=> "estilo",
 		"theme"				=> "tema",
 		"line wrapping"			=> "quebra de linha",
 		"indent type"			=> "indent type",
 		"indent size"			=> "indent size",
 		"font size"			=> "tam. fonte",
+		"auto indent"			=> "auto indent",
 		"layout"			=> "layout",
 		"plugin panel aligned"		=> "painel plugin alinhado",
 		"file manager"			=> "gerenciador de arquivos",
@@ -406,31 +408,31 @@ $text = array(
 		"bug reporting"			=> "reportar erro",
 		"check in files"		=> "verificar em arquivos",
 		"every"				=> "tudo",
-		"secs getting last"		=> "segs, pegando últimos",
+		"secs getting last"		=> "segs, pegando &uacute;ltimos",
 		"lines"				=> "linhas",
-		"multi-user"			=> "multi-usuário",
-		"Make sure you..."		=> "Cuidado para nâo travar seu usuário",
+		"multi-user"			=> "multi-usu&aacute;rio",
+		"Make sure you..."		=> "Cuidado para n&atilde;o travar seu usu&atilde;rio",
 		"Registration"			=> "Cadastro",
-		"auth token"			=> "Chave de Autenticação",
-		"Required to get..."		=> "RNecessário para verificar diferenças, e efetivar alterações no GitHub. Se não tiver uma pode usar:".PHP_EOL.PHP_EOL.
+		"auth token"			=> "Chave de Autentica&ccedil;&atilde;o",
+		"Required to get..."		=> "RNecess&atilde;rio para verificar diferen&ccedil;as, e efetivar altera&ccedil;&otilde;es no GitHub. Se n&atilde;o tiver uma pode usar:".PHP_EOL.PHP_EOL.
 							"- chave de acesso pessoal (https://help.github.com/articles/creating-an-access-token-for-command-line-use), or".PHP_EOL.
 							"- cliente/par secreto (http://developer.github.com/v3/oauth).".PHP_EOL.PHP_EOL.
-							"Não é recomendado configurar sua chave aqui, mas quando solicitado pelo ICEcoderpara mantes em sessão apenas.".PHP_EOL.PHP_EOL.
-							"No entanto, se trabalhar em ambiente seguro, é melhor setar essa propriedade.",
-		"Sorry cannot commit..."	=> "Desculpe, não é permitido efetivar atulização no modo DEMO",
+							"N&atilde;o &eacute; recomendado configurar sua chave aqui, mas quando solicitado pelo ICEcoderpara mantes em sess&atilde;o apenas.".PHP_EOL.PHP_EOL.
+							"No entanto, se trabalhar em ambiente seguro, &eacute; melhor setar essa propriedade.",
+		"Sorry cannot commit..."	=> "Desculpe, n&atilde;o &eacute; permitido efetivar atuliza&ccedil;&atilde;o no modo DEMO",
 		"update"			=> "atualizar"
 	),
 
 	"settings-update" =>
 	array(
-		"Cannot update config..."	=> "Não foi possível atualizar arquivo de configuração. Verifique permissões de acesso (públicas)",
+		"Cannot update config..."	=> "N&atilde;o foi poss&iacute;vel atualizar arquivo de configura&ccedil;&atilde;o. Verifique permiss&otilde;es de acesso (p&uacute;blicas)",
 		"and try again"			=> "e tentar novamente",
 		"and press refresh"		=> "e pressione atulizar"
 	),
 
 	"updater" =>
 	array(
-		"Update appears to..."		=> "Atualização completada"
+		"Update appears to..."		=> "Atualiza&ccedil;&atilde;o completada"
 	)
 
 );

lang/spanish.php

@@ -0,0 +1,468 @@
+<?php
+// Spanish language translation
+// by: @unix4you2 (GitHub)
+
+// Please preserve formatting, line breaks, special characters, anything in <tags> and HTML equivalents (eg &amp;). Translations on right side.
+
+$text = array(
+
+// / [ROOT LEVEL]
+
+	"editor" =>
+	array(
+		"Click icons for..."		=> "<b>Clic en los iconos<br>para ayuda &amp;<br>modo de uso</b>",
+		"server"			=> "servidor",
+		"Server name, OS..."		=> "Nombre del servidor, OS & IP:",
+		"Root"				=> "Raiz:",
+		"ICEcoder root"			=> "Raiz de ICEcoder:",
+		"PHP version"			=> "Versi&oacute;n PHP:",
+		"Date & time"			=> "Fecha y hora:",
+		"your device"			=> "su dispositivo",
+		"Browser"			=> "Navegador:",
+		"Your IP"			=> "Su IP:",
+		"trial remaining"		=> "prueba restante",
+		"days left"			=> "dias",
+		"files"				=> "archivos",
+		"Last 10 files..."		=> "Ultimos 10 archivos abiertos:",
+		"none"				=> "[ninguno]",
+		"test suite"			=> "modo de pruebas",
+		"Run unit tests"		=> "Ejecutar tests unitarios",
+		"dev mode"			=> "modo desarrollo",
+		"Status"			=> "Estado",
+		"Using"				=> "Usando",
+		"You can switch..."		=> "Usted puede cambiar el modo de desarrollo cambiando su valor on/off en lib/config__settings.php"
+
+	),
+
+	"files" =>
+	array(
+		"Lock"				=> "Bloquear",
+		"Refresh"			=> "Actualizar",
+		"Plugins"			=> "Complementos",
+		"ROOT"				=> "[RAIZ]"
+
+	),
+
+	"index" =>
+	array(
+		"UPDATE INFO"			=> "INFORMACION DE ACTUALIZACION",
+		"now available"			=> "ahora disponible",
+		"Your version is"		=> "Su versi&oacute;n es",
+		"Update now"			=> "Actualizar ahora",
+		"You have some..."		=> "Usted tiene cambios sin guardar",
+		"Are you sure..." => "Est&aacute; seguro que desea cerrar?",
+		"working"			=> "trabajando",
+		"Color picker"			=> "Selector de color",
+		"Plugins Manager"		=> "Administrar complementos",
+		"New File"			=> "Nuevo archivo",
+		"New Folder"			=> "Nueva carpeta",
+		"Upload File(s)"		=> "Cargar archivo(s)",
+		"Paste"				=> "Pegar",
+		"Open"				=> "Abrir",
+		"Copy"				=> "Copiar",
+		"Duplicate"			=> "Duplicar",
+		"Delete"			=> "Eliminar",
+		"Rename"			=> "Renombrar",
+		"View Webpage"			=> "Ver p&aacute;gina web",
+		"Download"			=> "Descargar",
+		"Properties"			=> "Propiedades",
+		"File"				=> "Archivo",
+		"Edit"				=> "Editar",
+		"Source"			=> "Fuente",
+		"Help"				=> "Ayuda",
+		"Save"				=> "Guardar",
+		"Save As"			=> "Guardar como",
+		"Live Preview"			=> "Vista previa",
+		"Upload"			=> "Cargar",
+		"Zip"				=> "Comprimir",
+		"Print"				=> "Imprimir",
+		"Fullscreen toggle"		=> "Cambiar a pantalla completa",
+		"Logout"			=> "Salir",
+		"Undo"				=> "Deshacer",
+		"Redo"				=> "Rehacer",
+		"Indent more"			=> "Aumentar sangr&iacute;a",
+		"Indent less"			=> "Disminuir sangr&iacute;a",
+		"Autocomplete"			=> "Autocompletar",
+		"Comment/Uncomment"		=> "Comentar/Descomentar",
+		"Jump to Definition"		=> "Saltar a la definici&oacute;n",
+		"Manual"			=> "Manual",
+		"Shortcuts"			=> "Accesos directos",
+		"Settings"			=> "Configuraci&oacute;n",
+		"Search for selected"		=> "Buscar por lo seleccionado",
+		"website"			=> "sitio web",
+		"Close all tabs"		=> "Cerrar todas las pesta&ntilde;as",
+		"Alphabetize tabs"		=> "Ordenar pesta&ntilde;as",
+		"Find"				=> "Buscar",
+		"in"				=> "en",
+		"and"				=> "y",
+		"replace"			=> "reemplazar",
+		"replace all"			=> "reemplazar todo",
+		"this document"			=> "este documento",
+		"open documents"		=> "abrir documentos",
+		"all files"			=> "todos los archivos",
+		"all filenames"			=> "todos los nombres de archivo",
+		"Turn on/off..."		=> "Encender o apagar asistente de c&oacute;digo",
+		"Code Assist"			=> "Asistente de c&oacute;digo",
+		"Go to Line"			=> "Ir a la l&iacute;nea",
+		"View"				=> "Ver",
+		"Bug reporting not active"	=> "Reporte de Errores no activado",
+		"Single pane"			=> "Panel unico",
+		"Diff pane also"		=> "Panel de diferencias tambien"
+	),
+
+// /LIB
+
+	"bug-files-check" =>
+	array(
+		"Found in"			=> "Encontrado en:"
+	),
+
+	"file-control" =>
+	array(
+		"Sorry, bad filename..."	=> "Lo siento, nombre de archivo incorrecto. Verifique la consola de desarrollo para mas informacion?",
+		"Sorry"				=> "Lo siento",
+		"does not seem..."		=> "parace no existir en el servidor",
+		"Sorry, could not..."		=> "Lo siento, no puedo obtener el contenido de",
+		"Sorry, cannot create..."	=> "Lo siento, no puedo crear carpeta en",
+		"Sorry, cannot copy"		=> "Lo siento, no puedo copiar",
+		"into"				=> "into",
+		"Uploaded file(s) OK"		=> "Carga de archivo(s) OK",
+		"Sorry, cannot upload"		=> "Lo siento, no se puede cargar",
+		"Sorry, cannot upload..."	=> "Lo siento, no se puede cargar en modo demostraci&oacute;n",
+		"Sorry, cannot rename"		=> "Lo siento, no puedo renombrar",
+		"Maybe public write..."		=> "Posiblemente sea necesario permisos publicos en esta carpeta o su carpeta padre?",
+		"Sorry, cannot move"		=> "Lo siento, no puedo mover",
+		"Sorry, cannot save"		=> "Lo siento, no puedo guardar",
+		"Sorry, cannot replace..."	=> "Lo siento, no puedo reemplazar texto en",
+		"Sorry, cannot change..."	=> "Lo siento, no puedo cambiar permisos sobre",
+		"Sorry, cannot delete more..."	=> "Lo siento, no puedo eliminar mas de un item a la vez bajo modo FTP",
+		"Sorry, cannot delete..."	=> "Lo siento, no puedo eliminar el nivel raiz",
+		"Sorry, cannot delete"		=> "Lo siento, no puedo eliminar",
+		"Sorry, this file..."		=> "Lo siento, este archivo ha cambiado, no puedo almacenar",
+		"Reload this file..."		=> "Recargar este archivo y copiar su version en un panel diferente?",
+		"There was a..."		=> "Hay un problema t&eacute;cnico, como algo que todav&iacute;a parece no estar listo. ICEcoder volvi&oacute; a cargar su archivo de control nuevamente.",
+		"displayed at"			=> "Mostrado en",
+		"Enter filename to..."		=> "Ingrese el nombre de archivo para guardar",
+		"That file exists..."		=> "Ese archivo ya existeThat, sobreescribir?",
+		"Saving"			=> "Guardando"
+	),
+
+	"get-branch" =>
+	array(
+		"There are no..."		=> "No hay diferencias entre el repositorio local y GitHub. Regresar al modo regular?",
+		"Sorry, there was..."		=> "Lo siento, hay un error, c&oacute;digo:",
+		"Your local folder..."		=> "Su carpeta local est&aacute; vac&iacute;a, desea clonarla"
+	),
+
+	"github-manager" =>
+	array(
+		"Sorry, cannot create..."	=> "Lo siento, no puedo crear un archivo en",
+		"Cannot update config..."	=> "No puedo actualizar el archivo de configuraci&oacute;n. Por favor establezca permisos publicos para",
+		"and try again"			=> "e intente nuevamente",
+		"saving github paths"		=> "almacenando rutas de GitHub...",
+		"github paths"			=> "Rutas de GitHub",
+		"Choose existing path"		=> "Seleccionar una ruta existente",
+		"Local path"			=> "Ruta local",
+		"Slash prefixed"		=> "Prefijo de slash",
+		"Remote GitHub path"		=> "Ruta remota GitHub",
+		"Absolute URL beginning..."	=> "URL absoluta, iniciando https://github.com",
+		"Choose"			=> "Seleccionar",
+		"Set local and..."		=> "Establecer las rutas locales y remotas en blanco para removerlas",
+		"Update"			=> "Actualizar",
+		"Add new path"			=> "Agregar nueva ruta",
+		"Add"				=> "Agregar",
+		"Usage Info"			=> "Modo de uso:",
+		"Enter relative local..."	=> "Ingrese las rutas locales relativas (ej /server/myfiles) y las rutas absolutas para GitHub (ej https://github.com/user/repo &oacute; https://github.com/user/repo/tree/branch para indicar ramas), seg&uacute;n los ejemplos. Con esto usted establece las rutas de fuentes para ambas ubicaciones, como un par.",
+		"You can then..."		=> "Entonces usted podr&aacute; seleccionar un par y este se convertira en su nueva raiz de trabajo en ICEcoder.",
+		"The file manager..."		=> "Entonces el administrador de archivos muestra un nuevo icono para GitHub, el cual usted puede usar para ver y verificar diferencias entre las dos rutas. Esas diferencias pueden ser convertidas a un commit y enviadas a la ruta remota en GitHub o clonadas en su ruta local, para sincronizar sus archivos.",
+		"If you want..."		=> "Si lo desea puede crear una nueva ruta ra&iacute;z por medio de la pantalla de Configuraci&oacute;n."
+	),
+
+	"github" =>
+	array(
+		"Sorry, you do..."		=> "Lo siento, usted no parece contar con OpenSSL cargado en su instancia de PHP, por lo tanto conexiones https no est&aacute;n disponibles. Esto es requerido para la transferencia de datos a GitHub, por favor ajuste su php.ini, reinicie su servidor web e intente nuevamente"
+	),
+
+	"headers" =>
+	array(
+		"Bad CSRF token..."		=> "Token CSRF incorrecto. Por favor reporte este error en https://github.com/mattpass/ICEcoder para que pueda ser solucionado."
+	),
+
+	"help" =>
+	array(
+		"shortcuts"			=> "accesos directos",
+		"Within document"		=> "En los documentos",
+		"On Tabs"			=> "En las fichas",
+		"Within file manager"		=> "En el administrador de archivos",
+		"Anywhere"			=> "Cualquier parte",
+		"Space"				=> "Espacio",
+		"Click"				=> "Click",
+		"or"				=> "o",
+		"Left click"			=> "Click izquierdo",
+		"Middle click"			=> "Click central",
+		"Double click tap..."		=> "Doble click / tap (m&oacute;viles)",
+		"Right click"			=> "Click derecho",
+		"Middle scrollwheel"		=> "Rueda del rat&oacute;n",
+		"Drag"				=> "Arrastrar",
+		"Autocomplete add snippet"	=> "Autocompletar / agregar fragmento",
+		"Multiple select"		=> "Selecci&oacute;n m&uacute;ltiple",
+		"Move line up"			=> "Mover l&iacute;nea arriba",
+		"Move line down"		=> "Mover l&iacute;nea abajo",
+		"Duplicate lines"		=> "Duplicar linea(s)",
+		"Remove lines"			=> "Remover linea(s)",
+		"Insert line before"		=> "Insertar linea antes",
+		"Insert line after"		=> "Insertar linea despu&eacute;s",
+		"Search for selected"		=> "Buscar lo seleccionado",
+		"Jump to definition"		=> "Saltar a definici&oacute;n / saltar atr&aacute;s",
+		"Comment uncomment"		=> "Comentar / descomentar",
+		"Insert tab indent"		=> "Insertar ficha / auto sangr&iacute;a seleccionado",
+		"Insert more"			=> "Aumentar sangr&iacute;a",
+		"Insert less"			=> "Disminuir sangr&iacute;a",
+		"Wrap with div"			=> "Envolver con &lt;div&gt;",
+		"Wrap with span"		=> "Envolver con &lt;span&gt;",
+		"Wrap unwrap p"			=> "Envolver / Desenvolver con &lt;p&gt;",
+		"Wrap unwrap a"			=> "Envolver / Desenvolver con &lt;a&gt;",
+		"Wrap unwrap b"			=> "Envolver / Desenvolver con &lt;b&gt;",
+		"Wrap unwrap i"			=> "Envolver / Desenvolver con &lt;i&gt;",
+		"Wrap unwrap strong"		=> "Envolver / Desenvolver con &lt;strong&gt;",
+		"Wrap unwrap em"		=> "Envolver / Desenvolver con &lt;em&gt;",
+		"Wrap unwrap li"		=> "Envolver / Desenvolver con &lt;li&gt;",
+		"Wrap unwrap h1..."		=> "Envolver / Desenvolver con &lt;h1&gt; - &lt;h3&gt;",
+		"End line with..."		=> "Terminar l&iacute;nea con &lt;br&gt;",
+		"Close tab"			=> "Cerrar ficha",
+		"Select file folder"		=> "Seleccionar archivo / carpeta",
+		"Open file"			=> "Abrir archivo",
+		"Range select"			=> "Seleccionar rango",
+		"Options for selected"		=> "Opciones para lo seleccionado",
+		"Delete selected"		=> "Eliminar seleccionados",
+		"Next previous tab"		=> "Ficha siguiente / previa",
+		"Next tab"			=> "Ficha siguiente",
+		"Previous tab"			=> "Ficha previa",
+		"New tab"			=> "Nueva ficha",
+		"Close current tab"		=> "Cerrar ficha actual",
+		"Open file prompt"		=> "L&iacute;nea de apertura de archivos",
+		"Find"				=> "Buscar",
+		"Previous"			=> "Previo",
+		"Focus on Go..."		=> "Obtener foco en la opci&oacute;n Ir a Linea",
+		"Save"				=> "Guardar",
+		"Save as"			=> "Guardar como...",
+		"View webpage"			=> "Ver pagina web",
+		"Contract expand file..."	=> "Contraer / expandir administrador de archivos",
+		"Fold unfold current..."	=> "Contraer / expandir l&iacute;nea actual",
+		"Refocus on document"		=> "Reasignar foco al documento",
+		"Cancel tasks"			=> "Cancelar tareas"
+	),
+
+	"ice-coder" =>
+	array(
+		"results"			=> "resultados",
+		"No text selected..."		=> "No hay texto seleccionado para buscar",
+		"all files"			=> "todos los archivos",
+		"all filenames"			=> "todos los nombres de archivo",
+		"selected files"		=> "archivos seleccionados",
+		"selected filenames"		=> "nombres de archivos seleccionados",
+		"Creating Folder"		=> "Creando Carpeta",
+		"Sorry you can..."		=> "Lo siento, usted s&oacute;lo puede tener 100 archivos abiertos al tiempo!",
+		"Opening File"			=> "Abriendo archivo",
+		"Enter relative file..."	=> "Entre una ruta relativa (iniciando con /) o una URL remota",
+		"Getting"			=> "Obteniendo",
+		"Saving"			=> "Guardando:",
+		"Please enter the..."		=> "Por favor ingrese el nuevo nombre para",
+		"Renaming to"			=> "Renombrando a",
+		"Moving to"			=> "Moviendo a",
+		"Deleting File"			=> "Eliminando Archivo",
+		"Pasting File"			=> "Copiando Archivo",
+		"Sorry cannot paste..."		=> "Lo siento, no puedo pegar toda una ra&iacute;z",
+		"Nothing to paste..."		=> "Nada para pegar, copie un archivo/carpeta primero!",
+		"and"				=> "y",
+		"this document"			=> "este documento",
+		"replace"			=> "reemplazar",
+		"replace all"			=> "reemplazar todo",
+		"file"				=> "archivo",
+		"Replacing text in"		=> "Reemplazando texto en",
+		"Sorry there was..."		=> "Lo siento, hubo un error con su solicitud.\\n\\nPor favor verifique su consola de desarrollo para mas informacion.",
+		"Cancelled tasks"		=> "Tareas canceladas",
+		"Open previous files"		=> "Abrir archivos previos?",
+		"Please enter your..."		=> "Por favor entre su token de GitHub (para acceso personal). Ver ayuda cerca al Token de autenticaci&oacute;n de Github en la ayuda > Vea pantalla de configuraci&oacute;n para m&aacute;s informaci&oacute;n",
+		"This will compare..."		=> "Esto compara y muestra las diferencias entre su ruta local y el repositorio. OK?",
+		"Please note for..."		=> "Importante: para que la actualizaci&oacute;n trabaje correctamente, usted necesita tener derechos de acceso a todos los directorios y archivos de ICEcoder. Esto sera chequeado previamente y se presentara una lista de archivos sin acceso (por lo tanto no movibles).\\n\\nSi usted necesita restablecer esta version de  ICEcoder por alguna raz&oacute;n, usted la encontrara en la carpeta /tmp.\\n\\nClick en OK para proceder con la verificaci&oacute;n y auto-instalaci&oacute;n, &oacute; cancelar para visitar el sitio de ICEcoder para descargar el ZIP y hacerlo manualmente.",
+		"You can start..."		=> "Usted puede iniciar el reporte de errores en la pantalla de Ayuda > Configuraci&oacute;n",
+		"Error cannot find..."		=> "Error: no puedo encontrar o accesar las rutas de archivos de error",
+		"No new errors..."		=> "No fueron encontrados nuevos errores",
+		"You have made..."		=> "Usted ha realizado cambios. Esta seguro que quiere cerrar sin guardar?",
+		"Close all tabs"		=> "Cerrar todas las fichas?"
+	),
+
+	"login" =>
+	array(
+		"set password"			=> "establecer clave",
+		"login"				=> "ingreso",
+		"To disable registration..."	=> "Para deshabilitar el modo de registro, vaya a la opci&oacute;n de Configuraci&oacute;n or abra el archivo lib/config___settings.php y cambie enableRegistration a false y recargue la p&aacute;gina",
+		"Registration mode enabled"	=> "Modo de registro activado",
+		"auto-check for updates"	=> "auto-buscar por actualizaciones",
+		"To put into..."		=> "Para usar el modo multiusuario, vaya a la opcion de Configuraci&oacute;n o abra el archivo lib/config___settings.php y cambie multiUser a true y recargue la p&aacute;gina",
+		"multi-user"			=> "multi-usuario"
+	),
+
+	"multiple-results" =>
+	array(
+		"rename all"			=> "renombrar todo",
+		"replace all"			=> "reemplazar todo",
+		"document"			=> "documento",
+		"Found"				=> "Encontrado",
+		"times"				=> "veces",
+		"replace"			=> "reemplazar",
+		"file folder"			=> "archivo/carpeta",
+		"rename to"			=> "renombrar a",
+		"rename"			=> "renombrar",
+		"file"				=> "archivo",
+		"No matches found"		=> "No se encontraron coincidencias",
+		"selected"			=> "seleccionado",
+		"found in"			=> "encontrado en",
+		"Replaced"			=> "Reemplezado"
+	),
+
+	"plugins-manager" =>
+	array(
+		"ICEcoder needs to..."		=> "ICEcoder necesita recargar para activar este plugin. Recargar ahora?",
+		"saving plugins"		=> "guardando plugins...",
+		"Cannot update config..."	=> "No puedo actualizar el archivo de configuraci&oacute;n. Por favor establezca permisos publicos sobre",
+		"and try again"			=> "e intente de nuevo",
+		"couldnt delete dir"		=> "no puedo borrar el directorio",
+		"couldnt delete file"		=> "no puedo borrar el archivo",
+		"plugins"			=> "plugins",
+		"Guide to writing..."		=> "Guia para escribir plugins",
+		"Manage Installed"		=> "Administrador instalado",
+		"URL"				=> "URL",
+		"Target"			=> "Objetivo",
+		"Timer"				=> "Temporizador",
+		"Update"			=> "Actualizar",
+		"Install"			=> "Instalar",
+		"Uninstall"			=> "Desinstalar",
+		"Reload after install..."	=> "Se requiere recargar despu&eacute;s de instalar"
+	),
+
+	"properties" =>
+	array(
+		"properties"			=> "propiedades",
+		"Size"				=> "Tama&ntilde;o",
+		"Modified"			=> "Modificado",
+		"Last access"			=> "Ultimo acceso",
+		"Type"				=> "Tipo",
+		"Readable Writeable"		=> "Leible / Escribible",
+		"Relative path"			=> "Ruta relativa",
+		"Absolute path"			=> "Ruta absoluta",
+		"Contains"			=> "Contiene",
+		"Permissions"			=> "Permisos",
+		"Owner"				=> "Propietario",
+		"Group"				=> "Grupo",
+		"Public"			=> "Publico",
+		"Read"				=> "Leer",
+		"Write"				=> "Escribir",
+		"Execute"			=> "Ejecutar",
+		"Change to"			=> "Cambiar a",
+		"update"			=> "actualizar"
+	),
+
+	"settings-common" =>
+	array(
+		"Your document does..."		=> "Su documento no parece estar en UTF-8 entonces se ha convertido"
+	),
+
+	"settings-save-current-files" =>
+	array(
+		"Cannot update config..."	=> "No puedo actualizar el archivo de configuracion. Por favor establezca permisos publicos sobre",
+		"and try again"			=> "e intente de nuevo"
+	),
+
+	"settings-screen" =>
+	array(
+		"settings"			=> "configuraciones",
+		"version"			=> "version",
+		"website"			=> "sitio web",
+		"git"				=> "git",
+		"codemirror dir"		=> "directorio codemirror",
+		"codemirror version"		=> "version codemirror",
+		"file manager root"		=> "administrador de archivos raiz",
+		"Get in contact..."		=> "Pongase en contacto...",
+		"backups"			=> "respaldos",
+		"keep version control..."	=> "mantener control de versiones de respaldo para",
+		"day"	=> "dia",
+		"days"	=> "dias",
+		"of backups stored..."	=> "de respaldos almacenados actualmente",
+		"You may use..."		=> "Libre para usarlo para cualquier prop&oacute;sito, comercial o no, solo dejeme saber cualquier uso o mejora. :)<br><br>No se da garantia de ningun tipo, su uso se encuentra bajo su responsabilidad.",
+		"functionality"			=> "funcionalidad",
+		"check for updates..."		=> "verificar por actualizaciones en la carga",
+		"auto open last..."		=> "auto cargar los ultimos archivos al ingresar",
+		"when finding in..."		=> "excluir cuando se busca en archivos ",
+		"assisting"			=> "asistir",
+		"code assist"			=> "asistencia de c&oacute;digo",
+		"visible tabs"			=> "Fichas visibles",
+		"locked nav"			=> "Navegacion bloqueada",
+		"tag wrapper command"		=> "Comando envuelto",
+		"auto-complete on"		=> "auto-completar encendido",
+		"security"			=> "seguridad",
+		"new password"			=> "nueva clave",
+		"8 chars min"			=> "8 caracteres min",
+		"confirm password"		=> "confirmar clave",
+		"banned files/folders"		=> "archivos/carpetas prohibidos",
+		"banned paths"			=> "rutas prohibidas",
+		"ip addresses"			=> "direcciones ip",
+		"Slash prefixed comma..."	=> "Prefijo slash, delimitado por comas",
+		"Comma delimited"		=> "Delimitado por comas",
+		"style"				=> "estilo",
+		"theme"				=> "tema",
+		"line wrapping"			=> "ajuste de l&iacute;nea",
+		"indent type"			=> "tipode sangr&iacute;a",
+		"indent size"			=> "Tama&ntilde;o de sangr&iacute;a",
+		"font size"			=> "tama&ntilde;o de letra",
+		"layout"			=> "disposici&oacute;n",
+		"plugin panel aligned"		=> "alineacion del panel de plugins",
+		"file manager"			=> "administrador de archivos",
+		"root"				=> "raiz",
+		"Slash prefixed"		=> "Prefijo Slash",
+		"bug reporting"			=> "reporte de errores",
+		"check in files"		=> "chequear en archivos",
+		"every"				=> "cada",
+		"secs getting last"		=> "seg, obteniendo &uacute;ltimas",
+		"lines"				=> "lineas",
+		"multi-user"			=> "multi-usuario",
+		"Make sure you..."		=> "Este seguro de no bloquearse a s&iacute; mismo",
+		"Registration"			=> "Registro",
+		"auth token"			=> "token autenticaci&oacute;n",
+		"Required to get..."		=> "Requerido para obtener diferencias, enviar cambios a repos GitHub, etc. Si usted no tiene uno, usted puede usar un:".PHP_EOL.PHP_EOL.
+							"- token personal de acceso (https://help.github.com/articles/creating-an-access-token-for-command-line-use), &oacute;".PHP_EOL.
+							"- full client/secret pair token (http://developer.github.com/v3/oauth).".PHP_EOL.PHP_EOL.
+							"Esto no es recomendado para establecer su token pues es mas seguro ingresarlo cuando sea solicitado por ICEcoder y as&iacute; permenecer&aacute; en la sesi&oacute;n activa unicamente.".PHP_EOL.PHP_EOL.
+							"De todas formas, si usted trabaj en un ambiente seguro, es m&aacute;s eficiente establecer esto aqu&iacute;.",
+		"Sorry cannot commit..."	=> "Lo siento, no puedo enviar configuraciones en modo demo",
+		"update"			=> "actualizar"
+	),
+
+	"settings-update" =>
+	array(
+		"Cannot update config..."	=> "No puedo actualizar archivo de configuraci&oacute;n. Establezca permisos publicos sobre",
+		"and try again"			=> "e intente de nuevo",
+		"and press refresh"		=> "y presione actualizar"
+	),
+
+	"updater" =>
+	array(
+		"Update appears to..."		=> "La actualizaci&oacute;n parece haber sido satisfactoria"
+	),
+
+	"find-in-files" =>
+	array(
+		"Enter path to search in" => "Ingrese la ruta para buscar",
+		"Enter semicolon-separated masks of files to look at (e.g. *.php;*.html;*.js)" => "Ingrese la mascaras de archivo separadas por punto y coma para buscar (ej. *.php;*.html;*.js)",
+		"Type of text" => "Tipo de texto",
+		"Fixed text" => "Texto fijo",
+		"Regular expression" => "Expresion regular",
+		"Case sensitive" => "Sensible a mayuscula",
+		"Yes" => "Si",
+		"No" => "No",
+		"Search" => "Buscar",
+	)
+
+);
+?>

lib/auto-logout-warning.css

@@ -0,0 +1,28 @@
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+body {overflow: hidden;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	text-align: center;
+}
+
+h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
+.auto-logout-warning {font-family: arial, verdana, helvetica, sans-serif; background-color: #1c1c19; color: #fff; padding: 20px}

lib/auto-logout-warning.php

@@ -0,0 +1,24 @@
+<?php
+include("headers.php");
+include("settings.php");
+$t = $text['auto-logout-warning'];
+?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> auto-logout</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="auto-logout-warning.css?microtime=<?php echo microtime(true);?>">
+</head>
+
+<body class="auto-logout-warning">
+
+<h1 id="title"><?php echo $t['Auto Logout Warning'];?></h1>
+
+<?php echo $t['You will be...'];?> <span id="timeRemaning">60</span> <?php echo $t['seconds due to...'];?>
+
+</body>
+
+</html>

lib/backup-versions-preview-loader.php

@@ -0,0 +1,36 @@
+<?php
+// Load common functions
+include("headers.php");
+include("settings.php");
+
+$file = str_replace("|","/",xssClean($_GET['file'],'html'));
+
+// Get contents
+$loadedFile = toUTF8noBOM(getData("../backups/".$file),true);
+$encoding=ini_get("default_charset");
+if($encoding=="")
+	$encoding="UTF-8";
+
+// Set content in a textarea
+echo '<textarea name="loadedFile" id="loadedFile">'.htmlentities($loadedFile,ENT_COMPAT,$encoding).'</textarea>';
+
+// Get bytes for this file
+$bytes = filesize("../backups/".$file);
+// Change into kilobytes
+$outputSize = ($bytes/1024);
+$outputUnit = "kb";
+// Maybe we should show in megabytes?
+if ($outputSize >= 1024) {
+	$outputSize = ($outputSize/1024);
+	$outputUnit = "mb";
+}
+$size = number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($bytes)." bytes)";
+
+// Get date & time of file
+$datetime = str_replace("-","<br>",date( "D jS M Y-g:i:sa", filemtime("../backups/".$file)));
+?>
+<script>
+parent.document.getElementById('buttonsContainer').style.display = 'inline-block';
+parent.editor.setValue(document.getElementById('loadedFile').value);
+parent.document.getElementById('infoContainer').innerHTML = 'Date & Time:<br><?php echo $datetime;?><br><br>Size:<br><?php echo $size;?>';
+</script>

lib/backup-versions.css

@@ -0,0 +1,30 @@
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+body {overflow: hidden;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
+a {color: #fff; text-decoration: none}
+
+.backup-versions {font-family: arial, verdana, helvetica, sans-serif; background-color: #1c1c19; color: #fff; padding: 20px}
+.button {padding: 5px 10px; font-size: 14px; background-color: rgba(0,198,255,0.7); margin-bottom: 20px; text-align: center; cursor: pointer}

lib/backup-versions.php

@@ -0,0 +1,170 @@
+<?php
+// Load common functions
+include("headers.php");
+include("settings.php");
+$text = $_SESSION['text'];
+$t = $text['backup-versions'];
+
+$file = str_replace("|","/",xssClean($_GET['file'],'html'));
+$fileCountInfo = getVersionsCount(dirname($file),basename($file));
+$versions = $fileCountInfo['count'];
+?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> backup version control</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="backup-versions.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css?microtime=<?php echo microtime(true);?>">
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js?microtime=<?php echo microtime(true);?>"></script>
+
+<style type="text/css">
+.CodeMirror {position: absolute; width: 409px; height: 180px; font-size: <?php echo $ICEcoder["fontSize"];?>}
+.CodeMirror-scroll {overflow: hidden}
+/* Make sure this next one remains the 3rd item, updated with JS */
+.cm-tab {border-left-width: <?php echo $ICEcoder["visibleTabs"] ? "1px" : "0";?>; margin-left: <?php echo $ICEcoder["visibleTabs"] ? "-1px" : "0";?>; border-left-style: solid; border-left-color: rgba(255,255,255,0.15)}
+.cm-trailingspace {
+        background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==);
+        background-position: bottom left;
+        background-repeat: repeat-x;
+      }
+.CodeMirror-foldmarker {font-family: arial; line-height: .3; color: #b00; cursor: pointer;
+	text-shadow: #fff 1px 1px 2px, #fff -1px -1px 2px, #fff 1px -1px 2px, #fff -1px 1px 2px;
+}
+.CodeMirror-foldgutter {display: inline-block; width: 13px}
+.CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded {position: absolute; display: inline-block; width: 13px; height: 13px; font-size: 14px; text-align: center; cursor: pointer}
+.CodeMirror-foldgutter-open {background: rgba(255,255,255,0.04); color: #666}
+.CodeMirror-foldgutter-open:after {position: relative; top: -2px}
+.CodeMirror-foldgutter-folded {background: #800; color: #ddd}
+.CodeMirror-foldgutter-folded:after {position: relative; top: -3px}
+</style>
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldcode.js?microtime=<?php echo microtime(true);?>"></script>
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.js?microtime=<?php echo microtime(true);?>"></script>
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.css?microtime=<?php echo microtime(true);?>">
+<link rel="stylesheet" href="editor.css?microtime=<?php echo microtime(true);?>">
+<?php
+$themeArray = array();
+$handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
+
+while (false !== ($cssFile = readdir($handle))) {
+	if ($cssFile !== "." && $cssFile != "..") {
+		array_push($themeArray,basename($cssFile,".css"));
+	}
+}
+sort($themeArray);
+for ($i=0;$i<count($themeArray);$i++) {
+	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
+}
+?>
+</head>
+
+<body class="backup-versions">
+
+<h1 id="title"><?php echo $versions." ".($versions != 1 ? $t["backups"] : $t["backup"])." ".$t['available for'].":";?></h1>
+<h2><?php echo $file;?></h2>
+
+<br>
+<div style="display: inline-block; height: 500px; width: 210px; overflow-y: scroll">
+<?php
+$dateCounts = $fileCountInfo['dateCounts'];
+$displayVersions = $versions;
+
+// Establish the base, host and date dir parts...
+$backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost";
+
+foreach ($dateCounts as $key => $value) {
+	echo "<b>".date("jS M Y",strtotime($key))." (".$value." ".($value != 1 ? $t["backups"] : $t["backup"]).")</b>";
+	echo '<br>';
+	for ($j=0; $j<$value; $j++) {
+		echo '<a href="backup-versions-preview-loader.php?file='.str_replace("/","|",$backupDirHost.'/'.$key.$file).' ('.($value-$j).')&csrf='.$_SESSION['csrf'].'" onclick="highlightVersion('.$displayVersions.')" id="backup-'.$displayVersions.'" target="previewLoader">Backup '.$displayVersions.'</a><br>';
+		$displayVersions--;
+	}
+	echo '<br>';
+}
+?>
+</div>
+<div style="display: inline-block; width: 480px; height: 550px; margin-left: 20px">
+	<textarea id="code" name="code">Click a backup to the left to preview it</textarea>
+</div>
+<div style="display: none; width: 180px; margin-left: 30px" id="buttonsContainer">
+	<div class="button" onclick="openNew()">Open in new tab</div>
+	<div class="button" onclick="openDiff()">Open in diff mode</div>
+	<div class="button" onclick="restoreVersion()">Restore as new version</div>
+	<div id="infoContainer"></div>
+</div>
+<div style="display: none">
+	<iframe name="previewLoader"></iframe>
+</div>
+
+<script>
+versions = <?php echo $versions;?>;
+var highlightVersion = function(elem) {
+	for (var i=versions; i>=1; i--) {
+		document.getElementById('backup-'+i).style.color = i==elem
+			? 'rgba(0,198,255,0.7)'
+			: null;
+	}
+}
+
+<?php
+echo "fileName = '".basename($file)."';";
+include(dirname(__FILE__)."/language-modes-partial.js");
+?>
+
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+	mode: mode,
+	lineNumbers: top.ICEcoder.lineNumbers,
+	gutters: ["CodeMirror-foldgutter","CodeMirror-lint-markers","CodeMirror-linenumbers"],
+	foldGutter: {gutter: "CodeMirror-foldgutter"},
+	foldOptions: {minFoldSize: 1},
+	lineWrapping: top.ICEcoder.lineWrapping,
+	indentWithTabs: top.ICEcoder.indentWithTabs,
+	indentUnit: top.ICEcoder.indentSize,
+	tabSize: top.ICEcoder.indentSize,
+	matchBrackets: top.ICEcoder.matchBrackets,
+	electricChars: false,
+	highlightSelectionMatches: true,
+	showTrailingSpace: top.ICEcoder.showTrailingSpace,
+	lint: false,
+	readOnly: "nocursor",
+	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
+	});
+editor.setSize("480px","500px");
+
+var openNew = function() {
+	var cM;
+
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))
+	top.ICEcoder.newTab();
+	cM = top.ICEcoder.getcMInstance();
+	cM.setValue(editor.getValue());
+}
+
+var openDiff = function() {
+	var cMDiff;
+
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))
+	top.ICEcoder.setSplitPane('on');
+	cMDiff = top.ICEcoder.getcMdiffInstance();
+	top.ICEcoder.focus('diff');
+	cMDiff.setValue(editor.getValue());
+}
+
+var restoreVersion = function() {
+	var cM;
+
+	if (top.ICEcoder.ask("To confirm - this will paste the displayed backup content to your current tab and save, OK?")) {
+		top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))
+		cM = top.ICEcoder.getcMInstance();
+		top.ICEcoder.focus();
+		cM.setValue(editor.getValue());
+		top.ICEcoder.saveFile();
+	}
+}
+</script>
+
+</body>
+
+</html>

lib/bug-files-check.php

@@ -5,9 +5,9 @@ include_once("settings-common.php");
 $text = $_SESSION['text'];
 $t = $text['bug-files-check'];
 
-$files		= explode(",",str_replace("|","/",$_GET['files']));
-$filesSizesSeen	= explode(",",$_GET['filesSizesSeen']);
-$maxLines	= $_GET['maxLines'];
+$files		= explode(",",str_replace("|","/",xssClean($_GET['files'],"html")));
+$filesSizesSeen	= explode(",",xssClean($_GET['filesSizesSeen'],"html"));
+$maxLines	= xssClean($_GET['maxLines'],"html");
 
 $result = "ok";
 
@@ -15,7 +15,7 @@ for ($i=0; $i<count($files); $i++) {
 	// Work out the real path for a file
 	$files[$i] = realpath($_SERVER['DOCUMENT_ROOT'].$files[$i]);
 	// If we can't find that file or it doesn't start with the doc root, it's an error
-	if (!file_exists($files[$i]) || strpos($files[$i],$_SERVER['DOCUMENT_ROOT']) !== 0) {
+	if (!file_exists($files[$i]) || strpos(str_replace("\\","/",$files[$i]),$_SERVER['DOCUMENT_ROOT']) !== 0) {
 		$result = "error";
 	} else {
 		$filesSizesSeen[$i] = filesize($files[$i]);
@@ -28,7 +28,7 @@ if ($result != "error") {
 
 	for ($i=0; $i<count($files); $i++) {
 		// If we have set a filesize value previously and it's different to now, there's new bugs
-		$fileSizesSeenArray = explode(",",$_GET['filesSizesSeen']);
+		$fileSizesSeenArray = explode(",",xssClean($_GET['filesSizesSeen'],"html"));
 		if ($fileSizesSeenArray[$i]!="null" && $fileSizesSeenArray[$i] != $filesSizesSeen[$i]) {
 			$result = "bugs";
 			$filesWithNewBugs++;

lib/config___users-template.php

@@ -1,6 +1,6 @@
 <?php
 $ICEcoderUserSettings = array(
-"versionNo"		=> "5.0 beta",
+"versionNo"		=> "5.7",
 "licenseEmail"		=> "",
 "licenseCode"		=> "",
 "configCreateDate"	=> 0,
@@ -9,20 +9,29 @@ $ICEcoderUserSettings = array(
 "openLastFiles"		=> true,
 "updateDiffOnSave"	=> true,
 "languageUser"		=> "english.php",
+"backupsKept"		=> true,
+"backupsDays"		=> 14,
 "findFilesExclude"	=> array(".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
 "codeAssist"		=> true,
 "visibleTabs"		=> false,
 "lockedNav"		=> true,
 "tagWrapperCommand"	=> "ctrl+alt",
-"autoComplete"		=> "ctrl+space",
+"autoComplete"		=> "keypress",
 "password"		=> "",
 "bannedFiles"		=> array(),
 "bannedPaths"		=> array("/var/www/.git","/var/www/sites/all/modules","/var/www/sites/default/files"),
 "allowedIPs"		=> array("*"),
+"autoLogoutMins"	=> 0,
 "theme"			=> "default",
 "fontSize"		=> "13px",
 "lineWrapping"		=> true,
+"lineNumbers"		=> true,
+"showTrailingSpace"	=> true,
+"matchBrackets"		=> true,
+"autoCloseTags"		=> true,
+"autoCloseBrackets"	=> true,
 "indentWithTabs"	=> true,
+"indentAuto"		=> true,
 "indentSize"		=> 4,
 "pluginPanelAligned"	=> "left",
 "bugFilePaths"		=> array(),
@@ -30,6 +39,7 @@ $ICEcoderUserSettings = array(
 "bugFileMaxLines"	=> 0,
 "githubAuthToken"	=> "",
 "plugins"		=> array(),
+"ftpSites"		=> array(),
 "githubLocalPaths"	=> array(),
 "githubRemotePaths"	=> array(),
 "previousFiles"		=> "",

lib/download.php

@@ -5,13 +5,19 @@ include("settings.php");
 // Establish the real absolute path to the file
 $file = realpath($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['file'])));
 // If it doesn't exist, or doesn't start with the $docRoot, stop here
-if (!file_exists($file) || strpos($file,$docRoot) !== 0) {
-	die("<script>alert('Sorry, that file doesn\'t appear to exist');</script>");
+if (!file_exists($file) || strpos(str_replace("\\","/",$file),$docRoot) !== 0) {
+	die("<script>top.ICEcoder.message('Sorry, that file doesn\'t appear to exist');</script>");
 }
 
 if (file_exists($file)) {
+    header("Pragma: public");
+    header("Expires: 0");
+    header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+    header("Cache-Control: public");
     header('Content-Description: File Transfer');
+    header("Content-Type: application/octet-stream");
     header('Content-Disposition: attachment; filename='.basename($file));
+    // header("Content-Transfer-Encoding: binary");
     header('Content-Length: '.filesize($file));
     ob_clean();
     flush();

lib/editor.css

@@ -1,6 +1,6 @@
 /* ICEcoder default theme by Matt Pass */
 
-.cm-s-icecoder {color: #666; background: #141612}
+.cm-s-icecoder {color: #666; background: #1d1d1b}
 
 .cm-s-icecoder span.cm-keyword {color: #eee; font-weight:bold} 	/* off-white 1 */
 .cm-s-icecoder span.cm-atom {color: #e1c76e}			/* yellow */	
@@ -8,18 +8,17 @@
 .cm-s-icecoder span.cm-def {color: #b9ca4a} 			/* green */
 
 .cm-s-icecoder span.cm-variable {color: #6cb5d9}		/* blue */
-.cm-s-icecoder span.cm-variable-2 {color: #bf255c}		/* pink */
+.cm-s-icecoder span.cm-variable-2 {color: #cc1e5c}		/* pink */
 .cm-s-icecoder span.cm-variable-3 {color: #f9602c}		/* orange */
 
 .cm-s-icecoder span.cm-property {color: #eee}			/* off-white 1 */
 .cm-s-icecoder span.cm-operator {color: #9179bb}		/* purple */
-.cm-s-icecoder span.cm-comment {color: #44535a}			/* grey-blue */
+.cm-s-icecoder span.cm-comment {color: #97a3aa}			/* grey-blue */
 
 .cm-s-icecoder span.cm-string {color: #b9ca4a} 			/* green */
 .cm-s-icecoder span.cm-string-2 {color: #6cb5d9}		/* blue */
 
 .cm-s-icecoder span.cm-meta {color: #555}			/* grey */
-.cm-s-icecoder span.cm-error {color: #d00}			/* red */
 
 .cm-s-icecoder span.cm-qualifier {color: #555}			/* grey */
 .cm-s-icecoder span.cm-builtin {color: #214e7b}			/* bright blue */
@@ -32,9 +31,10 @@
 .cm-s-icecoder span.cm-quote {color: #186718}			/* dark green */
 .cm-s-icecoder span.cm-hr {color: #888}				/* mid-grey */
 .cm-s-icecoder span.cm-link {color: #e1c76e}			/* yellow */
+.cm-s-icecoder span.cm-error {color: #d00}			/* red */
 
 .cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
 .cm-s-icecoder .CodeMirror-selected {color: #fff !important; background: #037 !important}
-.cm-s-icecoder .CodeMirror-gutters {background: #141612; min-width: 41px; border-right: 0}
+.cm-s-icecoder .CodeMirror-gutters {background: #1d1d1b; min-width: 41px; border-right: 0}
 .cm-s-icecoder .CodeMirror-linenumber {color: #555; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
+.cm-s-icecoder .CodeMirror-matchingbracket {color: #fff !important; background: #555 !important}

lib/file-control-xhr.php

@@ -1,6 +1,7 @@
 <?php
 include("headers.php");
 include("settings.php");
+include("ftp-control.php");
 $t = $text['file-control'];
 
 // ===============================
@@ -19,60 +20,149 @@ $errorMsg = "None";
 $saveType = isset($_GET['saveType']) ? strClean($_GET['saveType']) : "";
 
 // Establish the filename/new filename
-$file = str_replace("|","/",strClean(
-	isset($_POST['newFileName']) && $_POST['newFileName']!=""
-	? $_POST['newFileName']
-	: $_REQUEST['file']
-	));
-
-// Establish the actual name as we may have HTML entities in filename
-$file = html_entity_decode($file);
-
-// Put the original $file var aside for use
-$fileOrig = $file;
-
-// Trim any +'s or spaces from the end of file
-$file = rtrim(rtrim($file,'+'),' ');
-
-// Also remove [NEW] from $file, we can consider $_GET['action'] or $fileOrig to pick that up
-$file = rtrim($file,'[NEW]');
-
-// Make each path in $file a full path (; seperated list)
-$allFiles = explode(";",$file);
-for ($i=0; $i<count($allFiles); $i++) {
-	if (strpos($allFiles[$i],$docRoot)===false && $_GET['action']!="getRemoteFile") {
-		$allFiles[$i]=str_replace("|","/",$docRoot.$iceRoot.$allFiles[$i]);
-	}
+if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
+	$file = strClean($_POST['newFileName']);	// New file
+} elseif (isset($_REQUEST['file'])) {
+	$file = strClean($_REQUEST['file']);		// Existing file
+} else {
+	$file = "";					// Error
+	$finalAction = "nothing";
+	$doNext = "";
+	$error = true;
+	$errorStr = "true";
+	$errorMsg = $t['Sorry, bad filename...'];
 };
-$file = implode(";",$allFiles);
 
-// Establish the $fileLoc and $fileName (used in single file cases, eg opening. Multiple file cases, eg deleting, is worked out in that loop)
-$fileLoc = substr(str_replace($docRoot,"",$file),0,strrpos(str_replace($docRoot,"",$file),"/"));
-$fileName = basename($file);
+// If we have file(s) to work with...
+if (!$error) {
+	// Replace pipes with slashes, after cleaning the chars
+	$file = str_replace("|","/",strClean($file));
 
-// Check through all files to make sure they're valid/safe
-$allFiles = explode(";",$file);
-for ($i=0; $i<count($allFiles); $i++) {
+	// Establish the actual name as we may have HTML entities in filename
+	$file = html_entity_decode($file);
 
-	// Uncomment to alert and console.log the action and file, useful for debugging
-	// echo ";alert('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');console.log('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');";
+	// Put the original $file var aside for use
+	$fileOrig = $file;
 
-	// Die if the file requested isn't something we expect
-	if(
-		// A local folder that isn't the doc root or starts with the doc root
-		($_GET['action']!="getRemoteFile" &&
-			rtrim($allFiles[$i],"/") !== rtrim($docRoot,"/") &&
-			strpos(realpath(rtrim(dirname($allFiles[$i]),"/")),realpath(rtrim($docRoot,"/"))) !== 0
-		) ||
-		// Or a remote URL that doesn't start http
-		($_GET['action']=="getRemoteFile" && strpos($allFiles[$i],"http") !== 0)
-		) {
-		$error = true;
-		$errorStr = "true";
-		$errorMsg = "Sorry! - problem with file requested";
+	// Trim any +'s or spaces from the end of file
+	$file = rtrim(rtrim($file,'+'),' ');
+
+	// Also remove [NEW] from $file, we can consider $_GET['action'] or $fileOrig to pick that up
+	$file = rtrim($file,'[NEW]');
+
+	// Make each path in $file a full path (; seperated list)
+	$allFiles = explode(";",$file);
+	for ($i=0; $i<count($allFiles); $i++) {
+		if (strpos($allFiles[$i],$docRoot)===false && $_GET['action']!="getRemoteFile") {
+			$allFiles[$i]=str_replace("|","/",$docRoot.$iceRoot.$allFiles[$i]);
+		}
 	};
+	$file = implode(";",$allFiles);
+
+	// Establish the $fileLoc and $fileName (used in single file cases, eg opening. Multiple file cases, eg deleting, is worked out in that loop)
+	$fileLoc = substr(str_replace($docRoot,"",$file),0,strrpos(str_replace($docRoot,"",$file),"/"));
+	$fileName = basename($file);
+
+	// Check through all files to make sure they're valid/safe
+	$allFiles = explode(";",$file);
+	for ($i=0; $i<count($allFiles); $i++) {
+
+		// Uncomment to alert and console.log the action and file, useful for debugging
+		// echo ";alert('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');console.log('".xssClean($_GET['action'],"html")." : ".$allFiles[$i]."');";
+
+		// Die if the file requested isn't something we expect
+		if(
+			// On the banned file/dir list
+			(str_replace("*","",$_SESSION['bannedFiles'][$i]) != "" && strpos($allFiles[$i],str_replace("*","",$_SESSION['bannedFiles'][$i]))!==false) ||
+			// A local folder that isn't the doc root or starts with the doc root
+			($_GET['action']!="getRemoteFile" && !isset($ftpSite) && 
+				rtrim($allFiles[$i],"/") !== rtrim($docRoot,"/") &&
+				strpos(realpath(rtrim(dirname($allFiles[$i]),"/")),realpath(rtrim($docRoot,"/"))) !== 0
+			) ||
+			// Or a remote URL that doesn't start http
+			($_GET['action']=="getRemoteFile" && strpos($allFiles[$i],"http") !== 0)
+		) {
+			$error = true;
+			$errorStr = "true";
+			$errorMsg = "Sorry! - problem with file requested";
+		};
+	}
 }
 
+$doNext = "";
+// If we're in FTP mode, start a connection and leave open for FTP actions
+if (isset($ftpSite)) {
+	ftpStart();
+	// Show user warning if no good connection
+	if (!$ftpConn || !$ftpLogin) {
+		$doNext .= 'top.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");';
+	}
+}
+
+// ============================
+// STITCH CHANGES INTO OUR FILE
+// ============================
+function stitchChanges($fileLines) {
+	global $ICEcoder;
+
+	// Get our JSON changes from difflib and put into an array
+	$changes = json_decode($_POST['changes'],true);
+
+	// For each of those changes, handle the same requests on file on server to to match client view seen
+	for ($i=0; $i<count($changes); $i++) {
+		// Replace line(s)
+		if ($changes[$i][0] == "replace") {
+			for ($j=$changes[$i][1]; $j<=$changes[$i][2]-1; $j++) {			// Take 1 from end
+				// Clear content of line
+				$fileLines[$j] = "";
+				// If it's the last line in the range
+				if ($j == $changes[$i][2]-1) {
+					// Replace the line with our replacement
+					// and if the last line, rtrim the new line from JS
+					$fileLines[$j] =
+						$j==count($fileLines)-1
+						? rtrim($changes[$i][5],$ICEcoder["lineEnding"])
+						: $changes[$i][5];
+				}
+			}
+		}
+		// Insert line(s)
+		if ($changes[$i][0] == "insert") {
+			for ($j=$changes[$i][1]-1; $j<=$changes[$i][2]-1; $j++) {		// Take 1 from start and end
+				// Start of file, insert change and then 1st line afterwards
+				if ($j == -1) {
+					$fileLines[0] = $changes[$i][5].$fileLines[0];
+				// Otherwise, middle or end of file
+				} else {
+					// Replace the line with our replacement
+					// and if the last line, prefix with line return and rtrim the new line from JS
+					$fileLines[$j] .= 
+						$j==count($fileLines)-1
+						? $ICEcoder["lineEnding"].rtrim($changes[$i][5],$ICEcoder["lineEnding"])
+						: $changes[$i][5];
+				}
+			}
+		}
+		// delete line(s)
+		if ($changes[$i][0] == "delete") {
+			for ($j=$changes[$i][1]; $j<=$changes[$i][2]-1; $j++) {			// Take 1 from end
+				// Clear content of line
+				$fileLines[$j] = "";
+				// If the last line, clear line returns from it
+				if ($j == count($fileLines)-1) {
+					$fileLines[$changes[$i][1]-1] = rtrim(rtrim($fileLines[$changes[$i][1]-1],"\r"),"\n");
+				}
+			}
+		}
+	}
+
+	// Set and return the newly stitched together content
+	$contents = implode("",$fileLines);
+
+	return $contents;
+}
+
+
 // ============
 // SAVING FILES
 // ============
@@ -87,48 +177,69 @@ if (!$error && $_GET['action']=="save") {
 		$finalAction = strpos($fileOrig,"[NEW]")>0 ? "save as" : "save";
 		$fileURL = isset($file) ? $file : "";
 		$fileMDTURLPart = isset($_GET["fileMDT"]) && $_GET["fileMDT"]!="undefined" ? "&fileMDT=".numClean($_GET['fileMDT']) : "";
-		$doNext = '
+		$fileVersionURLPart = isset($_GET["fileVersion"]) && $_GET["fileVersion"]!="undefined" ? "&fileVersion=".numClean($_GET['fileVersion']) : "";
+		$doNext .= '
 			top.ICEcoder.serverMessage();
 			fileLoc = "'.$fileLoc.'";
+			overwriteOK = false;
+			noConflictSave = false;
 			newFileName = top.ICEcoder.getInput("'.$t['Enter filename to...'].' "+(fileLoc!="" ? fileLoc : "/"),"");
 			if (newFileName) {
 				if (newFileName.substr(0,1)!="/") {newFileName = "/" + newFileName};
 				newFileName = fileLoc + newFileName;
-				if (top.document.getElementById("filesFrame").contentWindow.document.getElementById(newFileName.replace(/\\\//g,"|"))) {
-					overwriteOK = top.ICEcoder.ask("'.$t['That file exists...'].'");
-				}
-			};
 
-			if ("undefined" == typeof newFileName || (newFileName && "undefined" == typeof overwriteOK) || ("undefined" != typeof overwriteOK && overwriteOK)) {
-				newFileName = "'.$docRoot.'" + newFileName;
-				saveURL = "lib/file-control-xhr.php?action=save'.$fileMDTURLPart.'&csrf='.$_GET["csrf"].'";
+				/* Check if file/dir exists */
+				top.ICEcoder.lastFileDirCheckStatusObj = false;
+				top.ICEcoder.checkExists(newFileName);
+				var thisInt = setInterval(function() {
+					if (top.ICEcoder.lastFileDirCheckStatusObj != false) {
+						clearInterval(thisInt);
 
-				var xhr = top.ICEcoder.xhrObj();
-
-				xhr.onreadystatechange=function() {
-					if (xhr.readyState==4 && xhr.status==200) {
-						/* console.log(xhr.responseText); */
-						var statusObj = JSON.parse(xhr.responseText);
-						/* Set the actions end time and time taken in JSON object */
-						statusObj.action.timeEnd = new Date().getTime();
-						statusObj.action.timeTaken = statusObj.action.timeEnd - statusObj.action.timeStart;
-						/* console.log(statusObj); */
-
-						if (statusObj.status.error) {
-							top.ICEcoder.message(statusObj.status.errorMsg);
+						if (top.ICEcoder.lastFileDirCheckStatusObj.file && top.ICEcoder.lastFileDirCheckStatusObj.file.exists) {			
+							overwriteOK = top.ICEcoder.ask("'.$t['That file exists...'].'");
 						} else {
-							eval(statusObj.action.doNext);
-						}
+							noConflictSave = true;
+						};
+						
+						/* Saving under conditions: Confirmation of overwrite or there is no filename conflict, it is a new file, in either case we can save */
+						if (overwriteOK || noConflictSave) {
+							newFileName = "'.(isset($ftpSite) ? "" : $docRoot).'" + newFileName;
+							saveURL = "lib/file-control-xhr.php?action=save'.$fileMDTURLPart.$fileVersionURLPart.'&csrf='.$_GET["csrf"].'";
+
+							var xhr = top.ICEcoder.xhrObj();
+
+							xhr.onreadystatechange=function() {
+								if (xhr.readyState==4 && xhr.status==200) {
+									/* console.log(xhr.responseText); */
+									var statusObj = JSON.parse(xhr.responseText);
+									/* Set the actions end time and time taken in JSON object */
+									statusObj.action.timeEnd = new Date().getTime();
+									statusObj.action.timeTaken = statusObj.action.timeEnd - statusObj.action.timeStart;
+									/* console.log(statusObj); */
+
+									if (statusObj.status.error) {
+										top.ICEcoder.message(statusObj.status.errorMsg);
+									} else {
+										eval(statusObj.action.doNext);
+									}
 						
 
+								}
+							};
+
+							/* console.log(\'Calling \'+saveURL+\' via XHR\'); */
+							xhr.open("POST",saveURL,true);
+							xhr.setRequestHeader(\'Content-type\', \'application/x-www-form-urlencoded\');
+							xhr.send(\'timeStart='.numClean($_POST["timeStart"]).'&file='.$fileURL.'&newFileName=\'+newFileName.replace(/\\\+/g,"%2B")+\'&contents=\'+encodeURIComponent(top.ICEcoder.saveAsContent));
+							top.ICEcoder.serverMessage("<b>'.$t['Saving'].'</b><br>" + "'.($finalAction == "Save" ? "newFileName" : "'".$fileName."'").'");
+						}
 					}
-				};
-				/* console.log(\'Calling \'+saveURL+\' via XHR\'); */
-				xhr.open("POST",saveURL,true);
-				xhr.setRequestHeader(\'Content-type\', \'application/x-www-form-urlencoded\');
-				xhr.send(\'timeStart='.$_POST["timeStart"].'&file='.$fileURL.'&newFileName=\'+newFileName+\'&contents=\'+top.document.getElementById(\'saveTemp1\').value);
-				top.ICEcoder.serverMessage("<b>'.$t['Saving'].'</b><br>" + "'.($finalAction == "Save" ? "newFileName" : "'".$fileName."'").'");
-			} else {
+				},10);
+			};
+
+			/* UI dialog cancelling and saving contents for save as looparound */
+			if (!newFileName || newFileName && !overwriteOK) {
+				top.ICEcoder.saveAsContent = top.document.getElementById(\'saveTemp1\').value;
 				top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
 			}';
 
@@ -136,38 +247,197 @@ if (!$error && $_GET['action']=="save") {
 	// FILE CONTENT SAVING
 	// ===================
 
-	} elseif (isset($_POST['contents'])) {
+	} elseif (isset($_POST['changes']) || isset($_POST['contents'])) {
 		$finalAction = isset($_POST["newFileName"]) ? "save as" : "save";
 
 		// =================
 		// FILE IS WRITEABLE
 		// =================
 
-		if (!$demoMode && ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="")) {
-			$filemtime = $serverType=="Linux" ? filemtime($file) : "1000000";
+		if (!$demoMode && (isset($ftpSite) || (file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="")) {
+
+			$filemtime = !isset($ftpSite) && $serverType=="Linux" ? filemtime($file) : "1000000";
 
 			// =======================
 			// MDT'S MATCH, WRITE FILE
 			// =======================
 
 			if (!(isset($_GET['fileMDT']))||$filemtime==$_GET['fileMDT']) {
-				// Newly created files have the perms set too
-				$setPerms = (!file_exists($file)) ? true : false;
-				$fh = fopen($file, 'w') or die($t['Sorry, cannot save']);
-				// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
-				$contents = $_POST['contents'];
-				$contents = str_replace("\r\n", $ICEcoder["lineEnding"], $contents);
-				$contents = str_replace("\r", $ICEcoder["lineEnding"], $contents);
-				$contents = str_replace("\n", $ICEcoder["lineEnding"], $contents);
-				// Now write that content, close the file and clear the statcache
-				fwrite($fh, $contents);
-				fclose($fh);
-				if ($setPerms) {
-					chmod($file,octdec($ICEcoder['newFilePerms']));
+
+				// FTP Saving
+				if (isset($ftpSite)) {
+					$ftpFilepath = ltrim($fileLoc."/".$fileName,"/");
+					if (isset($_POST['changes'])) {
+						// Get existing file contents as lines
+						$loadedFile = toUTF8noBOM(ftpGetContents($ftpConn, $ftpRoot.$fileLoc."/".$fileName, $ftpMode));
+						$fileLines = explode("\n",str_replace("\r","",$loadedFile));
+						// Need to add a new line at the end of each because explode will lose them,
+						// want want to end up with same array that 'file($file)' produces for a local file
+						// - it keeps the line endings at the end of each array item
+						for ($i=0; $i<count($fileLines); $i++) {
+							if ($i<count($fileLines)-1) {
+								$fileLines[$i] .= $ICEcoder["lineEnding"];
+							}
+						}
+						// Stitch changes onto it
+						$contents = stitchChanges($fileLines);
+
+						// get old file contents and count stats on usage \n and \r there
+						// in this case we can keep line endings, which file had before, without
+						// making code version control systems going crazy about line endings change in whole file. 
+						$unixNewLines = preg_match_all('/[^\r][\n]/u', $loadedFile);
+						$windowsNewLines = preg_match_all('/[\r][\n]/u', $loadedFile);
+					} else {
+						$contents = $_POST['contents'];
+					}
+
+					// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
+					$contents = str_replace("\r\n", $ICEcoder["lineEnding"], $contents);
+					$contents = str_replace("\r", $ICEcoder["lineEnding"], $contents);
+					$contents = str_replace("\n", $ICEcoder["lineEnding"], $contents);
+					if (isset($_POST['changes']) && ($unixNewLines > 0) || ($windowsNewLines > 0)){
+						if ($unixNewLines > $windowsNewLines){
+							$contents = str_replace($ICEcoder["lineEnding"], "\n", $contents);
+						} elseif ($windowsNewLines > $unixNewLines){
+							$contents = str_replace($ICEcoder["lineEnding"], "\r\n", $contents);
+						}
+					}
+					// Write our file contents
+					if (!ftpWriteFile($ftpConn, $ftpFilepath, $contents, $ftpMode)) {
+						$doNext .= 'top.ICEcoder.message("Sorry, could not write '.$ftpFilepath.' at '.$ftpHost.'");';
+					} else {
+						$doNext .= 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";';
+						$doNext .= '(function() {var x=top.ICEcoder.openFileVersions; var y=top.ICEcoder.selectedTab-1; x[y] = "undefined" != typeof x[y] ? x[y]+1 : 1})();top.ICEcoder.updateVersionsDisplay();';
+					}
+				// Local saving
+				} else {
+					if (isset($_POST['changes'])) {
+						// Get existing file contents as lines and stitch changes onto it
+						$fileLines = file($file);
+						$contents = stitchChanges($fileLines);
+
+						// get old file contents, and count stats on usage \n and \r there
+						// in this case we can keep line endings, which file had before, without
+						// making code version control systems going crazy about line endings change in whole file.
+						$oldContents = file_exists($file)?getData($file):'';
+						$unixNewLines = preg_match_all('/[^\r][\n]/u', $oldContents);
+						$windowsNewLines = preg_match_all('/[\r][\n]/u', $oldContents);
+					} else {
+						$contents = $_POST['contents'];
+					}
+
+					// Newly created files have the perms set too
+					$setPerms = (!file_exists($file)) ? true : false;
+					$fh = fopen($file, 'w') or die($t['Sorry, cannot save']);
+
+					// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
+					$contents = str_replace("\r\n", $ICEcoder["lineEnding"], $contents);
+					$contents = str_replace("\r", $ICEcoder["lineEnding"], $contents);
+					$contents = str_replace("\n", $ICEcoder["lineEnding"], $contents);
+					if (isset($_POST['changes']) && ($unixNewLines > 0) || ($windowsNewLines > 0)){
+						if ($unixNewLines > $windowsNewLines){
+							$contents = str_replace($ICEcoder["lineEnding"], "\n", $contents);
+						} elseif ($windowsNewLines > $unixNewLines){
+							$contents = str_replace($ICEcoder["lineEnding"], "\r\n", $contents);
+						}
+					}
+					// Now write that content, close the file and clear the statcache
+					fwrite($fh, $contents);
+					fclose($fh);
+
+					if ($setPerms) {
+						chmod($file,octdec($ICEcoder['newFilePerms']));
+					}
+					clearstatcache();
+					$filemtime = $serverType=="Linux" ? filemtime($file) : "1000000";
+					$doNext .= 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";';
+					$doNext .= '(function() {var x=top.ICEcoder.openFileVersions; var y=top.ICEcoder.selectedTab-1; x[y] = "undefined" != typeof x[y] ? x[y]+1 : 1})();top.ICEcoder.updateVersionsDisplay();';
 				}
-				clearstatcache();
-				$filemtime = $serverType=="Linux" ? filemtime($file) : "1000000";
-				$doNext = 'top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.$filemtime.'";';
+
+				// Save a version controlled backup source of the file
+				if ($ICEcoder["backupsKept"]) {
+					$backupDirFormat = "Y-m-d";
+
+					// Establish the base, host and date dir parts...
+					$backupDirBase = str_replace("\\","/",dirname(__FILE__))."/../backups/";
+					$backupDirHost = isset($ftpSite) ? parse_url($ftpSite,PHP_URL_HOST) : "localhost";
+					$backupDirDate = date($backupDirFormat);
+
+					// Establish an array of dirs from base to our file location
+					$subDirsArray = explode("/",ltrim($fileLoc,"/"));
+					array_unshift($subDirsArray,$backupDirHost,$backupDirDate);
+					// Make any dirs that don't exist if full path isn't there
+					if (!is_dir($backupDirBase.implode("/",$subDirsArray))) {
+						$pathIncr = "";
+						for ($i=0; $i<count($subDirsArray); $i++) {
+							$pathIncr .= $subDirsArray[$i]."/";
+							// If this subdir isn't there, make it
+							if (!is_dir($backupDirBase.$pathIncr)) {
+								mkdir($backupDirBase.$pathIncr);
+							}
+						}
+					}
+					// We should have our dir path now so set that
+					$backupDir = $backupDirBase.implode("/",$subDirsArray);
+					// Work out an available filename (we postfix a number in parens)
+					for ($i=1; $i<1000000000; $i++) {
+						if (!file_exists($backupDir.'/'.$fileName." (".$i.")")) {
+							$backupFileName = $fileName." (".$i.")";
+							$backupFileNum = $i;
+							$i=1000000000;
+						}
+					}
+
+					// Now save within that backup dir and clear the statcache
+					$fh = fopen($backupDir."/".$backupFileName, "w") or die($t['Sorry, cannot save...']);
+					fwrite($fh, $contents);
+					fclose($fh);
+					clearstatcache();
+
+					// Log the version count in an index file, which contains saved version counts
+					$backupIndex = $backupDirBase.$backupDirHost."/".$backupDirDate."/.versions-index";
+					// Have a version index already? Update contents
+					if (file_exists($backupIndex)) {
+						$versionsInfo = "";
+						$versionsInfoOrig = getData($backupIndex);
+						$versionsInfoOrig = explode("\n",$versionsInfoOrig);
+						$replacedLine = false;
+						// For each line, either re-set number or simply include the line
+						for ($i=0; $i<count($versionsInfoOrig); $i++) {
+							if (strpos($versionsInfoOrig[$i],$fileLoc."/".$fileName." = ") === 0) {
+								$versionsInfo .= $fileLoc."/".$fileName." = ".$backupFileNum.PHP_EOL;
+								$replacedLine = true;
+							} else {
+								$versionsInfo .= $versionsInfoOrig[$i].PHP_EOL;
+							}
+						}
+						// Didn't find our line in the file? Add it to the end
+						if (!$replacedLine) {
+							$versionsInfo .= $fileLoc."/".$fileName." = ".$backupFileNum.PHP_EOL;
+						}
+					// No version file yet, set the first line
+					} else {
+						$versionsInfo = $fileLoc."/".$fileName." = ".$backupFileNum.PHP_EOL;
+					}
+					$versionsInfo = rtrim($versionsInfo,PHP_EOL);
+					$fh = fopen($backupIndex, 'w') or die($t['Sorry, cannot save...']);
+					fwrite($fh, $versionsInfo);
+					fclose($fh);
+					clearstatcache();
+
+					// Finally, clear any old backup dirs than user set X days (inclusive)
+					$backupDirsList = scandir($backupDirBase.$backupDirHost);
+					$backupDirsKeep = array();
+					for ($i=0; $i<=$ICEcoder["backupsDays"]; $i++) {
+						$backupDirsKeep[] = date($backupDirFormat, strtotime('-'.$i.' day',strtotime($backupDirDate)));
+					}
+					for ($i=0; $i<count($backupDirsList); $i++) {
+						if ($backupDirsList[$i] != "." && $backupDirsList[$i] != ".." && !in_array($backupDirsList[$i],$backupDirsKeep)) {
+							rrmdir($backupDirBase.$backupDirHost."/".$backupDirsList[$i]);
+						}
+					}
+				}
+				
 				// Reload file manager, rename tab & remove old file highlighting if it was a new file
 				if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
 					$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\',false,false,false,\'file\');';
@@ -181,7 +451,7 @@ if (!$error && $_GET['action']=="save") {
 				// Reload previewWindow window if not a Markdown file
 				// In doing this, we check on an interval for the page to be complete and if we last saw it loading
 				// When we are done loading, so set the loading status to false and load plugins ontop...		
-				$doNext .= 'if (top.ICEcoder.previewWindow.location && top.ICEcoder.previewWindow.location.pathname.indexOf(".md")==-1) {
+				$doNext .= 'if (top.ICEcoder.previewWindow.location && top.ICEcoder.previewWindow.location.pathname && top.ICEcoder.previewWindow.location.pathname.indexOf(".md")==-1) {
 					top.ICEcoder.previewWindowLoading = false;
 					top.ICEcoder.previewWindow.location.reload(true);
 					
@@ -190,6 +460,7 @@ if (!$error && $_GET['action']=="save") {
 							top.ICEcoder.previewWindowLoading = false;
 							try {top.ICEcoder.doPesticide();} catch(err) {};
 							try {top.ICEcoder.doStatsJS(\'save\');} catch(err) {};
+							try {top.ICEcoder.doResponsive();} catch(err) {};
 							clearInterval(top.ICEcoder.checkPreviewWindowLoadingInt);
 						} else {
 							top.ICEcoder.previewWindowLoading = top.ICEcoder.previewWindow.document.readyState == "loading" ? true : false;
@@ -212,6 +483,7 @@ if (!$error && $_GET['action']=="save") {
 						top.ICEcoder.setPreviousFiles();
 						setTimeout(function(){top.ICEcoder.indicateChanges()},4);
 						top.ICEcoder.savedPoints[top.ICEcoder.selectedTab-1] = cM.changeGeneration();
+						top.ICEcoder.savedContents[top.ICEcoder.selectedTab-1] = cM.getValue();
 						top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);';
 
 				// Run our custom processes
@@ -222,8 +494,10 @@ if (!$error && $_GET['action']=="save") {
 			// ======================================================
 
 			} else {
-				$loadedFile = toUTF8noBOM(file_get_contents($file,false,$context),true);
-				$doNext = '
+				// Only applicable for local files
+				$loadedFile = toUTF8noBOM(getData($file),true);
+				$fileCountInfo = getVersionsCount($fileLoc,$fileName);
+				$doNext .= '
 				var loadedFile = document.createElement("textarea");
 				loadedFile.value = "'.str_replace('"','\\\"',str_replace("\r","\\\\r",str_replace("\n","\\\\n",str_replace("</textarea>","<ICEcoder:/:textarea>",$loadedFile)))).'";
 				var refreshFile = top.ICEcoder.ask("'.$t['Sorry, this file...'].'\\\n'.$file.'\\\n\\\n'.$t['Reload this file...'].'");
@@ -234,7 +508,9 @@ if (!$error && $_GET['action']=="save") {
 					/* Revert back to original */
 					cM.setValue(loadedFile.value);
 					top.ICEcoder.savedPoints[thisTab-1] = cM.changeGeneration();
+					top.ICEcoder.savedContents[thisTab-1] = cM.getValue();
 					top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1] = "'.$filemtime.'";
+					top.ICEcoder.openFileVersions[top.ICEcoder.selectedTab-1] = "'.$fileCountInfo['count'].'";
 					cM.clearHistory();
 					/* Now for the new version in the diff pane */
 					top.ICEcoder.setSplitPane(\'on\');
@@ -250,7 +526,7 @@ if (!$error && $_GET['action']=="save") {
 
         	} else {
 			$finalAction = "nothing";
-			$doNext = "top.ICEcoder.message('".$t['Sorry, cannot save']."\\\\n".$file."');";
+			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot save']."\\\\n".$file."');";
 		}
 		$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
 	}
@@ -261,15 +537,31 @@ if (!$error && $_GET['action']=="save") {
 // ==========
 
 if (!$error && $_GET['action']=="newFolder") {
-	if (!$demoMode && is_writable($docRoot.$fileLoc)) {
-		mkdir($file, octdec($ICEcoder['newDirPerms']));
-		// Reload file manager
-		$doNext = 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\',false,false,false,\'folder\');';
+	if (!$demoMode && (isset($ftpSite) || is_writable($docRoot.$fileLoc))) {
+		$updateFM = false;
+		// FTP
+		if (isset($ftpSite)) {
+			$ftpFilepath = ltrim($fileLoc."/".$fileName,"/");
+			if (!ftpMkDir($ftpConn, octdec($ICEcoder['newDirPerms']), $ftpFilepath)) {
+				$doNext .= 'top.ICEcoder.message("Sorry, could not create dir '.$ftpFilepath.' at '.$ftpHost.'");';
+			} else {
+				$updateFM = true;
+			}
+		// Local
+		} else {
+			mkdir($file, octdec($ICEcoder['newDirPerms']));
+			// Reload file manager
+			$updateFM = true;
+		}
+		// Update file manager on success
+		if ($updateFM) {
+			$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\',false,false,false,\'folder\');';
+		}
 		$finalAction = "newFolder";
 		// Run our custom processes
 		include_once("../processes/on-new-dir.php");
 	} else {
-		$doNext = "top.ICEcoder.message('".$t['Sorry, cannot create...']."\\\\n".$fileLoc."');";
+		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot create...']."\\\\n".$fileLoc."');";
 		$finalAction = "nothing";
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
@@ -280,27 +572,46 @@ if (!$error && $_GET['action']=="newFolder") {
 // ================
 
 if (!$error && $_GET['action']=="move") {
-	$moved=false;
-	$doNext = "";
-	$srcDir = $docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName']));
-	$tgtDir = $docRoot.$fileLoc."/".$fileName;
+	if (isset($ftpSite)) {
+		$srcDir = ltrim(str_replace("|","/",strClean($_GET['oldFileName'])),"/");
+		$tgtDir = ltrim($fileLoc."/".$fileName,"/");
+	} else {
+		$srcDir = $docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName']));
+		$tgtDir = $docRoot.$fileLoc."/".$fileName;
+	}
 	if ($srcDir != $tgtDir && $fileLoc != "") {
-		if (!$demoMode && is_writable($srcDir)) {
-			if(rename($srcDir,$tgtDir)) {
-				// Reload file manager
-				$fileOrFolder = is_dir($docRoot.$fileLoc."/".$fileName) ? "folder" : "file";
-				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'move\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean(str_replace("|","/",$_GET['oldFileName']))).'\',false,\''.$fileOrFolder.'\');';
-				$finalAction = "move";
-				$moved=true;
-				// Run our custom processes
-				include_once("../processes/on-file-dir-move.php");
+		if (!$demoMode && (isset($ftpSite) || is_writable($srcDir))) {
+			$updateFM = false;
+			// FTP
+			if (isset($ftpSite)) {
+				if (!ftpRename($ftpConn, $srcDir, $tgtDir)) {
+					$doNext .= 'top.ICEcoder.message("Sorry, could not rename '.$srcDir.' to '.$tgtDir.'");';
+				} else {
+					$ftpFileDirInfo = ftpGetFileInfo($ftpConn, ltrim($fileLoc,"/"), $fileName);
+					$fileOrFolder = $ftpFileDirInfo['type'] == "directory" ? "folder" : "file";
+					$updateFM = true;
+				}
+			// Local
+			} else {
+				if(rename($srcDir,$tgtDir)) {
+					// Is a dir or file (needed to create new item in file manager)
+					$fileOrFolder = is_dir($docRoot.$fileLoc."/".$fileName) ? "folder" : "file";
+					$updateFM = true;
+				}
 			}
-		}
-		if (!$moved) {
+			// Update file manager on success
+			if ($updateFM) {
+				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'move\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean(str_replace("|","/",$_GET['oldFileName']))).'\',false,\''.$fileOrFolder.'\');';
+			}
+			$finalAction = "move";
+			// Run our custom processes
+			include_once("../processes/on-file-dir-move.php");
+		} else {
 			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot move']."\\\\n".str_replace("|","/",strClean($_GET['oldFileName']))."\\\\n\\\\n".$t['Maybe public write...']."');";
 			$finalAction = "nothing";
 		}
 	} else {
+		$doNext .= "";
 		$finalAction = "nothing";
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
@@ -311,19 +622,31 @@ if (!$error && $_GET['action']=="move") {
 // ==================
 
 if (!$error && $_GET['action']=="rename") {
-	$renamed=false;
-	if (!$demoMode && is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
-		if(rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName)) {
-			// Reload file manager
-			$doNext = 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
-			$finalAction = "rename";
-			$renamed=true;
-			// Run our custom processes
-			include_once("../processes/on-file-dir-rename.php");
+	if (!$demoMode && (isset($ftpSite) || is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName']))))) {
+		$updateFM = false;
+		// FTP
+		if (isset($ftpSite)) {
+			$ftpFilepath = ltrim($fileLoc."/".$fileName,"/");
+			if (!ftpRename($ftpConn, ltrim(strClean($_GET['oldFileName']),"/"), $ftpFilepath)) {
+				$doNext .= 'top.ICEcoder.message("Sorry, could not rename '.ltrim(strClean($_GET['oldFileName']),"/").' to '.$ftpFilepath.'");';
+			} else {
+				$updateFM = true;
+			}
+		// Local
+		} else {
+			rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName);
+			$updateFM = true;
 		}
-	}
-	if (!$renamed) {
-		$doNext = "top.ICEcoder.message('".$t['Sorry, cannot rename']."\\\\n".strClean($_GET['oldFileName'])."\\\\n\\\\n".$t['Maybe public write...']."');";
+		// Update file manager on success
+		if ($updateFM) {
+			$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
+		}
+		$finalAction = "rename";
+		// Run our custom processes
+		include_once("../processes/on-file-dir-rename.php");
+	} else {
+		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot rename']."\\\\n".strClean($_GET['oldFileName'])."\\\\n\\\\n".$t['Maybe public write...']."');";
+		$finalAction = "nothing";
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
 };
@@ -332,7 +655,7 @@ if (!$error && $_GET['action']=="rename") {
 // PASTE FILE/FOLDER
 // =================
 
-if (!$error && $_GET['action']=="paste") {
+if (!isset($ftpSite) && !$error && $_GET['action']=="paste") {
 	$source = $file;
 	$dest = str_replace("//","/",$docRoot.$iceRoot.strClean(str_replace("|","/",$_GET['location']))."/".basename($source));
 	if (!$demoMode && is_writable(dirname($dest))) {
@@ -374,12 +697,12 @@ if (!$error && $_GET['action']=="paste") {
 			}
 		}
 		// Reload file manager
-		$doNext = 'top.ICEcoder.updateFileManagerList(\'add\',\''.strClean(str_replace("|","/",$_GET['location'])).'\',\''.basename($dest).'\',false,false,false,\''.$fileOrFolder.'\');';
+		$doNext .= 'top.ICEcoder.updateFileManagerList(\'add\',\''.strClean(str_replace("|","/",$_GET['location'])).'\',\''.basename($dest).'\',false,false,false,\''.$fileOrFolder.'\');';
 		$finalAction = "pasteFile";
 		// Run our custom processes
 		include_once("../processes/on-file-dir-paste.php");
 	} else {
-		$doNext = "top.ICEcoder.message('".$t['Sorry, cannot copy']." \\\\n".str_replace($docRoot,"",$source)."\\\\n ".$t['into']." \\\\n".str_replace($docRoot,"",$dest)."');";
+		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot copy']." \\\\n".str_replace($docRoot,"",$source)."\\\\n ".$t['into']." \\\\n".str_replace($docRoot,"",$dest)."');";
 		$finalAction = "nothing";
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
@@ -389,17 +712,23 @@ if (!$error && $_GET['action']=="paste") {
 // UPLOAD FILE(S)
 // ==============
 
-if (!$error && $_GET['action']=="upload") {
+if (!isset($ftpSite) && !$error && $_GET['action']=="upload") {
 	if (!$demoMode) {
-		$doNext = "";
 		class fileUploader {  
 			public function __construct($uploads) {
-				global $docRoot,$iceRoot,$doNext;
+				global $docRoot,$iceRoot,$ICEcoder,$doNext;
 				$uploadDir=$docRoot.$iceRoot.str_replace("..","",str_replace("|","/",strClean($_POST['folder'])."/"));
 				foreach($uploads as $current) {  
 					$this->uploadFile=$uploadDir.$current->name;
 					$fileName = $current->name;
-					if ($this->upload($current,$this->uploadFile)) {
+					// Get & set existing perms for existing files, or set to newFilePerms setting for new files
+                                        if (file_exists($this->uploadFile)) {
+                                                $chmodInfo = substr(sprintf('%o', fileperms($this->uploadFile)), -4);
+                                                $setPerms = substr($chmodInfo,1,3); // reduces 0755 down to 755
+                                        } else {
+                                                $setPerms = $ICEcoder['newFilePerms'];
+                                        }
+					if ($this->upload($current,$this->uploadFile,$setPerms)) {
 						$doNext .= 'top.ICEcoder.updateFileManagerList(\'add\',top.ICEcoder.selectedFiles[top.ICEcoder.selectedFiles.length-1].replace(/\|/g,\'/\'),\''.str_replace("'","\'",$fileName).'\',false,false,true,\'file\'); top.ICEcoder.serverMessage("'.$t['Uploaded file(s) OK'].'");setTimeout(function(){top.ICEcoder.serverMessage();},2000);';
 						$finalAction = "upload";
 					} else {
@@ -409,8 +738,9 @@ if (!$error && $_GET['action']=="upload") {
 				}  
 			}  
 
-			public function upload($current,$uploadFile){ 
+			public function upload($current,$uploadFile,$setPerms){ 
 				if(move_uploaded_file($current->tmp_name,$uploadFile)){
+					chmod($uploadFile,octdec($setPerms));
 					return true;  
 				}  
 			}  
@@ -448,31 +778,54 @@ if (!$error && $_GET['action']=="upload") {
 // ========================
 
 if (!$error && $_GET['action']=="delete") {
-	$doNext = "";
 	$filesArray = explode(";",$file); // May contain more than one file here
-	for ($i=0;$i<count($filesArray);$i++) {
-		$fullPath = str_replace($docRoot,"",$filesArray[$i]);
-		$fullPath = str_replace($iceRoot,"",$fullPath);
-		$fullPath = $docRoot.$iceRoot.$fullPath;
-
-		if (rtrim($fullPath,"/") == rtrim($docRoot,"/")) {
-			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete...']."');";
-		} else if (!$demoMode && is_writable($fullPath)) {
-			is_dir($fullPath)
-				? rrmdir($fullPath)
-				: unlink($fullPath);
-			$fileName = basename($fullPath);
-			$fileLoc = dirname(str_replace($docRoot,"",$fullPath));
-			if ($fileLoc=="" || $fileLoc=="\\") {$fileLoc="/";};
-			// Reload file manager
-			$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
-			$finalAction = "delete";
-			// Run our custom processes
-			include_once("../processes/on-file-dir-delete.php");
+	// FTP
+	if (isset($ftpSite)) {
+		if (count($filesArray) == 1) {
+			$ftpFileDirInfo = ftpGetFileInfo($ftpConn, ltrim($fileLoc,"/"), $fileName);
+			$itemType = $ftpFileDirInfo['type'] == "directory" ? "dir" : "file";
+			$itemPath = ltrim($fileLoc."/".$fileName,"/");
+			if (!$demoMode && ftpDelete($ftpConn,$itemType,$itemPath)) {
+				if ($fileLoc=="" || $fileLoc=="\\") {$fileLoc="/";};
+				// Reload file manager
+				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
+				$finalAction = "delete";
+				// Run our custom processes
+				include_once("../processes/on-file-dir-delete.php");
+			} else {
+				$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete']."\\\\n".$fileLoc."/".$fileName."');";
+				$finalAction = "nothing";
+			}
 		} else {
-			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete']."\\\\n".str_replace($docRoot,"",$fullPath)."');";
+			$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete more...']."');";
 			$finalAction = "nothing";
 		}
+	// Local
+	} else {
+		for ($i=0;$i<count($filesArray);$i++) {
+			$fullPath = str_replace($docRoot,"",$filesArray[$i]);
+			$fullPath = str_replace($iceRoot,"",$fullPath);
+			$fullPath = $docRoot.$iceRoot.$fullPath;
+
+			if (rtrim($fullPath,"/") == rtrim($docRoot,"/")) {
+				$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete...']."');";
+			} else if (!$demoMode && is_writable($fullPath)) {
+				is_dir($fullPath)
+					? rrmdir($fullPath)
+					: unlink($fullPath);
+				$fileName = basename($fullPath);
+				$fileLoc = dirname(str_replace($docRoot,"",$fullPath));
+				if ($fileLoc=="" || $fileLoc=="\\") {$fileLoc="/";};
+				// Reload file manager
+				$doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
+				$finalAction = "delete";
+				// Run our custom processes
+				include_once("../processes/on-file-dir-delete.php");
+			} else {
+				$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot delete']."\\\\n".str_replace($docRoot,"",$fullPath)."');";
+				$finalAction = "nothing";
+			}
+		}
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
 };
@@ -497,10 +850,9 @@ function rrmdir($dir) {
 // REPLACE TEXT IN A FILE
 // ======================
 
-if (!$error && $_GET['action']=="replaceText") {
-	$doNext = "";
+if (!isset($ftpSite) && !$error && $_GET['action']=="replaceText") {
 	if (!$demoMode && is_writable($file)) {
-		$loadedFile = toUTF8noBOM(file_get_contents($file,false,$context),true);
+		$loadedFile = toUTF8noBOM(getData($file),true);
 		$newContent = str_replace(strClean($_GET['find']),strClean($_GET['replace']),$loadedFile);
 		$fh = fopen($file, 'w') or die($t['Sorry, cannot save']);
 		fwrite($fh, $newContent);
@@ -519,15 +871,16 @@ if (!$error && $_GET['action']=="replaceText") {
 // GET CONTENTS OF REMOTE URL
 // ==========================
 
-if (!$error && $_GET['action']=="getRemoteFile") {
-	$doNext = "";
-	if ($remoteFile = toUTF8noBOM(file_get_contents($file,false,$context),true)) {
+if (!isset($ftpSite) && !$error && $_GET['action']=="getRemoteFile") {
+	$lineNumber = max(isset($_REQUEST['lineNumber'])?intval($_REQUEST['lineNumber']):1, 1);
+	if ($remoteFile = toUTF8noBOM(getData($file,'curl'),true)) {
 		// replace \r\n (Windows), \r (old Mac) and \n (Linux) line endings with whatever we chose to be lineEnding
 		$remoteFile = str_replace("\r\n", $ICEcoder["lineEnding"], $remoteFile);
 		$remoteFile = str_replace("\r", $ICEcoder["lineEnding"], $remoteFile);
 		$remoteFile = str_replace("\n", $ICEcoder["lineEnding"], $remoteFile);
 		$doNext .= 'top.ICEcoder.newTab();';
 		$doNext .= 'top.ICEcoder.getcMInstance().setValue(\''.str_replace("\r","",str_replace("\t","\\\\t",str_replace("\n","\\\\n",str_replace("'","\\\\'",str_replace("\\","\\\\",preg_quote($remoteFile)))))).'\');';
+		$doNext .= 'top.ICEcoder.goToLine('.$lineNumber.');';
 		$finalAction = "getRemoteFile";
 		// Run our custom processes
 		include_once("../processes/on-get-remote-file.php");
@@ -543,43 +896,95 @@ if (!$error && $_GET['action']=="getRemoteFile") {
 // =======================
 
 if (!$error && $_GET['action']=="perms") {
-	if (!$demoMode && is_writable($file)) {
-		chmod($file,octdec(numClean($_GET['perms'])));
-		// Reload file manager
-		$doNext = 'top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
+	if (!$demoMode && (isset($ftpSite) || is_writable($file))) {
+		$updateFM = false;
+		// FTP
+		if (isset($ftpSite)) {
+			$ftpFilepath = ltrim($fileLoc."/".$fileName,"/");
+			if (!ftpPerms($ftpConn, octdec(numClean($_GET['perms'])), $ftpFilepath)) {
+				$doNext .= 'top.ICEcoder.message("Sorry, could not set perms on '.$ftpFilepath.' at '.$ftpHost.'");';
+			} else {
+				$updateFM = true;
+			}
+		// Local
+		} else {
+			chmod($file,octdec(numClean($_GET['perms'])));
+			// Reload file manager
+			$updateFM = true;
+		}
+		// Update file manager on success
+		if ($updateFM) {
+			$doNext .= 'top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
+		}
 		$finalAction = "perms";
 		// Run our custom processes
 		include_once("../processes/on-file-dir-perms.php");
 	} else {
 		$finalAction = "nothing";
-		$doNext = "top.ICEcoder.message('".$t['Sorry, cannot change...']." \\n".strClean($file)."');";
+		$doNext .= "top.ICEcoder.message('".$t['Sorry, cannot change...']." \\n".strClean($file)."');";
 	}
 	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
-}
-
+};
 
+// ====================
+// CHECK FOR A FILE/DIR
+// ====================
 
+if (!isset($ftpSite) && !$error && $_GET['action']=="checkExists") {
+	// This action is called under seperate AJAX call and the responseText object stored in top.ICEcoder.lastFileDirCheckStatusObj
+	// Nothing really done here though, we do something with the responseText
+	$finalAction = "checkExists";
+	$doNext .= 'top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);';
+};
 
 // ===================
 // JSON DATA TO RETURN
 // ===================
 
+// No $filemtime yet? Get it now!
+if (!isset($filemtime) && !is_dir($file)) {
+	$filemtime = $serverType=="Linux" ? filemtime($file) : "1000000";
+}
+// Set $timeStart, use 0 if not available
+$timeStart = isset($_POST["timeStart"]) ? numClean($_POST["timeStart"]) : 0;
+
+if (isset($ftpSite)) {
+	// Get info on dir/file now
+	$ftpFileDirInfo = ftpGetFileInfo($ftpConn, ltrim($fileLoc,"/"), $fileName);
+	// End the connection
+	ftpEnd();
+	// Then set info
+	$itemAbsPath = $ftpRoot.$fileLoc.'/'.$fileName;
+	$itemPath = dirname($ftpRoot.$fileLoc.'/'.$fileName);
+	$itemBytes = $ftpFileDirInfo['size'];
+	$itemType = (isset($ftpFileDirInfo['type']) ? ($ftpFileDirInfo['type'] == "directory" ? "dir" : "file") : "unknown");
+	$itemExists = (isset($ftpFileDirInfo['type']) ? "true" : "false");
+} else {
+	$itemAbsPath = $file;
+	$itemPath = dirname($file);
+	$itemBytes = is_dir($file) ? null : filesize($file);
+	$itemType = (file_exists($file) ? (is_dir($file) ? "dir" : "file") : "unknown");
+	$itemExists = (file_exists($file) ? "true" : "false");
+}
+
 echo '{
 	"file": {
-		"absPath": "'.$file.'",
+		"absPath": "'.$itemAbsPath.'",
 		"relPath": "'.$fileLoc.'/'.$fileName.'",
 		"name":	"'.$fileName.'",
-		"path": "'.dirname($file).'",
-		"bytes": "'.filesize($file).'",
-		"modifiedDT": "'.$filemtime.'"
+		"path": "'.$itemPath.'",
+		"bytes": "'.$itemBytes.'",
+		"modifiedDT": "'.$filemtime.'",
+		"type": "'.$itemType.'",
+		"exists": '.$itemExists.'
 	},
 	"action": {
-		"initial" : "'.$_GET["action"].'",
+		"initial" : "'.xssClean($_GET['action'],"html").'",
 		"final" : "'.$finalAction.'",
-		"timeStart": '.$_POST["timeStart"].',
+		"timeStart": '.$timeStart.',
 		"timeEnd": 0,
 		"timeTaken": 0,
-		"csrf": "'.$_GET["csrf"].'",
+		"csrf": "'.xssClean($_GET['csrf'],"html").'",
 		"doNext" : "'.preg_replace('/\r|\n/','',str_replace('	','',str_replace('"','\"',$doNext))).'top.ICEcoder.switchMode();"
 	},
 	"status": {

lib/file-control.php

@@ -1,6 +1,7 @@
-<?php
+<?php
 include("headers.php");
 include("settings.php");
+include("ftp-control.php");
 $t = $text['file-control'];
 ?>
 <?php if ($_SESSION['githubDiff']) { ?>
@@ -9,9 +10,6 @@ $t = $text['file-control'];
 <?php ;}; ?>
 <script>
 <?php
-// Get the save type if any
-$saveType = isset($_GET['saveType']) ? strClean($_GET['saveType']) : "";
-
 // Establish the filename/new filename
 $file = str_replace("|","/",strClean(
 	isset($_POST['newFileName']) && $_POST['newFileName']!=""
@@ -54,25 +52,33 @@ for ($i=0; $i<count($allFiles); $i++) {
 	// Die if the file requested isn't something we expect
 	if(
 		// A local folder that isn't the doc root or starts with the doc root
-		($_GET['action']!="getRemoteFile" &&
+		($_GET['action']!="getRemoteFile" && !isset($ftpSite) && 
 			rtrim($allFiles[$i],"/") !== rtrim($docRoot,"/") &&
 			strpos(realpath(rtrim(dirname($allFiles[$i]),"/")),realpath(rtrim($docRoot,"/"))) !== 0
 		) ||
 		// Or a remote URL that doesn't start http
 		($_GET['action']=="getRemoteFile" && strpos($allFiles[$i],"http") !== 0)
 		) {
-		die("alert('Sorry! - problem with file requested');</script>");
+		die("top.ICEcoder.message('Sorry! - problem with file requested');</script>");
 	};
 }
 
 // If we're due to open a file...
 if ($_GET['action']=="load") {
 	echo 'action="load";';
+	$lineNumber = max(isset($_REQUEST['lineNumber'])?intval($_REQUEST['lineNumber']):1, 1);
+	// Check this file isn't on the banned list at all
+	$canOpen = true;
+	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+		if(str_replace("*","",$_SESSION['bannedFiles'][$i]) != "" && strpos($file,str_replace("*","",$_SESSION['bannedFiles'][$i]))!==false) {$canOpen = false;}
+	}
 
-	if (file_exists($file)) {
+	if (!$canOpen) {
+		echo 'fileType="nothing"; top.ICEcoder.message(\''.$t['Sorry, could not...'].' '.$fileLoc."/".$fileName.'\');';
+	} elseif (isset($ftpSite) || file_exists($file)) {
 		$finfo = "text";
 		// Determine what to do based on mime type
-		if (function_exists('finfo_open')) {
+		if (!isset($ftpSite) && function_exists('finfo_open')) {
 			$finfoMIME = finfo_open(FILEINFO_MIME);
 			$finfo = finfo_file($finfoMIME, $file);
 			finfo_close($finfoMIME);
@@ -82,11 +88,29 @@ if ($_GET['action']=="load") {
 			if (array_search($fileExt,array("gif","jpg","jpeg","png"))!==false) {$finfo = "image";};
 			if (array_search($fileExt,array("doc","docx","ppt","rtf","pdf","zip","tar","gz","swf","asx","asf","midi","mp3","wav","aiff","mov","qt","wmv","mp4","odt","odg","odp"))!==false) {$finfo = "other";};
 		}
-		if (strpos($finfo,"text")===0 || strpos($finfo,"empty")!==false) {
+		if (strpos($finfo,"text")===0 || strpos($finfo, "application/xml")===0 || strpos($finfo,"empty")!==false) {
 			echo 'fileType="text";';
 			echo 'top.ICEcoder.shortURL = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
-			$loadedFile = toUTF8noBOM(file_get_contents($file,false,$context),true);
-			echo '</script><textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",str_replace("&","&amp;",$loadedFile)).'</textarea><script>';
+
+		// Get file over FTP?
+		if (isset($ftpSite)) {
+			ftpStart();
+			// Show user warning if no good connection
+			if (!$ftpConn || !$ftpLogin) {
+				die('top.ICEcoder.message("Sorry, no FTP connection to '.$ftpHost.' for user '.$ftpUser.'");top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>');
+				exit;
+			}
+			// Get our file contents and close the FTP connection
+			$loadedFile = toUTF8noBOM(ftpGetContents($ftpConn, $ftpRoot.$fileLoc."/".$fileName, $ftpMode));
+			ftpEnd();
+		// Get local file
+		} else {
+			$loadedFile = toUTF8noBOM(getData($file),true);
+		}
+			$encoding=ini_get("default_charset");
+			if($encoding=="")
+				$encoding="UTF-8";
+			echo '</script><textarea name="loadedFile" id="loadedFile">'.htmlentities($loadedFile,ENT_COMPAT,$encoding).'</textarea><script>';
 			// Run our custom processes
 			include_once("../processes/on-file-load.php");
 		} else if (strpos($finfo,"image")===0) {
@@ -109,7 +133,7 @@ if (action=="load") {
 				console.log('<?php echo $t['There was a...']; ?>');
 				window.location.reload(true);
 			<?php
-			if (file_exists($file)) {
+			if (isset($ftpSite) || file_exists($file)) {
 			?>
 			} else {
 				top.ICEcoder.loadingFile = true;
@@ -122,7 +146,7 @@ if (action=="load") {
 				top.ICEcoder.setLayout();
 				top.ICEcoder.content.contentWindow.createNewCMInstance(top.ICEcoder.nextcMInstance);
 
-				<?php if ($_SESSION['githubDiff']) { ?>
+				<?php if (!isset($ftpSite) && $_SESSION['githubDiff']) { ?>
 					// If we're in GitHub diff mode and have a split pane display, get the content for the diff pane
 					if (top.ICEcoder.githubDiff && top.ICEcoder.splitPane) {
 						<?php
@@ -159,9 +183,10 @@ if (action=="load") {
 				cM = top.ICEcoder.getcMInstance();
 				cM.setValue(document.getElementById('loadedFile').value);
 				top.ICEcoder.savedPoints[top.ICEcoder.selectedTab-1] = cM.changeGeneration();
+				top.ICEcoder.savedContents[top.ICEcoder.selectedTab-1] = cM.getValue();
 				top.document.getElementById('content').style.visibility='visible';
 				top.ICEcoder.switchTab(top.ICEcoder.selectedTab,'noFocus');
-				setTimeout(function(){top.filesFrame.contentWindow.focus();},0);
+				setTimeout(function(){top.ICEcoder.filesFrame.contentWindow.focus();},0);
 
 				// Then clean it up, set the text cursor, update the display and get the character data
 				top.ICEcoder.contentCleanUp();
@@ -169,9 +194,12 @@ if (action=="load") {
 				top.ICEcoder['cMActiveLinecM'+top.ICEcoder.selectedTab] = top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].addLineClass(0, "background", "cm-s-activeLine");
 				top.ICEcoder.nextcMInstance++;
 				top.ICEcoder.openFileMDTs.push('<?php echo $serverType=="Linux" ? filemtime($file) : "1000000"; ?>');
-				for (var i=0; i<cM.lineCount(); i++) {
-					top.ICEcoder.content.contentWindow.CodeMirror.doFold(cM.getLine(i).indexOf("{")>-1?"brace":"xml",null,"+","-",true)(cM, i);
-				}
+				top.ICEcoder.openFileVersions.push(<?php
+					$fileCountInfo = getVersionsCount($fileLoc,$fileName);
+					echo $fileCountInfo['count'];?>);
+				top.ICEcoder.updateVersionsDisplay();
+
+				top.ICEcoder.goToLine(<?php echo $lineNumber; ?>);
 				top.ICEcoder.loadingFile = false;
 			<?php
 			;};
@@ -184,20 +212,23 @@ if (action=="load") {
 		top.document.getElementById('blackMask').style.visibility = "visible";
 		top.document.getElementById('mediaContainer').innerHTML = 
 			"<canvas id=\"canvasPicker\" width=\"1\" height=\"1\" style=\"position: absolute; margin: 10px 0 0 10px; cursor: crosshair\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></canvas>" + 
-			"<img src=\"<?php echo $fileLoc."/".$fileName;?>\" class=\"whiteGlow\" style=\"border: solid 10px #fff; max-width: 700px; max-height: 500px; background-color: #000; background-image: url('images/checkerboard.png')\" onLoad=\"reducedImgMsg = (this.naturalWidth > 700 || this.naturalHeight > 500) ? ', <?php echo $t['displayed at']; ?> ' + this.width + ' x ' + this.height : ''; document.getElementById('imgInfo').innerHTML += ' (' + this.naturalWidth + ' x ' + this.naturalHeight + reducedImgMsg + ')'; top.ICEcoder.drawCanvasImage(this)\"><br>" +
+			"<img src=\"<?php echo (isset($ftpSite) ? $ftpSite : "").$fileLoc."/".$fileName;?>\" class=\"whiteGlow\" style=\"border: solid 10px #fff; max-width: 700px; max-height: 500px; background-color: #000; background-image: url('images/checkerboard.png')\" onLoad=\"reducedImgMsg = (this.naturalWidth > 700 || this.naturalHeight > 500) ? ', <?php echo $t['displayed at']; ?> ' + this.width + ' x ' + this.height : ''; document.getElementById('imgInfo').innerHTML += ' (' + this.naturalWidth + ' x ' + this.naturalHeight + reducedImgMsg + ')'; top.ICEcoder.initCanvasImage(this); top.ICEcoder.interactCanvasImage(this)\"><br>" +
 			"<div class=\"whiteGlow\" style=\"display: inline-block; margin-top: -10px; border: solid 10px #fff; color: #000; background-color: #fff\" id=\"imgInfo\"  onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\">" + 
 				"<b><?php echo $fileLoc."/".$fileName;?></b>" + 
 			"</div><br>" + 
+			"<div id=\"canvasPickerColorInfo\">"+
 			"<input type=\"text\" id=\"hexMouseXY\" style=\"border: 1px solid #888; border-right: 0; width: 70px\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></input>" + 
 			"<input type=\"text\" id=\"rgbMouseXY\" style=\"border: 1px solid #888; margin-right: 10px; width: 70px\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></input>" + 
 			"<input type=\"text\" id=\"hex\" style=\"border: 1px solid #888; border-right: 0; width: 70px\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></input>" + 
-			"<input type=\"text\" id=\"rgb\" style=\"border: 1px solid #888; width: 70px\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></input>";
+			"<input type=\"text\" id=\"rgb\" style=\"border: 1px solid #888; width: 70px\" onmouseover=\"top.ICEcoder.overPopup=true\" onmouseout=\"top.ICEcoder.overPopup=false\"></input>"+
+			"</div>"+
+			"<div id=\"canvasPickerCORSInfo\" style=\"display: none; padding-top: 4px\">CORS not enabled on resource site</div>";
+		top.document.getElementById('floatingContainer').style.background = "#fff url('<?php echo $fileLoc."/".$fileName;?>') no-repeat 0 0";
 	}
 
 	top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
 }
-</script>
 
 // Finally, switch mode in case we have saved, renamed file etc
 top.ICEcoder.switchMode();
-</script>
+</script>

lib/file-type-icons.css

@@ -1,6 +1,6 @@
 /* Additional file types */
 .fileManager LI.ext-c:before {background-position: -48px 0}
-.fileManager LI.ext-cpp:before {background-position: -64px 0}
+.fileManager LI.ext-cpp:before, .fileManager LI.ext-ino:before {background-position: -64px 0}
 .fileManager LI.ext-cs:before {background-position: -80px 0}
 .fileManager LI.ext-coffee:before {background-position: -96px 0}
 .fileManager LI.ext-css:before {background-position: -112px 0}
@@ -20,10 +20,9 @@
 .fileManager LI.ext-png:before {background-position: -336px 0}
 .fileManager LI.ext-py:before {background-position: -352px 0}
 .fileManager LI.ext-rb:before, .fileManager LI.ext-ruby:before {background-position: -368px 0}
-.fileManager LI.ext-rs:before {background-position: -384px 0}
-.fileManager LI.ext-scss:before {background-position: -400px 0}
-.fileManager LI.ext-sql:before {background-position: -416px 0}
-.fileManager LI.ext-txt:before {background-position: -432px 0}
-.fileManager LI.ext-xml:before {background-position: -448px 0}
-.fileManager LI.ext-yaml:before {background-position: -464px 0}
-.fileManager LI.ext-zip:before {background-position: -480px 0}
+.fileManager LI.ext-scss:before {background-position: -384px 0}
+.fileManager LI.ext-sql:before {background-position: -400px 0}
+.fileManager LI.ext-txt:before {background-position: -416px 0}
+.fileManager LI.ext-xml:before {background-position: -432px 0}
+.fileManager LI.ext-yaml:before {background-position: -448px 0}
+.fileManager LI.ext-zip:before {background-position: -464px 0}