diff --git a/Preferences/Indent.tmPreferences b/Preferences/Indent.tmPreferences
index c898002..b0245b7 100644
--- a/Preferences/Indent.tmPreferences
+++ b/Preferences/Indent.tmPreferences
@@ -10,20 +10,20 @@
 	<dict>
 		<key>decreaseIndentPattern</key>
 		<string>(?x)^ \s* (?!//|/\*)
-		#      (nothing | ( string                                     | no parens             )+  | (no parens? (nested parens                             ) no parens?)+  )           Close
-		(      (?:      | ( (?&lt;str&gt; '(\\'|[^'])*+' | "(\\"|[^"])*+" | /(\\/|[^/])*+/) | (?&lt;noR&gt;[^\[\]'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \[ (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \] ) \g&lt;noR&gt;?  )++ ) \]
-		|      (?:      | ( \g&lt;str&gt;                                    | (?&lt;noS&gt;[^\(\)'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \( (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \) ) \g&lt;noS&gt;?  )++ ) \)
-		|      (?:      | ( \g&lt;str&gt;                                    | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ ) \}
+		#      (nothing |( string                                                                             | no parens/string      )++ | (no parens? (nested parens                                       ) no parens?)+  ) Close
+		(      (?:      |( (?&lt;str&gt; (?&lt;!\\)'(\\'|[^'])*+' | (?&lt;!\\)"(\\"|[^"])*+" | (?&lt;!\\)/(\\/|[^/])*+/) | (?&lt;noS&gt;[^\[\]'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \[ (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \] ) \g&lt;noS&gt;?  )++ ) \]
+		|      (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noR&gt;[^\(\)'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \( (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \) ) \g&lt;noR&gt;?  )++ ) \)
+		|      (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ ) \}
 		| \b(?:case|default)\b
 			(\g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;noC&gt;? \g&lt;curly&gt; \b&lt;noC&gt;?)++ (?!\})
 			$
 		)</string>
 		<key>increaseIndentPattern</key>
 		<string>(?x)^ \s* (?!//|/\*)([^\s].*)?
-		# Open (nothing | ( string                                     | no parens             )+  | (no parens? (nested parens                             ) no parens?)+  )
-		( \[   (?:      | ( (?&lt;str&gt; '(\\'|[^'])*+' | "(\\"|[^"])*+" | /(\\/|[^/])*+/) | (?&lt;noR&gt;[^\[\]'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \[ (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \] ) \g&lt;noR&gt;?  )++ )
-		| \(   (?:      | ( \g&lt;str&gt;                                    | (?&lt;noS&gt;[^\(\)'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \( (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \) ) \g&lt;noS&gt;?  )++ )
-		| \{   (?:      | ( \g&lt;str&gt;                                    | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ )
+		# Open (nothing |( string                                                                             | no parens/string      )++ | (no parens? (nested parens                                       ) no parens?)+  )
+		( \[   (?:      |( (?&lt;str&gt; (?&lt;!\\)'(\\'|[^'])*+' | (?&lt;!\\)"(\\"|[^"])*+" | (?&lt;!\\)/(\\/|[^/])*+/) | (?&lt;noS&gt;[^\[\]'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \[ (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \] ) \g&lt;noS&gt;?  )++ )
+		| \(   (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noR&gt;[^\(\)'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \( (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \) ) \g&lt;noR&gt;?  )++ )
+		| \{   (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ )
 		| \b(?:case|default)\b
 			(\g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;noC&gt;? \g&lt;curly&gt; \b&lt;noC&gt;?)++ (?!\})
 		)$</string>
diff --git a/Syntaxes/JavaScript Basic.tmLanguage b/Syntaxes/JavaScript Basic.tmLanguage
index ff69a8c..6ea1386 100644
--- a/Syntaxes/JavaScript Basic.tmLanguage	
+++ b/Syntaxes/JavaScript Basic.tmLanguage	
@@ -12,17 +12,17 @@
 	</array>
 	<key>foldingStartMarker</key>
 	<string>(?x)^ \s* (?!//|/\*)([^\s].*)?
-		# Open (nothing | ( string                                     | no parens             )+  | (no parens? (nested parens                             ) no parens?)+  )
-		( \[   (?:      | ( (?&lt;str&gt; '(\\'|[^'])*+' | "(\\"|[^"])*+" | /(\\/|[^/])*+/) | (?&lt;noR&gt;[^\[\]'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \[ (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \] ) \g&lt;noR&gt;?  )++ )
-		| \(   (?:      | ( \g&lt;str&gt;                                    | (?&lt;noS&gt;[^\(\)'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \( (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \) ) \g&lt;noS&gt;?  )++ )
-		| \{   (?:      | ( \g&lt;str&gt;                                    | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ )
+		# Open (nothing |( string                                                                             | no parens/string      )++ | (no parens? (nested parens                                       ) no parens?)+  )
+		( \[   (?:      |( (?&lt;str&gt; (?&lt;!\\)'(\\'|[^'])*+' | (?&lt;!\\)"(\\"|[^"])*+" | (?&lt;!\\)/(\\/|[^/])*+/) | (?&lt;noS&gt;[^\[\]'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \[ (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \] ) \g&lt;noS&gt;?  )++ )
+		| \(   (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noR&gt;[^\(\)'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \( (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \) ) \g&lt;noR&gt;?  )++ )
+		| \{   (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ )
 		)$</string>
 	<key>foldingStopMarker</key>
 	<string>(?x)^ \s* (?!//|/\*)
-		#      (nothing | ( string                                     | no parens             )+  | (no parens? (nested parens                             ) no parens?)+  )           Close
-		(      (?:      | ( (?&lt;str&gt; '(\\'|[^'])*+' | "(\\"|[^"])*+" | /(\\/|[^/])*+/) | (?&lt;noR&gt;[^\[\]'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \[ (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \] ) \g&lt;noR&gt;?  )++ ) \]
-		|      (?:      | ( \g&lt;str&gt;                                    | (?&lt;noS&gt;[^\(\)'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \( (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \) ) \g&lt;noS&gt;?  )++ ) \)
-		|      (?:      | ( \g&lt;str&gt;                                    | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ ) \}
+		#      (nothing |( string                                                                             | no parens/string      )++ | (no parens? (nested parens                                       ) no parens?)+  ) Close
+		(      (?:      |( (?&lt;str&gt; (?&lt;!\\)'(\\'|[^'])*+' | (?&lt;!\\)"(\\"|[^"])*+" | (?&lt;!\\)/(\\/|[^/])*+/) | (?&lt;noS&gt;[^\[\]'"/]++) )++ | (\g&lt;noS&gt;?   (?&lt;squar&gt; \[ (?: \g&lt;str&gt; | \g&lt;noS&gt; | \g&lt;squar&gt; )* \] ) \g&lt;noS&gt;?  )++ ) \]
+		|      (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noR&gt;[^\(\)'"/]++) )++ | (\g&lt;noR&gt;?   (?&lt;round&gt; \( (?: \g&lt;str&gt; | \g&lt;noR&gt; | \g&lt;round&gt; )* \) ) \g&lt;noR&gt;?  )++ ) \)
+		|      (?:      |( \g&lt;str&gt;                                                                            | (?&lt;noC&gt;[^\{\}'"/]++) )++ | (\g&lt;noC&gt;?   (?&lt;curly&gt; \{ (?: \g&lt;str&gt; | \g&lt;noC&gt; | \g&lt;curly&gt; )* \} ) \g&lt;noC&gt;?  )++ ) \}
 		)</string>
 	<key>keyEquivalent</key>
 	<string>^~J</string>
diff --git a/Tests/Javascript Folding & Indent.js b/Tests/Javascript Folding & Indent.js
index 5de7340..d3bbdc6 100644
--- a/Tests/Javascript Folding & Indent.js	
+++ b/Tests/Javascript Folding & Indent.js	
@@ -584,6 +584,120 @@ myFunction('   ) ')
 myFunction('\' ) ')
 myFunction(/  \) /)
 myFunction(/\/\) /)
+// No Fold; No Indent
+function(){"[  ]"}
+function(){"[\"]"}
+function(){'[  ]'}
+function(){'[\']'}
+function(){/[  ]/}
+function(){/[\/]/}
+function(){"(  )"}
+function(){"(\")"}
+function(){'(  )'}
+function(){'(\')'}
+function(){/(  )/}
+function(){/(\/)/}
+function(){"{  }"}
+function(){"{\"}"}
+function(){'{  }'}
+function(){'{\'}'}
+function(){/{  }/}
+function(){/{\/}/}
+// No Fold; No Indent
+myArray = ["[  ]"]
+myArray = ["[\"]"]
+myArray = ['[  ]']
+myArray = ['[\']']
+myArray = [/[  ]/]
+myArray = [/[\/]/]
+myArray = ["(  )"]
+myArray = ["(\")"]
+myArray = ['(  )']
+myArray = ['(\')']
+myArray = [/(  )/]
+myArray = [/(\/)/]
+myArray = ["{  }"]
+myArray = ["{\"}"]
+myArray = ['{  }']
+myArray = ['{\'}']
+myArray = [/{  }/]
+myArray = [/{\/}/]
+// No Fold; No Indent
+myFunction("[  ]")
+myFunction("[\"]")
+myFunction('[  ]')
+myFunction('[\']')
+myFunction(/[  ]/)
+myFunction(/[\/]/)
+myFunction("(  )")
+myFunction("(\")")
+myFunction('(  )')
+myFunction('(\')')
+myFunction(/(  )/)
+myFunction(/(\/)/)
+myFunction("{  }")
+myFunction("{\"}")
+myFunction('{  }')
+myFunction('{\'}')
+myFunction(/{  }/)
+myFunction(/{\/}/)
+// No Fold; No Indent
+function(){"[  "}
+function(){"[\""}
+function(){'[  '}
+function(){'[\''}
+function(){/[  /}
+function(){/[\//}
+function(){"(  "}
+function(){"(\""}
+function(){'(  '}
+function(){'(\''}
+function(){/(  /}
+function(){/(\//}
+function(){"{  "}
+function(){"{\""}
+function(){'{  '}
+function(){'{\''}
+function(){/{  /}
+function(){/{\//}
+// No Fold; No Indent
+myArray = ["[  ]"]
+myArray = ["[\"]"]
+myArray = ['[  ]']
+myArray = ['[\']']
+myArray = [/[  ]/]
+myArray = [/[\/]/]
+myArray = ["(  )"]
+myArray = ["(\")"]
+myArray = ['(  )']
+myArray = ['(\')']
+myArray = [/(  )/]
+myArray = [/(\/)/]
+myArray = ["{  }"]
+myArray = ["{\"}"]
+myArray = ['{  }']
+myArray = ['{\'}']
+myArray = [/{  }/]
+myArray = [/{\/}/]
+// No Fold; No Indent
+myFunction("[  ]")
+myFunction("[\"]")
+myFunction('[  ]')
+myFunction('[\']')
+myFunction(/[  ]/)
+myFunction(/[\/]/)
+myFunction("(  )")
+myFunction("(\")")
+myFunction('(  )')
+myFunction('(\')')
+myFunction(/(  )/)
+myFunction(/(\/)/)
+myFunction("{  }")
+myFunction("{\"}")
+myFunction('{  }')
+myFunction('{\'}')
+myFunction(/{  }/)
+myFunction(/{\/}/)
 
 
 // ============
@@ -618,3 +732,25 @@ function(){
 []
 {}
 
+
+
+// More Strings
+// ============
+"[\"]"
+"(\")"
+"{\"}"
+
+"]\"["
+")\"("
+"}\"{"
+
+'[\']'
+'(\')'
+'{\'}'
+
+']\'['
+')\'('
+'}\'{'
+
+
+