diff --git a/LATINO.YAML-tmLanguage b/LATINO.YAML-tmLanguage
index d50b04e..8d42f1a 100644
--- a/LATINO.YAML-tmLanguage
+++ b/LATINO.YAML-tmLanguage
@@ -30,18 +30,10 @@ patterns:
     "1": {name: comment.block.end.lat }
 
 - comment: Comillas 
-  name: string.quoted.double.lat
-  begin: '"'
-  end: '"'
+  name: string.quoted.lat
+  match: '([\'\"])(?:(?!\1|\\).|\\.)*\1'
   captures:
-    '1': {name: string.quoted.double.lat}
-
-- comment: Comillas 
-  name: string.quoted.single.lat
-  begin: "'"
-  end: "'"
-  captures:
-    '1': {name: string.quoted.single.lat}
+    '1': {name: string.quoted.lat}
 
 #                   INICIO CONSTANTES
 - comment: Constantes 
@@ -65,7 +57,7 @@ patterns:
 #                   INICIO SENTENCIAS DE CONTROL
 - comment: Sentencias de control
   name: keyword.control.lat
-  match: '\b(si|sino|fin|mientras|desde|hasta|elegir|caso|defecto|hacer|cuando|retorno|defecto)\b'
+  match: '\b(si|osi|sino|fin|mientras|desde|hasta|elegir|caso|defecto|hacer|cuando|retorno|defecto)\b'
   captures:
     '1': {name: keyword.control.lat}
 
diff --git a/LATINO.tmLanguage b/LATINO.tmLanguage
index 5e72682..b39d6cd 100644
--- a/LATINO.tmLanguage
+++ b/LATINO.tmLanguage
@@ -61,40 +61,20 @@
 			<string>comment.block.end.latino</string>
 		</dict>
 		<dict>
-			<key>begin</key>
-			<string>"</string>
 			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.double.lat</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>Comillas</string>
-			<key>end</key>
-			<string>"</string>
-			<key>name</key>
-			<string>string.quoted.double.lat</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>string.quoted.single.lat</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>Comillas</string>
-			<key>end</key>
-			<string>'</string>
-			<key>name</key>
-			<string>string.quoted.single.lat</string>
+            <dict>
+                <key>1</key>
+                <dict>
+                    <key>name</key>
+                    <string>string.quoted.lat</string>
+                </dict>
+            </dict>
+            <key>comment</key>
+            <string>Comillas</string>
+            <key>match</key>
+            <string>(['"])(?:(?!\1|\\).|\\.)*\1</string>
+            <key>name</key>
+            <string>string.quoted.lat</string>
 		</dict>
 		<dict>
 			<key>captures</key>
@@ -156,7 +136,7 @@
 			<key>comment</key>
 			<string>Sentencias de control</string>
 			<key>match</key>
-			<string>\b(si|sino|fin|mientras|desde|hasta|elegir|caso|defecto|hacer|cuando|retorno|defecto)\b</string>
+			<string>\b(si|osi|sino|fin|mientras|desde|hasta|elegir|caso|defecto|hacer|cuando|retorno|defecto)\b</string>
 			<key>name</key>
 			<string>keyword.control.lat</string>
 		</dict>