diff --git a/America/A_Horse_With_No_Name.sg b/America/A_Horse_With_No_Name.sg
index 87366dbc..0474b2ea 100644
--- a/America/A_Horse_With_No_Name.sg
+++ b/America/A_Horse_With_No_Name.sg
@@ -1,6 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{A Horse With No Name}[by=America,cov=America,album=America]
+\beginsong{A Horse With No Name}
+  [by=America,cov=America,album=America]
 
   \cover
   \gtab{Em}{022000}
@@ -17,7 +18,7 @@
     The \[Em]first thing I met was a \[D6/9]fly with a buzz
     And the \[Em]sky with no \[D6/9]clouds
     The \[Em]heat was hot and the \[D6/9]ground was dry
-    But the \[Em]air was full of \[D6/9]sound 
+    But the \[Em]air was full of \[D6/9]sound
   \end{verse}
 
   \begin{chorus}
@@ -25,8 +26,8 @@
     It felt \[Em9]good to be out of the \[Dmaj9]rain
     In the \[Em]desert you can't \[Dmaj9]remember your name
     Cause there \[Em]ain't no one for to \[Dmaj9]give you no pain
-    \[Em9]La la la 
-    \[Dmaj9]La la la la la 
+    \[Em9]La la la
+    \[Dmaj9]La la la la la
     \[Em9]La la la
     \[Dmaj9]La la la la la
   \end{chorus}
diff --git a/Razorlight/America.sg b/Razorlight/America.sg
index b11ba827..74c6a370 100644
--- a/Razorlight/America.sg
+++ b/Razorlight/America.sg
@@ -77,7 +77,8 @@
 
 \endsong
 =======
-\beginsong{America}[by=Razorlight,cov=Razorlight,album=Razorlight]
+\beginsong{America}
+  [by=Razorlight,cov=Razorlight,album=Razorlight]
 
   \cover
   \gtab{A}{X02220}
@@ -100,15 +101,15 @@
     That \[E]means that much to \[A]me
   \end{verse*}
 
-  \beginchorus
-    \[A]All my \[B]life  \[E]
+  \begin{chorus}
+    \[A]All my \[B]life \[E]
     Watching \[A]America
     \[A]All my \[B]life \[E]
     There's panic in \[A]America
     \[A]Oh Oh \[B]Oh, Oh\[E]
     There's trouble in \[A]America
     \[A]Oh Oh \[B]Oh, Oh\[E]
-  \endchorus
+  \end{chorus}
 
   \begin{repeatedchords}
     \begin{verse}
@@ -127,8 +128,8 @@
       That I \[E]can believe \[A]in
     \end{verse*}
 
-    \beginchorus
-      \[A]All my \[B]life  \[E]
+    \begin{chorus}
+      \[A]All my \[B]life \[E]
       Watching \[A]America
       \[A]All my \[B]life \[E]
       There's panic in \[A]America
@@ -137,7 +138,7 @@
       \[A]Oh Oh \[B]Oh, Oh\[E]
       There's panic in \[A]America
       \[A]Oh Oh \[B]Oh, Oh\[E]
-    \endchorus
+    \end{chorus}
   \end{repeatedchords}
 
   \begin{verse}
@@ -151,12 +152,12 @@
     \[A]To hold \[B]me,\[E] say you'll \[A]be here
     \[A]To hold \[B]me,\[E] say you'll \[A]be here
     \[A]To hold \[B]me,\[E] say you'll \[A]be here
-    \[A]To hold..\[B]  \[E]
+    \[A]To hold..\[B] \[E]
   \end{verse}
 
   \begin{repeatedchords}
-    \beginchorus
-      \[A]All my \[B]life  \[E]
+    \begin{chorus}
+      \[A]All my \[B]life \[E]
       Watching \[A]America
       \[A]All my \[B]life \[E]
       There's panic in \[A]America
@@ -165,7 +166,7 @@
       \[A]Oh Oh \[B]Oh, Oh\[E]
       There's panic in \[A]America
       \[A]Oh Oh \[B]Oh, Oh\[E]
-    \endchorus
+    \end{chorus}
   \end{repeatedchords}
 
   \begin{verse}
diff --git a/U2/One.sg b/U2/One.sg
index 3fe06128..371e5137 100644
--- a/U2/One.sg
+++ b/U2/One.sg
@@ -1,6 +1,7 @@
 \selectlanguage{english}
 \songcolumns{2}
-\beginsong{One}[by=U2,cov=Achtung-Baby,album=Achtung Baby]
+\beginsong{One}
+  [by=U2,cov=Achtung-Baby,album=Achtung Baby]
 
   \cover
   \gtab{Am}{X02210}