diff --git a/apps/guitarsongs/ChangeLog b/apps/guitarsongs/ChangeLog
new file mode 100644
index 000000000..dda3f0fd1
--- /dev/null
+++ b/apps/guitarsongs/ChangeLog
@@ -0,0 +1,2 @@
+0.01: First Release
+0.02: WIP
diff --git a/apps/guitarsongs/README.md b/apps/guitarsongs/README.md
new file mode 100644
index 000000000..12af8a9f4
--- /dev/null
+++ b/apps/guitarsongs/README.md
@@ -0,0 +1,22 @@
+# Guitar Songs
+
+Upload lyrics and chords to your BangleJS2. Play songs at the camp fire.
+
+![screenshot](screenshot.png)
+
+## Usage
+
+Install the app. Use the App Loader to add songs to the watch.
+
+You can scroll through the chords by dragging your finger left and right.
+
+You can scroll the lyrics by dragging it up and down.
+
+## Attribution
+
+[Fire icon created by Freepik - Flaticon](https://www.flaticon.com/free-icons/fire)
+
+## Credits
+
+Created by: devsnd
+Inspired by: NovaDawn999
diff --git a/apps/guitarsongs/app-icon.js b/apps/guitarsongs/app-icon.js
new file mode 100644
index 000000000..554372bb0
--- /dev/null
+++ b/apps/guitarsongs/app-icon.js
@@ -0,0 +1 @@
+require("heatshrink").decompress(atob("mEwwg967oABCaHQAYUNDCISBC4wfDC5gQCC4YYPC5BJOC65MFJCQXIGCIXGGAY0MC5K2EC54TCMhoWGC5YHEC5RBIIxREKC4gWHC5QLDFwXu9oXSCAXuDAoXILIYDD7wYBeJhxHC4QwEC6QwEaB4WCGAgXYDIxGKVQwXJLAQXESJYXGCYPjmYXPFYPtFwQXTAAczmc+C6fj+YXNa4QXEn//C43QC5kz/4XBMAPtVIQXM8YWBC4bBDC4xgCC4RFBC5AWGC4guDC55IBC4IuDC4xGHC5peJPAfdCQIAEVAdACglEABVDDAM97vUqgGBkUAggXLGAQXBotUCwM0oAWLC4cz6tUokyGANCIxwABooGBmkzmQuMoQXDDwQXBmgXMI4gGCmRFBoR3PFIYECVYJgOAwtEbQ4AoA"))
diff --git a/apps/guitarsongs/app.js b/apps/guitarsongs/app.js
new file mode 100644
index 000000000..a12fa842b
--- /dev/null
+++ b/apps/guitarsongs/app.js
@@ -0,0 +1,241 @@
+const chords = [
+  // name: [name, placement, fingers, fret],
+  // sourced from https://github.com/spilth/chord_diagrams/blob/main/lib/chord_diagrams/fingerings.csv
+  ['A', 'x02220', '', 0],
+  ['B', 'x24442', '', 0],
+  ['Bb', 'x13331', '', 0],
+  ['C', 'x32010', '', 0],
+  ['C#', 'x46664', '', 0],
+  ['D', 'xx0232', '', 0],
+  ['D#', 'x68886', '', 0],
+  ['E', '022100', '', 0],
+  ['Eb', 'x68886', '', 0],
+  ['F', '133211', '', 0],
+  ['F#', '244322', '', 0],
+  ['G', '320003', '', 0],
+  ['G#', '466544', '', 0],
+  ['C5', 'x355xx', '', 0],
+  ['D5', 'x577xx', '', 0],
+  ['D#5', 'x688xx', '', 0],
+  ['C6', 'x32210', '', 0],
+  ['D6', 'xx0202', '', 0],
+  ['E6', '022120', '', 0],
+  ['G6', '320000', '', 0],
+  ['A7', '002020', '', 0],
+  ['B7', 'x21202', '', 0],
+  ['C7', 'x32310', '', 0],
+  ['C#7', 'x46464', '', 0],
+  ['D7', 'x00212', '', 0],
+  ['E7', '020100', '', 0],
+  ['E7sus4', '020200', '', 0],
+  ['F7', '131211', '', 0],
+  ['F#7', '242322', '', 0],
+  ['G7', '320001', '', 0],
+  ['G#7', '464544', '', 0],
+  ['AM7', 'x02120', '', 0],
+  ['CM7', 'x32000', '', 0],
+  ['DM7', 'xx0222', '', 0],
+  ['EM7', 'xx2444', '', 0],
+  ['FM7', '132211', '', 0],
+  ['Cadd9', 'x32033', '', 0],
+  ['Fadd9', 'xx3213', '', 0],
+  ['Dsus2', 'xx0230', '', 0],
+  ['Asus2', 'x02200', '', 0],
+  ['Asus4', 'x02230', '', 0],
+  ['Dsus4', 'xx0233', '', 0],
+  ['Esus4', '022200', '', 0],
+  ['A7sus4', '002030', '', 0],
+  ['G7sus4', '353533', '', 0],
+  ['G+', 'x21003', '', 0],
+  ['Am', '002210', '', 0],
+  ['Bm', 'x24432', '', 0],
+  ['Cm', 'x35543', '', 0],
+  ['C#m', 'x46654', '', 0],
+  ['Dm', 'x00231', '', 0],
+  ['Em', '022000', '', 0],
+  ['Fm', '133111', '', 0],
+  ['F#m', '244222', '', 0],
+  ['Gm', '355333', '', 0],
+  ['G#m', '466444', '', 0],
+  ['Am7', '002010', '', 0],
+  ['A#m7', 'x13121', '', 0],
+  ['Bm7', 'x24232', '', 0],
+  ['Cm7', 'x35343', '', 0],
+  ['C#m7', 'x46454', '', 0],
+  ['Dm7', 'x00211', '', 0],
+  ['Em7', '020030', '', 0],
+  ['Fm7', '131111', '', 0],
+  ['F#m7', '242222', '', 0],
+  ['Gm7', '353333', '', 0],
+  ['Am9', 'x05557', '', 0],
+  ['Bm11', 'x20220', '', 0],
+  ['F#m11', '202200', '', 0],
+  ['A/C#', '042220', '', 0],
+  ['A/E', '00222x', '', 0],
+  ['A/F#', '202220', '', 0],
+  ['Bb/A', 'x00331', '', 0],
+  ['C/B', 'x22010', '', 0],
+  ['C/E', '032010', '', 0],
+  ['D/A', 'x04232', '', 0],
+  ['D/F#', '200232', '', 0],
+  ['F/A', 'x03211', '', 0],
+  ['G/B', 'x20003', '', 0],
+  ['C7/G', '3323xx', '', 0],
+  ['D7/F#', '200212', '', 0],
+  ['G7/F', '123003', '', 0],
+  ['D9/F#', '2x0210', '', 0],
+  ['Am/D', 'xx0210', '', 0],
+  ['Am/G', '302210', '', 0],
+  ['A#m/D#', 'xx1321', '', 0],
+  ['Dm/F', '10323x', '', 0],
+  ['Gm/Bb', 'x10333', '', 0],
+  ['A7/G', '302020', '', 0],
+  ['G#dim', '4564xx', '', 0],
+  ['Adim', 'x01212', '', 0],
+  ['D#dim7', 'xx1212', '', 0],
+  ['G#dim7', '456464', '', 0],
+  ['Daug', 'xx0332', '', 0],
+  ['Aaug', 'x03221', '', 0],
+  ['Dadd11', 'xx0032', '', 0],
+]
+
+const chordHeight = 85;
+const chordWidth = 80;
+
+const chordOptions = {
+  stringWidths: 12,
+  fretHeight: 14,
+  circleSize: 4,
+  drawFinger: false,
+  drawCircleRim: false,
+}
+
+const chordCache = {};
+function drawChordCached(chord, x, y, options) {
+  let image;
+  if (chordCache[chord[0]]) {
+    image = chordCache[chord[0]]
+  } else {
+    arrbuff = Graphics.createArrayBuffer(chordWidth,chordHeight,1,{msb:true});
+    drawChord(arrbuff, chord, 0, 0, options);
+    image = {width: arrbuff.getWidth(), height: arrbuff.getHeight(), bpp:arrbuff.getBPP(), buffer: arrbuff.buffer, transparent:0}
+    chordCache[chord[0]] = image;
+  }
+  g.drawImage(image, x, y);
+}
+
+
+function drawChord(buffer, chord, x, y, options) {
+  const stringWidths = options.stringWidths;
+  const fretHeight = options.fretHeight;
+  const circleSize = options.circleSize;
+  const drawFinger = options.drawFinger;
+  const drawCircleRim = options.drawCircleRim;
+
+  const name = chord[0];
+  chord = chord.slice(1);
+  x += 3;
+  buffer.setFont('6x8').setColor(0x1).setFontAlign(-1, -1).drawString(name, x, y);
+  y += 15;
+  for (let i = 0; i < 6; i++) {
+    buffer.drawLine(x + i * stringWidths, y, x + i * stringWidths, y + fretHeight*4);
+  }
+  for (let i = 0; i < 5; i++) {
+    buffer.fillRect(x - 1, y + i * fretHeight - 1, x + stringWidths * 5 + 1, y + i * fretHeight + 1);
+  }
+
+  for (let i = 0; i < 6; i++) {
+      const placement = chord[0];
+      const fingers = chord[1];
+      const xPos = x + i * stringWidths;
+      let yPos = y + fretHeight * parseInt(placement[i]) - fretHeight/2
+
+      if (placement[i] === "0") {
+        buffer.setColor(0x1).drawCircle(xPos, y - 5, 2);
+        continue;
+      } else if (placement[i] === "x") {
+        buffer.setFontAlign(0, 0);
+        buffer.setColor(0x1).drawString('x', xPos, y - 5);
+        continue;
+      }
+      buffer.setFontAlign(0, 0);
+      if (drawFinger && chord[i].length>1) {
+        buffer.setColor(0x0).fillCircle(xPos, yPos, circleSize);
+        if (drawCircleRim) {
+          buffer.setColor(0x1).drawCircle(xPos, yPos, circleSize);
+        }
+        if (parseInt(fingers[i])) {
+          buffer.setColor(0x1).drawString(fingers[i], xPos, yPos);
+        }
+      } else {
+        buffer.setColor(0x1).fillCircle(xPos, yPos, circleSize);
+        buffer.setFontAlign(0, -1)
+        if (parseInt(fingers[i])) {
+          buffer.setColor(0x1).drawString(fingers[i], xPos, y + fretHeight*4 + 2);
+        }
+      }
+  }
+  if (chord[2] !== 0) {
+    buffer.setFontAlign(-1, -1);
+    buffer.drawString(chord[2] + 'fr', x + 5 * stringWidths + 2, y);
+  }
+}
+
+
+
+function drawApp(lyricsLines, chordsDraw, scrollY, chordScrollX) {
+  const R = Bangle.appRect;
+
+  g.setFont('6x8');
+  if (scrollY < chordHeight) {
+    for (let i=0; i<chordsDraw.length; i++) {
+      drawChordCached(chordsDraw[i], 3 + i*chordWidth + chordScrollX, R.y + scrollY, chordOptions);
+    }
+  }
+  const lineHeight = g.stringMetrics(' ').height;
+  for (let i=0; i<lyricsLines.length; i++){
+    const y = R.y + lineHeight * i + chordHeight + scrollY;
+    if (y < -lineHeight) continue;
+    if (y > R.y2) break;
+    g.setFontAlign(-1, -1).drawString(lyricsLines[i], R.x, y);
+  }
+}
+
+let currentScrollY = 0;
+let chordScrollX = 0;
+let currentChordScroll = 0;
+let lyricsHeight = 0;
+
+function main(song) {
+  const lyrics = song.lyrics;
+  const foundChords = song.chords;
+  const lyricsLines = lyrics.split('\n');
+  const chordsDraw = chords.filter(c=>foundChords.includes(c[0]));
+  const R = Bangle.appRect;
+  g.clear();
+  drawApp(lyricsLines, chordsDraw, currentScrollY, chordScrollX);
+  lyricsHeight = g.stringMetrics(lyrics).height;
+  Bangle.on('drag', (event) => {
+    currentScrollY = Math.min(0, currentScrollY + event.dy);
+    chordScrollX = Math.max(Math.min(0, chordScrollX + event.dx), -(song.chords.length*chordWidth - R.x2));
+    g.clear();
+    drawApp(lyricsLines, chordsDraw, currentScrollY, chordScrollX);
+  })
+}
+
+function mainMenu () {
+  const songs = (
+      require("Storage").readJSON("guitar_songs.json", true) ||
+      [{'name': 'No songs', 'lyrics': 'Em\nPlease upload a song\nAm        A7\nusing the Bangle App Loader', 'chords': ['Am', 'Em', 'A7']}]
+  );
+  const menu = {
+    "": {"title": "Guitar Songs"},
+  };
+  for (let i=0; i<songs.length; i++) {
+    const song = songs[i];
+    menu[song.name] = function() { main(song) };
+  }
+  E.showMenu(menu);
+}
+
+mainMenu();
diff --git a/apps/guitarsongs/app.png b/apps/guitarsongs/app.png
new file mode 100644
index 000000000..d48a06268
Binary files /dev/null and b/apps/guitarsongs/app.png differ
diff --git a/apps/guitarsongs/manage_songs.html b/apps/guitarsongs/manage_songs.html
new file mode 100644
index 000000000..9280d8d96
--- /dev/null
+++ b/apps/guitarsongs/manage_songs.html
@@ -0,0 +1,229 @@
+<html>
+<head>
+  <link rel="stylesheet" href="../../css/spectre.min.css">
+</head>
+<body>
+<script src="../../core/lib/interface.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
+
+<div id="app">
+  <h4>List of Songs</h4>
+  <div v-if="songsState === 'loading'">
+    <button v-on:click="loadSongs">Load Songs</button>
+  </div>
+  <div v-else>
+    <table class="table">
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th>Lyrics</th>
+        <th>chords</th>
+        <th>size</th>
+        <th></th>
+        <th></th>
+      </tr>
+      </thead>
+      <tbody id="songs">
+      <tr v-for="(song, index) in localSongs">
+        <td>{{song.name}}</td>
+        <td>{{song.lyrics.slice(0, 30)}}</td>
+        <td>{{song.chords.join(' ')}}</td>
+        <td>{{song.lyrics.length + song.name.length}}</td>
+        <td><button class="btn" v-on:click="setEditSong(song)">edit</button></td>
+        <td><button class="btn" v-on:click="deleteSong(index)">delete</button></td>
+      </tr>
+      <tr><th colspan="3">
+        <button v-on:click="addNewSong" class="btn">Add new song</button>
+      </th></tr>
+      </tbody>
+    </table>
+    <div v-if="editSong">
+      <div class="modal active" id="modal-id">
+        <a href="#close" class="modal-overlay" aria-label="Close"></a>
+        <div class="modal-container" style="max-height: 95vh;">
+          <div class="modal-header">
+            <div class="modal-title h5">Edit Song</div>
+          </div>
+          <div class="modal-body">
+            <div class="content">
+              <edit-song :song="editSong"></edit-song>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button class="btn btn-primary" v-on:click="setEditSong(null)">Done editing</button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <br>
+    <br>
+
+    <div class="card">
+      <div class="card-body">
+        Size on Bangle Flash: {{watchSongsSize}} Bytes
+        <div v-if="watchSongsSize != localSongsSize">
+          New size: {{localSongsSize}} Bytes
+        </div>
+      </div>
+      <div class="card-footer">
+        <button class="btn" v-on:click="uploadSongs">Upload</button>
+      </div>
+    </div>
+  </div>
+
+</div>
+
+<script>
+  Vue.component('edit-song', {
+    props: ['song'],
+    data: function () {
+      return {
+        newChord: '',
+        builtInChords: [
+          'A', 'B', 'Bb', 'C', 'C#', 'D', 'D#', 'E', 'Eb', 'F', 'F#', 'G', 'G#', 'C5', 'D5', 'D#5',
+          'C6', 'D6', 'E6', 'G6', 'A7', 'B7', 'C7', 'C#7', 'D7', 'E7', 'E7sus4', 'F7', 'F#7', 'G7',
+          'G#7', 'AM7', 'CM7', 'DM7', 'EM7', 'FM7', 'Cadd9', 'Fadd9', 'Dsus2', 'Asus2', 'Asus4',
+          'Dsus4', 'Esus4', 'A7sus4', 'G7sus4', 'G+', 'Am', 'Bm', 'Cm', 'C#m', 'Dm', 'Em', 'Fm',
+          'F#m', 'Gm', 'G#m', 'Am7', 'A#m7', 'Bm7', 'Cm7', 'C#m7', 'Dm7', 'Em7', 'Fm7', 'F#m7',
+          'Gm7', 'Am9', 'Bm11', 'F#m11', 'A/C#', 'A/E', 'A/F#', 'Bb/A', 'C/B', 'C/E', 'D/A', 'D/F#',
+          'F/A', 'G/B', 'C7/G', 'D7/F#', 'G7/F', 'D9/F#', 'Am/D', 'Am/G', 'A#m/D#', 'Dm/F', 'Gm/Bb',
+          'A7/G', 'G#dim', 'Adim', 'D#dim7', 'G#dim7', 'Daug', 'Aaug', 'Dadd11',
+        ]
+      }
+    },
+    computed: {
+      availableChords: function () {
+        const chords  = [...this.builtInChords];
+        for (const chord of this.song.chords) {
+          chords.splice(chords.indexOf(chord), 1)
+        }
+        return chords
+      }
+    },
+    methods: {
+      removeEmptyLines: function () {
+        this.song.lyrics = this.song.lyrics.replace(/\n\s*\n/g, '\n');
+      },
+      autoDetectChords: function () {
+        const regex = '((' + Object.values(this.builtInChords).join('|') + ')(\\n|\\s))';
+        console.log(regex)
+        const matches = this.song.lyrics.match(new RegExp(regex, 'g'));
+        const dedup = matches.reduce((accu, val) => { accu[val.slice(0, -1)]=true; return accu}, {});
+        console.log(dedup);
+        this.song.chords = Object.keys(dedup);
+      },
+      addChord: function (chord) {
+        this.song.chords.push(chord);
+      },
+      removeChord: function (idx) {
+        this.song.chords.splice(idx, 1);
+      }
+    },
+    template: `
+      <div id="add_song_form">
+      <div class="columns">
+        <div class="column col-4 col-xs-12">
+          <input v-model="song.name" class="form-input input-sm" type="text" placeholder="Name">
+        </div>
+        <div>
+          <h3>Chords in this Song</h3>
+          <span v-if="song.chords.length === 0" style="font-size: 80%">
+              Please add chords by clicking the bubbles below, or use the Auto-Detect Button after
+              having inserted the lyrics.
+            </span>
+          <span class="chip" v-for="(chord, idx) in song.chords">
+              {{chord}}
+            <span v-on:click="removeChord(idx)" class="badge" data-badge="x"></span>
+            </span>
+          <h3>Available Chords</h3>
+          <span class="chip" v-for="(chord, idx) in availableChords" v-on:click="addChord(chord)">
+              {{chord}}
+            </span>
+        </div>
+        <div class="column col-12 col-xs-12">
+            <span style="font-size: 80%">
+              Please paste the lyrics and chords in the box below. The width of the text area below is twice the width of the BangleJS2 screen. Everything in the gray area cannot be seen on the screen
+            </span>
+          <div style="width: 60ch;">
+            <textarea
+                    v-model="song.lyrics"
+                    class="form-input input-sm"
+                    aria-label="Song Text"
+                    ref="songText"
+                    style="
+                width: 60ch;
+                font-family: monospace;
+                min-height: 200px;
+                resize:none;
+                overflow-y: scroll;
+                background: rgb(255,255,255);
+                background: linear-gradient(90deg, rgba(255,255,255,1) 50%, rgba(0,0,0,0.20) 50%);
+              "></textarea>
+          </div>
+        </div>
+        <div class="column col-12 col-xs-12">
+          <span class="btn btn-sm" id="remove-empty-lines" v-on:click="removeEmptyLines">Remove empty lines</span>
+          <span class="btn btn-sm" id="remove-empty-lines" v-on:click="autoDetectChords">Auto Detect Chords</span>
+        </div>
+      </div>
+      <br><br>
+      </div>
+    `
+  });
+  var app = new Vue({
+    el: '#app',
+    data: {
+      songsState: 'loading',
+      localSongs: [],
+      watchSongs: [],
+      editSong: null,
+    },
+    computed: {
+      localSongsSize: function() {
+        return JSON.stringify(this.localSongs).length;
+      },
+      watchSongsSize: function() {
+        return JSON.stringify(this.watchSongs).length;
+      },
+    },
+    mounted: function () {
+      this.loadSongs();
+    },
+    methods: {
+      addNewSong: function () {
+        this.songsState = 'modified';
+        const newSong = {
+          name: '', lyrics: '', chords: [],
+        }
+        this.localSongs.push(newSong);
+        this.editSong = newSong;
+      },
+      uploadSongs: function () {
+        Util.writeStorage('guitar_songs.json', JSON.stringify(this.localSongs), () => {
+          this.watchSongs = JSON.parse(JSON.stringify(this.localSongs));
+          alert('Songs written!');
+        })
+      },
+      deleteSong: function (index) {
+        this.localSongs.splice(index, 1);
+      },
+      setEditSong: function (song) {
+        this.editSong = song;
+      },
+      loadSongs: function () {
+        Util.readStorage('guitar_songs.json', (contents) => {
+          this.songsState = 'loaded';
+          this.localSongs = JSON.parse(contents) || [];
+          this.watchSongs = JSON.parse(JSON.stringify(this.localSongs));
+        });
+        window.setTimeout(() => {
+          if (!this.localSongs.length) {
+            this.songsState = 'loaded';
+          }
+        }, 2000);
+      }
+    }
+  })
+</script>
+</body>
+</html>
diff --git a/apps/guitarsongs/metadata.json b/apps/guitarsongs/metadata.json
new file mode 100644
index 000000000..cec4be2fd
--- /dev/null
+++ b/apps/guitarsongs/metadata.json
@@ -0,0 +1,17 @@
+{ "id": "guitarsongs",
+  "name": "Guitar Songs",
+  "shortName":"Guitar Songs",
+  "version":"0.02",
+  "description": "Songs lyrics and guitar chords",
+  "icon": "app.png",
+  "screenshots": [{"url": "screenshot.png"}],
+  "tags": "guitar, song, lyrics, chords",
+  "supports" : ["BANGLEJS2"],
+  "interface": "manage_songs.html",
+  "readme": "README.md",
+  "storage": [
+    {"name":"guitarsongs.app.js","url":"app.js"},
+    {"name":"guitarsongs.img","url":"app-icon.js","evaluate":true}
+  ],
+  "data": [{"name":  "guitar_songs.json"}]
+}
diff --git a/apps/guitarsongs/screenshot.png b/apps/guitarsongs/screenshot.png
new file mode 100644
index 000000000..c2d7fe2ea
Binary files /dev/null and b/apps/guitarsongs/screenshot.png differ