diff --git a/All That's Inside.onsong b/All That's Inside.onsong
index f52020e..970c2ba 100644
--- a/All That's Inside.onsong	
+++ b/All That's Inside.onsong	
@@ -1,22 +1,22 @@
-Title: All That's Inside
-Artist: Jon Thurlow
-Key: [C]
-Original Key: C
-Notes: CANT Key C
-Book: Retreat 2014
-
-Let there b[F]e, No reser[Am]vations, no [G]wall[C/E]s
-[F] But just an[Am] open do[G]or in my[C/E] heart for You
-
-I want to give [F]all that's in[Am]side of my [G]heart [C/E]
-I want to give [F]all that's in[Am]side of my [G]heart to [C/E]You
-
-[Am]Everything else is [F]fading away
-Only [C/E]love, only [G]love remains
-
-[Am]It’s not the riches, [F]it’s not the fame
-[C/E]It’s not the power, it’s [G]not my name
-[Am]Only love, [F]only love, [C/E]only love  [G]
-
-So take the [Am]same love [F]that’s in[C/E]si[G]de Your [Am]heart [F] [C/E] [G]
-And put that [Am]same love [F]deep in[C/E]si[G]de of [Am]me [F] [C/E] [G]
+Title: All That's Inside
+Artist: Jon Thurlow
+Key: [C]
+Original Key: C
+Notes: CANT Key C
+Book: Retreat 2014
+
+Let there b[F]e, No reser[Am]vations, no [G]wall[C/E]s
+[F] But just an[Am] open do[G]or in my[C/E] heart for You
+
+I want to give [F]all that's in[Am]side of my [G]heart [C/E]
+I want to give [F]all that's in[Am]side of my [G]heart to [C/E]You
+
+[Am]Everything else is [F]fading away
+Only [C/E]love, only [G]love remains
+
+[Am]It's not the riches, [F]it's not the fame
+[C/E]It's not the power, it's [G]not my name
+[Am]Only love, [F]only love, [C/E]only love  [G]
+
+So take the [Am]same love [F]that's in[C/E]si[G]de Your [Am]heart [F] [C/E] [G]
+And put that [Am]same love [F]deep in[C/E]si[G]de of [Am]me [F] [C/E] [G]
diff --git a/Forever.onsong b/Forever.onsong
index fdc562a..712c83e 100644
--- a/Forever.onsong
+++ b/Forever.onsong
@@ -1,31 +1,34 @@
-Title: Forever
-Artist: Chris Tomlin
-Key: [A]
-Original Key: A
-Notes: CANT Key F (Guitar E Capo 1)
-Book: Retreat 2014
-
-Verse 1:
-[A]Give thanks to the Lord our [Asus]God and [A]King
-His [Asus]love endures [A]forever
-[d]For He is good, He is above all things
-His love endures fo[A]rever
-Sing[E] praise, sing[D/F#] praise
-
-Verse 2:
-[A]With a mighty hand and o[Asus]utstretched [A]arm
-His [Asus]love endures [A]forever
-[D]For the life that's been reborn
-His love endures[A] forever
-Sing[E] praise, sing[D/F#] praise
-
-Chorus:
-[A]Forever God is faithful,[F#m] Forever God is strong
-[E]Forever God is with us,[D] Forever
-
-Verse 3:
-[A]From the rising to the se[Asus]tting s[A]un
-His [Asus]love endures [A]forever
-[D]By the grace of God we will carry on
-His [Asus]love endures [A]forever
-Sing[E] praise, sing[D/F#] praise
+Title: Forever
+Artist: Chris Tomlin
+Key: [A]
+Original Key: A
+Notes: CANT Key F (Guitar E Capo 1)
+Book: Retreat 2014
+
+Verse 1:
+[A]Give thanks to the Lord our [Asus]God and [A]King
+His [Asus]love endures [A]forever
+[D]For He is good, He is above all things
+His love endures fo[A]rever
+Sing[E] praise, sing[D/F#] praise
+
+Verse 2:
+[A]With a mighty hand and o[Asus]utstretched [A]arm
+His [Asus]love endures [A]forever
+[D]For the life that's been reborn
+His love endures[A] forever
+Sing[E] praise, sing[D/F#] praise
+
+Chorus:
+[A]Forever God is faithful,[F#m] Forever God is strong
+[E]Forever God is with us,[D] Forever
+
+Verse 3:
+[A]From the rising to the se[Asus]tting s[A]un
+His [Asus]love endures [A]forever
+[D]By the grace of God we will carry on
+His [Asus]love endures [A]forever
+Sing[E] praise, sing[D/F#] praise
+
+Bridge:
+His love endures forever (3x)
diff --git a/How Great Thou Art.onsong b/How Great Thou Art.onsong
index 80e7a6d..65709e1 100644
--- a/How Great Thou Art.onsong	
+++ b/How Great Thou Art.onsong	
@@ -1,36 +1,37 @@
-Title: How Great Thou Art
-Artist:
-Key: [A]
-Original Key: A
-Notes: CANT Key A
-Book: Retreat 2014, Hymns
-
-Verse 1:
-[A]O Lord my God when I in [D]awesome wonder
-Consider [A]all the [E]works thy [D]hand has [A]made
-I see the [A]stars, I hear the [D]rolling thunder
-Your power through- [A]out the [E]uni- [D]verse dis- [A]played
-
-Chorus:
-Then sings my [A]soul, my [D]saviour God to [A]thee
-How great thou [E]art, how [D]great thou [A]art
-Then sings my [A]soul, my [D]saviour God to [A]thee
-How great thou [E]art, how [D]great thou [A]art
-
-Verse 2:
-When through the woods, and forest glades I wander,
-And hear the birds sing sweetly in the trees.
-When I look down, from lofty mountain grandeur
-And see the brook, and feel the gentle breeze.
-
-Verse 3:
-And when I think, that God, His Son not sparing;
-Sent Him to die, I scarce can take it in;
-That on the Cross, my burden gladly bearing,
-He bled and died to take away my sin.
-
-Verse 4:
-When Christ shall come, with shout of acclamation,
-And take me home, what joy shall fill my heart.
-Then I shall bow, in humble adoration,
-And then proclaim: "My God, how great Thou art!"
+Title: How Great Thou Art
+Artist:
+Key: [A]
+Original Key: A
+Notes: CANT Key A
+Book: Retreat 2014, Hymns
+Tempo: 60
+
+Verse 1:
+[A]O Lord my God when I in [D]awesome wonder
+Consider [A]all the [E]works thy [D]hand has [A]made
+I see the [A]stars, I hear the [D]rolling thunder
+Your power through- [A]out the [E]uni- [D]verse dis- [A]played
+
+Chorus:
+Then sings my [A]soul, my [D]saviour God to [A]thee
+How great thou [E]art, how [D]great thou [A]art
+Then sings my [A]soul, my [D]saviour God to [A]thee
+How great thou [E]art, how [D]great thou [A]art
+
+Verse 2:
+When through the woods, and forest glades I wander,
+And hear the birds sing sweetly in the trees.
+When I look down, from lofty mountain grandeur
+And see the brook, and feel the gentle breeze.
+
+Verse 3:
+And when I think, that God, His Son not sparing;
+Sent Him to die, I scarce can take it in;
+That on the Cross, my burden gladly bearing,
+He bled and died to take away my sin.
+
+Verse 4:
+When Christ shall come, with shout of acclamation,
+And take me home, what joy shall fill my heart.
+Then I shall bow, in humble adoration,
+And then proclaim: "My God, how great Thou art!"
diff --git a/Jesus Lover of My Soul (It's All About You).onsong b/Jesus Lover of My Soul (It's All About You).onsong
index b95595a..0e4b1c0 100644
--- a/Jesus Lover of My Soul (It's All About You).onsong	
+++ b/Jesus Lover of My Soul (It's All About You).onsong	
@@ -2,14 +2,14 @@ Title: Jesus, Lover of My Soul (It's All About You)
 Artist: Paul Oakley
 Key: [D]
 Original Key: D
-Notes: CANT Key Bb (Guitar A Capo 1)
+Notes: CANT Key C
 Book: Retreat 2014
 
 Verse 1:
 It's all about [Bm]You,[G]  [D]Jes[A]us,
 And all this is f[Bm]or You[G], for Your [D]glory and Your [A]fame
 It's not about [Bm]me,[G] as if [D]You should do things [G]my way,
-[D]You alone are [A]God and I sur[G]render to Your [D]ways [G]
+[Bm]You alone are [A]God and I sur[G]render to Your [D]ways [G]
 
 Chorus:
 [D]Jesu[G]s, [A]Lover of my [D]soul, [G]All consuming [D]fire is in your [Asus]gaze [A]
diff --git a/Jesus Messiah.onsong b/Jesus Messiah.onsong
index f0696bf..2c627e4 100644
--- a/Jesus Messiah.onsong	
+++ b/Jesus Messiah.onsong	
@@ -1,35 +1,35 @@
-Title: Jesus Messiah
-Artist: Chris Tomlin, Daniel Carson, Ed Cash & Jesse Reeves
-Key: [G]
-Original Key: G
-Notes: CANT Key E
-Book: Retreat 2014
-
-Verse 1:
-[G]He became sin
-Who [C2]knew no sin
-That[G/B] we might become His [C2]Righteousness
-He [G]humbled himself and[C2] carried the cross
-
-Pre-Chorus:
-[G/D]Love so am[C2]azing
-[G/D]Love so am[C2]azing
-
-Chorus:
-Jesus[G] Messiah, Name abov[C2]e all names
-Blessed Re[G]deemer, Emma[Dsus]nuel
-The rescue for sin[G]ners, The ransom from He[C2]aven
-Jesus Me[G/B]ssiah,[Dsus] Lord of [G]all
-
-Verse 2:
-His b[G]ody the bread
-His blo[C2]od the wine
-[G/B]Broken and poured out[C2] all for love
-The w[G]hole earth trembled
-And the veil was t[C2]orn
-
-Bridge:
-All our[C2] hope is in[G/B] You
-All our[C2] hope is in[Dsus] You
-All the[C2] glory to[G/B] You, God  [C2]
-The light of the wo[Dsus]rld
+Title: Jesus Messiah
+Artist: Chris Tomlin, Daniel Carson, Ed Cash & Jesse Reeves
+Key: [G]
+Original Key: G
+Notes: CANT Key E
+Book: Retreat 2014
+
+Verse 1:
+[G]He became sin
+Who [C2]knew no sin
+That[G/B] we might become His [C2]Righteousness
+He [G]humbled himself and[C2] carried the cross
+
+Pre-Chorus:
+[G/D]Love so am[C2]azing
+[G/D]Love so am[C2]azing
+
+Chorus:
+Jesus[G] Messiah, Name abov[C2]e all names
+Blessed Re[G]deemer, Emma[Dsus]nuel
+The rescue for sin[G]ners, The ransom from He[C2]aven
+Jesus Me[G/B]ssiah,[Dsus] Lord of [G]all
+
+Verse 2:
+His b[G]ody the bread
+His blo[C2]od the wine
+[G/B]Broken and poured out[C2] all for love
+The w[G]hole earth trembled
+And the veil was t[C2]orn
+
+Bridge:
+All our[C2] hope is in[G/B] You
+All our[C2] hope is in[Dsus] You
+All the[C2] glory to[G/B] You, God  [C2]
+The light of the wo[Dsus]rld
diff --git a/King of Kings and Lord of Lords.onsong b/King of Kings and Lord of Lords.onsong
index 47a52b9..06d3b64 100644
--- a/King of Kings and Lord of Lords.onsong	
+++ b/King of Kings and Lord of Lords.onsong	
@@ -5,13 +5,13 @@ Original Key: G
 Notes: CANT Key E
 Book: Retreat 2014
 
-Bl[G]essing and ho[C]nor and mi[D]ght b[C]e to our Go[D]d
+Bl[G]essing and ho[C]nor and mi[D]ght b[C]e to our Go[G]d [C] [D] [C]
 We w[G]ear our [C]robes washed [D]white
-In the b[C]lood of the La[G]mg
+In the b[C]lood of the La[G]mb [C] [D] [C]
 To [Em]Him who sits on the thr[D]one
 [Em]You created all thi[D]ngs
 Reign [Em]now and forever m[D]ore
-For [C]You are the Ki[G]ng    [C]    [D]
+For You are the Ki[G]ng    [C]    [D]
 
 [C]You are the K[G]ing [C]of ki[D]ngs,
 [C]You are the L[G]ord [C]of l[D]ords,
diff --git a/OnSong.sqlite3 b/OnSong.sqlite3
index fb76a78..f6c61fe 100644
Binary files a/OnSong.sqlite3 and b/OnSong.sqlite3 differ
diff --git a/One Thing Remains.onsong b/One Thing Remains.onsong
index b4de32d..6ece054 100644
--- a/One Thing Remains.onsong	
+++ b/One Thing Remains.onsong	
@@ -1,15 +1,15 @@
-Title: One Thing Remains
-Artist: Jesus Culture
-Key: [G]
-Original Key: G (Starts on C then Capo 4)
-Notes: CANT Key E (Starts on A)
-Book: Retreat 2014
+Title: One Thing Remains
+Artist: Jesus Culture
+Key: [G]
+Original Key: G (Starts on C then Capo 4)
+Notes: CANT Key E (Starts on A)
+Book: Retreat 2014
 
 Verse 1:
 [C]Higher than the [G]mountains that I [D]face
 [C]Stronger than the [G]power of the [D]grave
 [C]Constant in the [G]trial and the [D]change
-One [C]thing… [G]Re[D]mains (repeat)
+One [C]thingÉ [G]Re[D]mains (repeat)
 
 Chorus:
 [Em]Your love never fails, [C]never gives up
@@ -24,7 +24,7 @@ One thing remains
 Brige Intro: [C] [D] [C] [D]
 
 Bridge:
-In [C]death, In [G]life, I’m [D]confident and
+In [C]death, In [G]life, IÕm [D]confident and
 [Am7]covered by the [C]power of [G]Your great [D]love
-My [C]debt is [G]paid, there’s [D]nothing that can
+My [C]debt is [G]paid, thereÕs [D]nothing that can
 [Am7]separate my [C]heart from [G]Your great [D]love
diff --git a/Overcome.onsong b/Overcome.onsong
index 0881ec9..b6dc8af 100644
--- a/Overcome.onsong
+++ b/Overcome.onsong
@@ -1,28 +1,28 @@
-Title: Overcome
-Artist: Jon Egan
-Key: [B]
-Original Key: B
-Notes: CANT Key G
-Book: Retreat 2014
-
-Verse 1:
-[B]Seated above, enthroned in the Father's [E]love
-[G#m7]Destined to die[F#], poured out for all [B]mankind
-[B]God's only son perfect and spotless [E]one
-[G#m7]He never sinned, [F#]but suffered as if he [B]did
-
-Pre-chorus:
-All au[E]thority, ever[G#m7]y victo-[F#]ry is [B]Yours
-All au[E]thority, ever[G#m7]y victo-[F#]ry is [B]Yours
-
-Chorus:
-[B]Savior, worthy of honor and [G#m7]glory, worthy of all our pr[F#]aise, [E]You over[B]came
-[B]Jesus, awesome in power [G#m7]forever, awesome and great is Your [F#]name, [E]You over[B]came
-
-Verse 2:
-[B]Power in hand speaking the Father's [E]plan
-You're[G#m7] sending us out, [F#]light in this broken [B]land
-
-Bridge:
-[E]We will over[B]come by the [G#m7]blood of the Lamb
-And the [F#]word of our testim[E]ony, every[B]one over[F#]come
+Title: Overcome
+Artist: Jon Egan
+Key: [B]
+Original Key: B
+Notes: CANT Key G
+Book: Retreat 2014
+
+Verse 1:
+[B]Seated above, enthroned in the Father's [E]love
+[G#m7]Destined to die[F#], poured out for all [B]mankind
+[B]God's only son perfect and spotless [E]one
+[G#m7]He never sinned, [F#]but suffered as if he [B]did
+
+Pre-chorus:
+All au[E]thority, ever[G#m7]y victo-[F#]ry is [B]Yours
+All au[E]thority, ever[G#m7]y victo-[F#]ry is [B]Yours
+
+Chorus:
+[B]Savior, worthy of honor and [G#m7]glory, worthy of all our pr[F#]aise, [E]You over[B]came
+[B]Jesus, awesome in power [G#m7]forever, awesome and great is Your [F#]name, [E]You over[B]came
+
+Verse 2:
+[B]Power in hand speaking the Father's [E]plan
+You're[G#m7] sending us out, [F#]light in this broken [B]land
+
+Bridge:
+[E]We will over[B]come by the [G#m7]blood of the Lamb
+And the [F#]word of our testim[E]ony, every[B]one over[F#]come
diff --git a/Welcome To OnSong - OnSong Team.onsong b/Welcome To OnSong - OnSong Team.onsong
new file mode 100644
index 0000000..317c216
--- /dev/null
+++ b/Welcome To OnSong - OnSong Team.onsong	
@@ -0,0 +1,37 @@
+Welcome To OnSong
+OnSong Team
+Key: C
+Tempo: 85
+Time: 4/4
+
+Verse 1:
+to get [C]started with OnSong, [F]tap "Songs"
+you can [C]use this to manage your [G]music
+don't for[C]get you can swipe [F]left to right
+and sim[C]ply delete [G]songs you don't [C]like
+
+Verse 2:
+tap the gear icon all the way to the right
+and get help on any topic you need
+or tap the sliders icon almost to the right
+and change how your song looks
+
+Verse 3:
+try out the other menubar options
+and see all that you can do
+like editing and playing songs
+or sharing music with your band
+
+Verse 4:
+to navigate, just swipe or tap
+left or right or up or down
+scroll anywhere you want to go
+tap in the middle for full screen
+
+Bridge:
+Now you can use line formatting to...
+*bold a line of lyrics
+/or italicize it
+!or do both
+&red:or make it red
+>yellow:even highlight it in yellow
\ No newline at end of file
diff --git a/Wrap Me in Your Arms.onsong b/Wrap Me in Your Arms.onsong
index 27c3b70..7f5ef0d 100644
--- a/Wrap Me in Your Arms.onsong	
+++ b/Wrap Me in Your Arms.onsong	
@@ -1,21 +1,21 @@
-Title: Wrap Me In Your Arms
-Artist: Daniel Grothe and Michael Gunger
-Key: [Am]
-Original Key: Am
-Notes: CANT Key F#m
-Book: Retreat 2014
-
-Verse:
-[Am7]There is a [G]God who [F]loves me
-Who [Am7]wraps me [G]in His [F]arms
-Th[Am7]at is the [G]place where I'[F]m changed
-[Am7]That's where [G]I be[F]long
-
-Chorus:
-Take me to that [Am7]place Lord
-To that secret [G/B]place where
-I can be with Y[Em7]ou
-You can make me li[F]ke You
-Wrap me in Your [Am7]arms
-Wrap me in Your [G]arms
-Wrap me in Your [F]arms
+Title: Wrap Me In Your Arms
+Artist: Daniel Grothe and Michael Gunger
+Key: [Am]
+Original Key: Am
+Notes: CANT Key F#m
+Book: Retreat 2014
+
+Verse:
+[Am7]There is a [G]God who [F]loves me
+Who [Am7]wraps me [G]in His [F]arms
+Th[Am7]at is the [G]place where I'[F]m changed
+[Am7]That's where [G]I be[F]long
+
+Chorus:
+Take me to that [Am7]place Lord
+To that secret [G/B]place where
+I can be with Y[Em7]ou
+You can make me li[F]ke You
+Wrap me in Your [Am7]arms
+Wrap me in Your [G]arms
+Wrap me in Your [F]arms
diff --git a/Your Great Name.onsong b/Your Great Name.onsong
index f263402..0f9342e 100644
--- a/Your Great Name.onsong	
+++ b/Your Great Name.onsong	
@@ -1,28 +1,28 @@
-Title: Your Great Name
-Artist: Natalie Grant
-Key: [B]
-Original Key: B
-Notes: CANT Key A (Starts on F#m)
-Book: Retreat 2014
-
-Verse 1:
-Lost are [G#m]saved, find their [E]way, at the [B]sound of your great n[F#]ame
-All con[G#m]demned, feel no [E]shame, at the [B]sound of your great n[F#]ame
-Every [G#m]fear, has no [E]place, at the [B]sound of your great n[F#]ame
-The ene[G#m]my, he has to [E]leave, at the [B]sound of your great n[F#]ame
-
-Chorus:
-[E]Jesu[B]s, Wo[F#]rthy is the [G#m]Lamb that was [E]slain for [B]us, [F#]Son of God and [G#m]Man
-You are [E]high and lifted [B]up, that [F#]all the world will [G#m]praise your great [E]na--[B]--[F#]--me
-
-Verse 2:
-All the [G#m]weak, find their [E]strength, at the [B]sound of your great n[F#]ame
-Hungry s[G#m]ouls, receive [E]grace, at the [B]sound of your great n[F#]ame
-The fathe[G#m]rless, they find their [E]rest, at the [B]sound of your great n[F#]ame
-Sick are [G#m]healed, and the dead are [E]raised, at the [B]sound of your great n[F#]ame
-
-Bridge:
-[F#]Redeem[G#m]er, My Healer, [E]Lord Alm[G#m]ighty [F#]
-[F#]My savio[G#m]r, Defender, [E]You are M[G#m]y King [F#]
-[F#]Redeem[G#m]er, My Heal[E]er, Alm[G#m]ighty [F#]
-[F#]My savi[G#m]or, Defend[E]er, You are My[F#] King [F#]
+Title: Your Great Name
+Artist: Natalie Grant
+Key: [B]
+Original Key: B
+Notes: CANT Key A (Starts on F#m)
+Book: Retreat 2014
+
+Verse 1:
+Lost are [G#m]saved, find their [E]way, at the [B]sound of your great n[F#]ame
+All con[G#m]demned, feel no [E]shame, at the [B]sound of your great n[F#]ame
+Every [G#m]fear, has no [E]place, at the [B]sound of your great n[F#]ame
+The ene[G#m]my, he has to [E]leave, at the [B]sound of your great n[F#]ame
+
+Chorus:
+[E]Jesu[B]s, Wo[F#]rthy is the [G#m]Lamb that was [E]slain for [B]us, [F#]Son of God and [G#m]Man
+You are [E]high and lifted [B]up, that [F#]all the world will [G#m]praise your great [E]na--[B]--[F#]--me
+
+Verse 2:
+All the [G#m]weak, find their [E]strength, at the [B]sound of your great n[F#]ame
+Hungry s[G#m]ouls, receive [E]grace, at the [B]sound of your great n[F#]ame
+The fathe[G#m]rless, they find their [E]rest, at the [B]sound of your great n[F#]ame
+Sick are [G#m]healed, and the dead are [E]raised, at the [B]sound of your great n[F#]ame
+
+Bridge:
+[F#]Redeem[G#m]er, My Healer, [E]Lord Alm[G#m]ighty [F#]
+[F#]My savio[G#m]r, Defender, [E]You are M[G#m]y King [F#]
+[F#]Redeem[G#m]er, My Heal[E]er, Alm[G#m]ighty [F#]
+[F#]My savi[G#m]or, Defend[E]er, You are My[F#] King [F#]