diff --git a/dist.ini b/dist.ini
index a96989a7d..20239b835 100644
--- a/dist.ini
+++ b/dist.ini
@@ -46,8 +46,6 @@ Email::Valid = 1.192
 Net::Domain::TLD = 1.70
 Convert::Pluggable = 0.026
 YAML = 0
-GD = 2.56
-Carp = 1.26
 Encode = 2.62
 ; ParseCron
 Schedule::Cron::Events = 0
@@ -142,4 +140,3 @@ extra_dep = autodie
 after_install = duckpan DDG
 before_install = sudo apt-get update -qq
 before_install = sudo apt-get install -y libmpfr-dev
-before_install = sudo apt-get install -y libgd-dev
diff --git a/lib/DDG/Goodie/GuitarChords.pm b/lib/DDG/Goodie/GuitarChords.pm
index 879be212c..23ce339b2 100644
--- a/lib/DDG/Goodie/GuitarChords.pm
+++ b/lib/DDG/Goodie/GuitarChords.pm
@@ -6,8 +6,9 @@ with 'DDG::GoodieRole::ImageLoader';
 
 # guitar script is stored in share directory
 # including this way, because it limits duplicated code
-my $g = share("Guitar.pm");
+my $g = share("chords.pm");
 require "$g";
+our %chord_lists; #from chords.pm
 
 zci answer_type => 'guitarchord';
 zci is_cached => 1;
@@ -37,8 +38,6 @@ handle remainder => sub
     return;
 };
 
-my $gtr = Guitar->new;
-
 sub check_chord
 {
     if ($_[0] =~ /(?<a>[a-gA-G])(?<b>#|b)?(?<c>dim|min|maj|add|aug|m|M)?(?<d>M|maj|m|min)?(?<e>[0-9])?\s*(?<f>(#|b)?[0-9]+)?/) {
@@ -63,7 +62,7 @@ sub check_chord
         $r .= $d if $d;
         $r .= $e if $e;
         $r .= $f if $f;
-        if ($r ~~ @{$gtr->all_chords}) {
+        if ($r ~~ @{[keys %chord_lists]}) {
             return $r;
         }
     }
@@ -72,7 +71,7 @@ sub check_chord
 
 sub get_chord_img
 {
-    goodie_img_tag({filename=>$_[0].'.png'});
+    goodie_img_tag({filename=>$_[0].'.png', width=>78});
 }
 
 1;
diff --git a/share/goodie/guitar_chords/A#.png b/share/goodie/guitar_chords/A#.png
new file mode 100644
index 000000000..46c446cdb
Binary files /dev/null and b/share/goodie/guitar_chords/A#.png differ
diff --git a/share/goodie/guitar_chords/A#6(9).png b/share/goodie/guitar_chords/A#6(9).png
new file mode 100644
index 000000000..f6690c387
Binary files /dev/null and b/share/goodie/guitar_chords/A#6(9).png differ
diff --git a/share/goodie/guitar_chords/A#6.png b/share/goodie/guitar_chords/A#6.png
new file mode 100644
index 000000000..2cf85cbb0
Binary files /dev/null and b/share/goodie/guitar_chords/A#6.png differ
diff --git a/share/goodie/guitar_chords/A#7(#11).png b/share/goodie/guitar_chords/A#7(#11).png
new file mode 100644
index 000000000..77bd4b5bc
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(#11).png differ
diff --git a/share/goodie/guitar_chords/A#7(#9).png b/share/goodie/guitar_chords/A#7(#9).png
new file mode 100644
index 000000000..e1358e73a
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(#9).png differ
diff --git a/share/goodie/guitar_chords/A#7(13).png b/share/goodie/guitar_chords/A#7(13).png
new file mode 100644
index 000000000..fd434101b
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(13).png differ
diff --git a/share/goodie/guitar_chords/A#7(9).png b/share/goodie/guitar_chords/A#7(9).png
new file mode 100644
index 000000000..d4678ef06
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(9).png differ
diff --git a/share/goodie/guitar_chords/A#7(9,13).png b/share/goodie/guitar_chords/A#7(9,13).png
new file mode 100644
index 000000000..6303a5305
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(9,13).png differ
diff --git a/share/goodie/guitar_chords/A#7(b13).png b/share/goodie/guitar_chords/A#7(b13).png
new file mode 100644
index 000000000..a5f5bb56c
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(b13).png differ
diff --git a/share/goodie/guitar_chords/A#7(b5).png b/share/goodie/guitar_chords/A#7(b5).png
new file mode 100644
index 000000000..63248f072
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(b5).png differ
diff --git a/share/goodie/guitar_chords/A#7(b9).png b/share/goodie/guitar_chords/A#7(b9).png
new file mode 100644
index 000000000..556f48af1
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(b9).png differ
diff --git a/share/goodie/guitar_chords/A#7(b9,13).png b/share/goodie/guitar_chords/A#7(b9,13).png
new file mode 100644
index 000000000..a2f743b1d
Binary files /dev/null and b/share/goodie/guitar_chords/A#7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/A#7.png b/share/goodie/guitar_chords/A#7.png
new file mode 100644
index 000000000..e4a30c946
Binary files /dev/null and b/share/goodie/guitar_chords/A#7.png differ
diff --git a/share/goodie/guitar_chords/A#7sus4.png b/share/goodie/guitar_chords/A#7sus4.png
new file mode 100644
index 000000000..b3a21c31f
Binary files /dev/null and b/share/goodie/guitar_chords/A#7sus4.png differ
diff --git a/share/goodie/guitar_chords/A#M7(9).png b/share/goodie/guitar_chords/A#M7(9).png
new file mode 100644
index 000000000..7fa3a8d49
Binary files /dev/null and b/share/goodie/guitar_chords/A#M7(9).png differ
diff --git a/share/goodie/guitar_chords/A#M7.png b/share/goodie/guitar_chords/A#M7.png
new file mode 100644
index 000000000..dcb7d81ed
Binary files /dev/null and b/share/goodie/guitar_chords/A#M7.png differ
diff --git a/share/goodie/guitar_chords/A#add9.png b/share/goodie/guitar_chords/A#add9.png
new file mode 100644
index 000000000..94381e0d5
Binary files /dev/null and b/share/goodie/guitar_chords/A#add9.png differ
diff --git a/share/goodie/guitar_chords/A#aug.png b/share/goodie/guitar_chords/A#aug.png
new file mode 100644
index 000000000..6e0d661a5
Binary files /dev/null and b/share/goodie/guitar_chords/A#aug.png differ
diff --git a/share/goodie/guitar_chords/A#aug7.png b/share/goodie/guitar_chords/A#aug7.png
new file mode 100644
index 000000000..510601618
Binary files /dev/null and b/share/goodie/guitar_chords/A#aug7.png differ
diff --git a/share/goodie/guitar_chords/A#dim.png b/share/goodie/guitar_chords/A#dim.png
new file mode 100644
index 000000000..5d6c6fc83
Binary files /dev/null and b/share/goodie/guitar_chords/A#dim.png differ
diff --git a/share/goodie/guitar_chords/A#m.png b/share/goodie/guitar_chords/A#m.png
new file mode 100644
index 000000000..815719e91
Binary files /dev/null and b/share/goodie/guitar_chords/A#m.png differ
diff --git a/share/goodie/guitar_chords/A#m6(9).png b/share/goodie/guitar_chords/A#m6(9).png
new file mode 100644
index 000000000..ac2e93bd3
Binary files /dev/null and b/share/goodie/guitar_chords/A#m6(9).png differ
diff --git a/share/goodie/guitar_chords/A#m6.png b/share/goodie/guitar_chords/A#m6.png
new file mode 100644
index 000000000..2cc29f840
Binary files /dev/null and b/share/goodie/guitar_chords/A#m6.png differ
diff --git a/share/goodie/guitar_chords/A#m7(9).png b/share/goodie/guitar_chords/A#m7(9).png
new file mode 100644
index 000000000..970a5147f
Binary files /dev/null and b/share/goodie/guitar_chords/A#m7(9).png differ
diff --git a/share/goodie/guitar_chords/A#m7(9,11).png b/share/goodie/guitar_chords/A#m7(9,11).png
new file mode 100644
index 000000000..5eef804b9
Binary files /dev/null and b/share/goodie/guitar_chords/A#m7(9,11).png differ
diff --git a/share/goodie/guitar_chords/A#m7(b5).png b/share/goodie/guitar_chords/A#m7(b5).png
new file mode 100644
index 000000000..bfe7334ac
Binary files /dev/null and b/share/goodie/guitar_chords/A#m7(b5).png differ
diff --git a/share/goodie/guitar_chords/A#m7.png b/share/goodie/guitar_chords/A#m7.png
new file mode 100644
index 000000000..20d32cd7d
Binary files /dev/null and b/share/goodie/guitar_chords/A#m7.png differ
diff --git a/share/goodie/guitar_chords/A#mM7.png b/share/goodie/guitar_chords/A#mM7.png
new file mode 100644
index 000000000..7a19fb8ed
Binary files /dev/null and b/share/goodie/guitar_chords/A#mM7.png differ
diff --git a/share/goodie/guitar_chords/A#sus4.png b/share/goodie/guitar_chords/A#sus4.png
new file mode 100644
index 000000000..f3d14614c
Binary files /dev/null and b/share/goodie/guitar_chords/A#sus4.png differ
diff --git a/share/goodie/guitar_chords/A.png b/share/goodie/guitar_chords/A.png
new file mode 100644
index 000000000..361990bb6
Binary files /dev/null and b/share/goodie/guitar_chords/A.png differ
diff --git a/share/goodie/guitar_chords/A6(9).png b/share/goodie/guitar_chords/A6(9).png
new file mode 100644
index 000000000..060d0c9a7
Binary files /dev/null and b/share/goodie/guitar_chords/A6(9).png differ
diff --git a/share/goodie/guitar_chords/A6.png b/share/goodie/guitar_chords/A6.png
new file mode 100644
index 000000000..aea576cb9
Binary files /dev/null and b/share/goodie/guitar_chords/A6.png differ
diff --git a/share/goodie/guitar_chords/A7(#11).png b/share/goodie/guitar_chords/A7(#11).png
new file mode 100644
index 000000000..20fb61e6a
Binary files /dev/null and b/share/goodie/guitar_chords/A7(#11).png differ
diff --git a/share/goodie/guitar_chords/A7(#9).png b/share/goodie/guitar_chords/A7(#9).png
new file mode 100644
index 000000000..7e95037bd
Binary files /dev/null and b/share/goodie/guitar_chords/A7(#9).png differ
diff --git a/share/goodie/guitar_chords/A7(13).png b/share/goodie/guitar_chords/A7(13).png
new file mode 100644
index 000000000..1c0ce57fc
Binary files /dev/null and b/share/goodie/guitar_chords/A7(13).png differ
diff --git a/share/goodie/guitar_chords/A7(9).png b/share/goodie/guitar_chords/A7(9).png
new file mode 100644
index 000000000..7f35a8c13
Binary files /dev/null and b/share/goodie/guitar_chords/A7(9).png differ
diff --git a/share/goodie/guitar_chords/A7(9,13).png b/share/goodie/guitar_chords/A7(9,13).png
new file mode 100644
index 000000000..8f6d9a122
Binary files /dev/null and b/share/goodie/guitar_chords/A7(9,13).png differ
diff --git a/share/goodie/guitar_chords/A7(b13).png b/share/goodie/guitar_chords/A7(b13).png
new file mode 100644
index 000000000..e91c44f5d
Binary files /dev/null and b/share/goodie/guitar_chords/A7(b13).png differ
diff --git a/share/goodie/guitar_chords/A7(b5).png b/share/goodie/guitar_chords/A7(b5).png
new file mode 100644
index 000000000..470883370
Binary files /dev/null and b/share/goodie/guitar_chords/A7(b5).png differ
diff --git a/share/goodie/guitar_chords/A7(b9).png b/share/goodie/guitar_chords/A7(b9).png
new file mode 100644
index 000000000..b5cc659b9
Binary files /dev/null and b/share/goodie/guitar_chords/A7(b9).png differ
diff --git a/share/goodie/guitar_chords/A7(b9,13).png b/share/goodie/guitar_chords/A7(b9,13).png
new file mode 100644
index 000000000..415ef1599
Binary files /dev/null and b/share/goodie/guitar_chords/A7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/A7.png b/share/goodie/guitar_chords/A7.png
new file mode 100644
index 000000000..e89ce49fb
Binary files /dev/null and b/share/goodie/guitar_chords/A7.png differ
diff --git a/share/goodie/guitar_chords/A7sus4.png b/share/goodie/guitar_chords/A7sus4.png
new file mode 100644
index 000000000..e9b5465b9
Binary files /dev/null and b/share/goodie/guitar_chords/A7sus4.png differ
diff --git a/share/goodie/guitar_chords/AM7(9).png b/share/goodie/guitar_chords/AM7(9).png
new file mode 100644
index 000000000..95d2d1092
Binary files /dev/null and b/share/goodie/guitar_chords/AM7(9).png differ
diff --git a/share/goodie/guitar_chords/AM7.png b/share/goodie/guitar_chords/AM7.png
new file mode 100644
index 000000000..f575cbd04
Binary files /dev/null and b/share/goodie/guitar_chords/AM7.png differ
diff --git a/share/goodie/guitar_chords/Aadd9.png b/share/goodie/guitar_chords/Aadd9.png
new file mode 100644
index 000000000..0378aabf1
Binary files /dev/null and b/share/goodie/guitar_chords/Aadd9.png differ
diff --git a/share/goodie/guitar_chords/Aaug.png b/share/goodie/guitar_chords/Aaug.png
new file mode 100644
index 000000000..160981d08
Binary files /dev/null and b/share/goodie/guitar_chords/Aaug.png differ
diff --git a/share/goodie/guitar_chords/Aaug7.png b/share/goodie/guitar_chords/Aaug7.png
new file mode 100644
index 000000000..c3d3be276
Binary files /dev/null and b/share/goodie/guitar_chords/Aaug7.png differ
diff --git a/share/goodie/guitar_chords/Ab.png b/share/goodie/guitar_chords/Ab.png
new file mode 100644
index 000000000..31d26117e
Binary files /dev/null and b/share/goodie/guitar_chords/Ab.png differ
diff --git a/share/goodie/guitar_chords/Ab6(9).png b/share/goodie/guitar_chords/Ab6(9).png
new file mode 100644
index 000000000..2699fcab4
Binary files /dev/null and b/share/goodie/guitar_chords/Ab6(9).png differ
diff --git a/share/goodie/guitar_chords/Ab6.png b/share/goodie/guitar_chords/Ab6.png
new file mode 100644
index 000000000..3eb333bb9
Binary files /dev/null and b/share/goodie/guitar_chords/Ab6.png differ
diff --git a/share/goodie/guitar_chords/Ab7(#11).png b/share/goodie/guitar_chords/Ab7(#11).png
new file mode 100644
index 000000000..2c2b6e140
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(#11).png differ
diff --git a/share/goodie/guitar_chords/Ab7(#9).png b/share/goodie/guitar_chords/Ab7(#9).png
new file mode 100644
index 000000000..d4673eb6b
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(#9).png differ
diff --git a/share/goodie/guitar_chords/Ab7(13).png b/share/goodie/guitar_chords/Ab7(13).png
new file mode 100644
index 000000000..a3d574549
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(13).png differ
diff --git a/share/goodie/guitar_chords/Ab7(9).png b/share/goodie/guitar_chords/Ab7(9).png
new file mode 100644
index 000000000..fae242e0d
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(9).png differ
diff --git a/share/goodie/guitar_chords/Ab7(9,13).png b/share/goodie/guitar_chords/Ab7(9,13).png
new file mode 100644
index 000000000..62e37ab6b
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(9,13).png differ
diff --git a/share/goodie/guitar_chords/Ab7(b13).png b/share/goodie/guitar_chords/Ab7(b13).png
new file mode 100644
index 000000000..eaa9f7b3b
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(b13).png differ
diff --git a/share/goodie/guitar_chords/Ab7(b5).png b/share/goodie/guitar_chords/Ab7(b5).png
new file mode 100644
index 000000000..25d133664
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(b5).png differ
diff --git a/share/goodie/guitar_chords/Ab7(b9).png b/share/goodie/guitar_chords/Ab7(b9).png
new file mode 100644
index 000000000..a1399d6d2
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(b9).png differ
diff --git a/share/goodie/guitar_chords/Ab7(b9,13).png b/share/goodie/guitar_chords/Ab7(b9,13).png
new file mode 100644
index 000000000..dd852cb5f
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/Ab7.png b/share/goodie/guitar_chords/Ab7.png
new file mode 100644
index 000000000..3dbb5f9d4
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7.png differ
diff --git a/share/goodie/guitar_chords/Ab7sus4.png b/share/goodie/guitar_chords/Ab7sus4.png
new file mode 100644
index 000000000..0d4d58b5c
Binary files /dev/null and b/share/goodie/guitar_chords/Ab7sus4.png differ
diff --git a/share/goodie/guitar_chords/AbM7(9).png b/share/goodie/guitar_chords/AbM7(9).png
new file mode 100644
index 000000000..3521989e5
Binary files /dev/null and b/share/goodie/guitar_chords/AbM7(9).png differ
diff --git a/share/goodie/guitar_chords/AbM7.png b/share/goodie/guitar_chords/AbM7.png
new file mode 100644
index 000000000..4508400d1
Binary files /dev/null and b/share/goodie/guitar_chords/AbM7.png differ
diff --git a/share/goodie/guitar_chords/Abadd9.png b/share/goodie/guitar_chords/Abadd9.png
new file mode 100644
index 000000000..d65ae329d
Binary files /dev/null and b/share/goodie/guitar_chords/Abadd9.png differ
diff --git a/share/goodie/guitar_chords/Abaug.png b/share/goodie/guitar_chords/Abaug.png
new file mode 100644
index 000000000..f217a52bf
Binary files /dev/null and b/share/goodie/guitar_chords/Abaug.png differ
diff --git a/share/goodie/guitar_chords/Abaug7.png b/share/goodie/guitar_chords/Abaug7.png
new file mode 100644
index 000000000..c7d3d3581
Binary files /dev/null and b/share/goodie/guitar_chords/Abaug7.png differ
diff --git a/share/goodie/guitar_chords/Abdim.png b/share/goodie/guitar_chords/Abdim.png
new file mode 100644
index 000000000..d2d80e345
Binary files /dev/null and b/share/goodie/guitar_chords/Abdim.png differ
diff --git a/share/goodie/guitar_chords/Abm.png b/share/goodie/guitar_chords/Abm.png
new file mode 100644
index 000000000..b0a91c769
Binary files /dev/null and b/share/goodie/guitar_chords/Abm.png differ
diff --git a/share/goodie/guitar_chords/Abm6(9).png b/share/goodie/guitar_chords/Abm6(9).png
new file mode 100644
index 000000000..cb55bf25b
Binary files /dev/null and b/share/goodie/guitar_chords/Abm6(9).png differ
diff --git a/share/goodie/guitar_chords/Abm6.png b/share/goodie/guitar_chords/Abm6.png
new file mode 100644
index 000000000..ad79a0acd
Binary files /dev/null and b/share/goodie/guitar_chords/Abm6.png differ
diff --git a/share/goodie/guitar_chords/Abm7(9).png b/share/goodie/guitar_chords/Abm7(9).png
new file mode 100644
index 000000000..3284e1349
Binary files /dev/null and b/share/goodie/guitar_chords/Abm7(9).png differ
diff --git a/share/goodie/guitar_chords/Abm7(9,11).png b/share/goodie/guitar_chords/Abm7(9,11).png
new file mode 100644
index 000000000..70ba77cbd
Binary files /dev/null and b/share/goodie/guitar_chords/Abm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Abm7(b5).png b/share/goodie/guitar_chords/Abm7(b5).png
new file mode 100644
index 000000000..61cfaff85
Binary files /dev/null and b/share/goodie/guitar_chords/Abm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Abm7.png b/share/goodie/guitar_chords/Abm7.png
new file mode 100644
index 000000000..dc72423bd
Binary files /dev/null and b/share/goodie/guitar_chords/Abm7.png differ
diff --git a/share/goodie/guitar_chords/AbmM7.png b/share/goodie/guitar_chords/AbmM7.png
new file mode 100644
index 000000000..2a68c6a7a
Binary files /dev/null and b/share/goodie/guitar_chords/AbmM7.png differ
diff --git a/share/goodie/guitar_chords/Absus4.png b/share/goodie/guitar_chords/Absus4.png
new file mode 100644
index 000000000..e6fbf5cd1
Binary files /dev/null and b/share/goodie/guitar_chords/Absus4.png differ
diff --git a/share/goodie/guitar_chords/Adim.png b/share/goodie/guitar_chords/Adim.png
new file mode 100644
index 000000000..41ccc8a03
Binary files /dev/null and b/share/goodie/guitar_chords/Adim.png differ
diff --git a/share/goodie/guitar_chords/Am.png b/share/goodie/guitar_chords/Am.png
new file mode 100644
index 000000000..ee982a337
Binary files /dev/null and b/share/goodie/guitar_chords/Am.png differ
diff --git a/share/goodie/guitar_chords/Am6(9).png b/share/goodie/guitar_chords/Am6(9).png
new file mode 100644
index 000000000..867015504
Binary files /dev/null and b/share/goodie/guitar_chords/Am6(9).png differ
diff --git a/share/goodie/guitar_chords/Am6.png b/share/goodie/guitar_chords/Am6.png
new file mode 100644
index 000000000..94d6e5259
Binary files /dev/null and b/share/goodie/guitar_chords/Am6.png differ
diff --git a/share/goodie/guitar_chords/Am7(9).png b/share/goodie/guitar_chords/Am7(9).png
new file mode 100644
index 000000000..a3aa364bc
Binary files /dev/null and b/share/goodie/guitar_chords/Am7(9).png differ
diff --git a/share/goodie/guitar_chords/Am7(9,11).png b/share/goodie/guitar_chords/Am7(9,11).png
new file mode 100644
index 000000000..497cdfff9
Binary files /dev/null and b/share/goodie/guitar_chords/Am7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Am7(b5).png b/share/goodie/guitar_chords/Am7(b5).png
new file mode 100644
index 000000000..0aa6a4924
Binary files /dev/null and b/share/goodie/guitar_chords/Am7(b5).png differ
diff --git a/share/goodie/guitar_chords/Am7.png b/share/goodie/guitar_chords/Am7.png
new file mode 100644
index 000000000..05b828f4d
Binary files /dev/null and b/share/goodie/guitar_chords/Am7.png differ
diff --git a/share/goodie/guitar_chords/AmM7.png b/share/goodie/guitar_chords/AmM7.png
new file mode 100644
index 000000000..17268a1eb
Binary files /dev/null and b/share/goodie/guitar_chords/AmM7.png differ
diff --git a/share/goodie/guitar_chords/Asus4.png b/share/goodie/guitar_chords/Asus4.png
new file mode 100644
index 000000000..5f44f80fc
Binary files /dev/null and b/share/goodie/guitar_chords/Asus4.png differ
diff --git a/share/goodie/guitar_chords/B.png b/share/goodie/guitar_chords/B.png
new file mode 100644
index 000000000..2eeed2923
Binary files /dev/null and b/share/goodie/guitar_chords/B.png differ
diff --git a/share/goodie/guitar_chords/B6(9).png b/share/goodie/guitar_chords/B6(9).png
new file mode 100644
index 000000000..2bc492cbe
Binary files /dev/null and b/share/goodie/guitar_chords/B6(9).png differ
diff --git a/share/goodie/guitar_chords/B6.png b/share/goodie/guitar_chords/B6.png
new file mode 100644
index 000000000..d3226f294
Binary files /dev/null and b/share/goodie/guitar_chords/B6.png differ
diff --git a/share/goodie/guitar_chords/B7(#11).png b/share/goodie/guitar_chords/B7(#11).png
new file mode 100644
index 000000000..1ea927af7
Binary files /dev/null and b/share/goodie/guitar_chords/B7(#11).png differ
diff --git a/share/goodie/guitar_chords/B7(#9).png b/share/goodie/guitar_chords/B7(#9).png
new file mode 100644
index 000000000..768d7f225
Binary files /dev/null and b/share/goodie/guitar_chords/B7(#9).png differ
diff --git a/share/goodie/guitar_chords/B7(13).png b/share/goodie/guitar_chords/B7(13).png
new file mode 100644
index 000000000..a7ccb1f10
Binary files /dev/null and b/share/goodie/guitar_chords/B7(13).png differ
diff --git a/share/goodie/guitar_chords/B7(9).png b/share/goodie/guitar_chords/B7(9).png
new file mode 100644
index 000000000..44b1c13c9
Binary files /dev/null and b/share/goodie/guitar_chords/B7(9).png differ
diff --git a/share/goodie/guitar_chords/B7(9,13).png b/share/goodie/guitar_chords/B7(9,13).png
new file mode 100644
index 000000000..88dbab6ff
Binary files /dev/null and b/share/goodie/guitar_chords/B7(9,13).png differ
diff --git a/share/goodie/guitar_chords/B7(b13).png b/share/goodie/guitar_chords/B7(b13).png
new file mode 100644
index 000000000..5a4418b6b
Binary files /dev/null and b/share/goodie/guitar_chords/B7(b13).png differ
diff --git a/share/goodie/guitar_chords/B7(b5).png b/share/goodie/guitar_chords/B7(b5).png
new file mode 100644
index 000000000..f44289671
Binary files /dev/null and b/share/goodie/guitar_chords/B7(b5).png differ
diff --git a/share/goodie/guitar_chords/B7(b9).png b/share/goodie/guitar_chords/B7(b9).png
new file mode 100644
index 000000000..580725873
Binary files /dev/null and b/share/goodie/guitar_chords/B7(b9).png differ
diff --git a/share/goodie/guitar_chords/B7(b9,13).png b/share/goodie/guitar_chords/B7(b9,13).png
new file mode 100644
index 000000000..8d065242d
Binary files /dev/null and b/share/goodie/guitar_chords/B7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/B7.png b/share/goodie/guitar_chords/B7.png
new file mode 100644
index 000000000..45d49f406
Binary files /dev/null and b/share/goodie/guitar_chords/B7.png differ
diff --git a/share/goodie/guitar_chords/B7sus4.png b/share/goodie/guitar_chords/B7sus4.png
new file mode 100644
index 000000000..d5fab1f52
Binary files /dev/null and b/share/goodie/guitar_chords/B7sus4.png differ
diff --git a/share/goodie/guitar_chords/BM7(9).png b/share/goodie/guitar_chords/BM7(9).png
new file mode 100644
index 000000000..c67ae3d75
Binary files /dev/null and b/share/goodie/guitar_chords/BM7(9).png differ
diff --git a/share/goodie/guitar_chords/BM7.png b/share/goodie/guitar_chords/BM7.png
new file mode 100644
index 000000000..eff0ebe05
Binary files /dev/null and b/share/goodie/guitar_chords/BM7.png differ
diff --git a/share/goodie/guitar_chords/Badd9.png b/share/goodie/guitar_chords/Badd9.png
new file mode 100644
index 000000000..d56ff59b0
Binary files /dev/null and b/share/goodie/guitar_chords/Badd9.png differ
diff --git a/share/goodie/guitar_chords/Baug.png b/share/goodie/guitar_chords/Baug.png
new file mode 100644
index 000000000..551517ebb
Binary files /dev/null and b/share/goodie/guitar_chords/Baug.png differ
diff --git a/share/goodie/guitar_chords/Baug7.png b/share/goodie/guitar_chords/Baug7.png
new file mode 100644
index 000000000..04e41aab3
Binary files /dev/null and b/share/goodie/guitar_chords/Baug7.png differ
diff --git a/share/goodie/guitar_chords/Bb.png b/share/goodie/guitar_chords/Bb.png
new file mode 100644
index 000000000..481abca7c
Binary files /dev/null and b/share/goodie/guitar_chords/Bb.png differ
diff --git a/share/goodie/guitar_chords/Bb6(9).png b/share/goodie/guitar_chords/Bb6(9).png
new file mode 100644
index 000000000..f575dec51
Binary files /dev/null and b/share/goodie/guitar_chords/Bb6(9).png differ
diff --git a/share/goodie/guitar_chords/Bb6.png b/share/goodie/guitar_chords/Bb6.png
new file mode 100644
index 000000000..90fd9707c
Binary files /dev/null and b/share/goodie/guitar_chords/Bb6.png differ
diff --git a/share/goodie/guitar_chords/Bb7(#11).png b/share/goodie/guitar_chords/Bb7(#11).png
new file mode 100644
index 000000000..55088f70d
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(#11).png differ
diff --git a/share/goodie/guitar_chords/Bb7(#9).png b/share/goodie/guitar_chords/Bb7(#9).png
new file mode 100644
index 000000000..5089d45ab
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(#9).png differ
diff --git a/share/goodie/guitar_chords/Bb7(13).png b/share/goodie/guitar_chords/Bb7(13).png
new file mode 100644
index 000000000..81e54a135
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(13).png differ
diff --git a/share/goodie/guitar_chords/Bb7(9).png b/share/goodie/guitar_chords/Bb7(9).png
new file mode 100644
index 000000000..471e8a2df
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(9).png differ
diff --git a/share/goodie/guitar_chords/Bb7(9,13).png b/share/goodie/guitar_chords/Bb7(9,13).png
new file mode 100644
index 000000000..0ac2738e4
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(9,13).png differ
diff --git a/share/goodie/guitar_chords/Bb7(b13).png b/share/goodie/guitar_chords/Bb7(b13).png
new file mode 100644
index 000000000..b7d20930a
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(b13).png differ
diff --git a/share/goodie/guitar_chords/Bb7(b5).png b/share/goodie/guitar_chords/Bb7(b5).png
new file mode 100644
index 000000000..d9121759d
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(b5).png differ
diff --git a/share/goodie/guitar_chords/Bb7(b9).png b/share/goodie/guitar_chords/Bb7(b9).png
new file mode 100644
index 000000000..3bfadf135
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(b9).png differ
diff --git a/share/goodie/guitar_chords/Bb7(b9,13).png b/share/goodie/guitar_chords/Bb7(b9,13).png
new file mode 100644
index 000000000..9c1d13130
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/Bb7.png b/share/goodie/guitar_chords/Bb7.png
new file mode 100644
index 000000000..2992e8252
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7.png differ
diff --git a/share/goodie/guitar_chords/Bb7sus4.png b/share/goodie/guitar_chords/Bb7sus4.png
new file mode 100644
index 000000000..891b4f146
Binary files /dev/null and b/share/goodie/guitar_chords/Bb7sus4.png differ
diff --git a/share/goodie/guitar_chords/BbM7(9).png b/share/goodie/guitar_chords/BbM7(9).png
new file mode 100644
index 000000000..e174f04a4
Binary files /dev/null and b/share/goodie/guitar_chords/BbM7(9).png differ
diff --git a/share/goodie/guitar_chords/BbM7.png b/share/goodie/guitar_chords/BbM7.png
new file mode 100644
index 000000000..5f86d681d
Binary files /dev/null and b/share/goodie/guitar_chords/BbM7.png differ
diff --git a/share/goodie/guitar_chords/Bbadd9.png b/share/goodie/guitar_chords/Bbadd9.png
new file mode 100644
index 000000000..2f95775c1
Binary files /dev/null and b/share/goodie/guitar_chords/Bbadd9.png differ
diff --git a/share/goodie/guitar_chords/Bbaug.png b/share/goodie/guitar_chords/Bbaug.png
new file mode 100644
index 000000000..434bf53b8
Binary files /dev/null and b/share/goodie/guitar_chords/Bbaug.png differ
diff --git a/share/goodie/guitar_chords/Bbaug7.png b/share/goodie/guitar_chords/Bbaug7.png
new file mode 100644
index 000000000..6f0888808
Binary files /dev/null and b/share/goodie/guitar_chords/Bbaug7.png differ
diff --git a/share/goodie/guitar_chords/Bbdim.png b/share/goodie/guitar_chords/Bbdim.png
new file mode 100644
index 000000000..fc21fef9f
Binary files /dev/null and b/share/goodie/guitar_chords/Bbdim.png differ
diff --git a/share/goodie/guitar_chords/Bbm.png b/share/goodie/guitar_chords/Bbm.png
new file mode 100644
index 000000000..953572b58
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm.png differ
diff --git a/share/goodie/guitar_chords/Bbm6(9).png b/share/goodie/guitar_chords/Bbm6(9).png
new file mode 100644
index 000000000..e65e15d2d
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm6(9).png differ
diff --git a/share/goodie/guitar_chords/Bbm6.png b/share/goodie/guitar_chords/Bbm6.png
new file mode 100644
index 000000000..9453429db
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm6.png differ
diff --git a/share/goodie/guitar_chords/Bbm7(9).png b/share/goodie/guitar_chords/Bbm7(9).png
new file mode 100644
index 000000000..6bb5b370a
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm7(9).png differ
diff --git a/share/goodie/guitar_chords/Bbm7(9,11).png b/share/goodie/guitar_chords/Bbm7(9,11).png
new file mode 100644
index 000000000..5db34da56
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Bbm7(b5).png b/share/goodie/guitar_chords/Bbm7(b5).png
new file mode 100644
index 000000000..a573bec71
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Bbm7.png b/share/goodie/guitar_chords/Bbm7.png
new file mode 100644
index 000000000..e078bc77d
Binary files /dev/null and b/share/goodie/guitar_chords/Bbm7.png differ
diff --git a/share/goodie/guitar_chords/BbmM7.png b/share/goodie/guitar_chords/BbmM7.png
new file mode 100644
index 000000000..5a02c3a3b
Binary files /dev/null and b/share/goodie/guitar_chords/BbmM7.png differ
diff --git a/share/goodie/guitar_chords/Bbsus4.png b/share/goodie/guitar_chords/Bbsus4.png
new file mode 100644
index 000000000..207e10d12
Binary files /dev/null and b/share/goodie/guitar_chords/Bbsus4.png differ
diff --git a/share/goodie/guitar_chords/Bdim.png b/share/goodie/guitar_chords/Bdim.png
new file mode 100644
index 000000000..ddf57482f
Binary files /dev/null and b/share/goodie/guitar_chords/Bdim.png differ
diff --git a/share/goodie/guitar_chords/Bm.png b/share/goodie/guitar_chords/Bm.png
new file mode 100644
index 000000000..b2519002f
Binary files /dev/null and b/share/goodie/guitar_chords/Bm.png differ
diff --git a/share/goodie/guitar_chords/Bm6(9).png b/share/goodie/guitar_chords/Bm6(9).png
new file mode 100644
index 000000000..11ff22bd3
Binary files /dev/null and b/share/goodie/guitar_chords/Bm6(9).png differ
diff --git a/share/goodie/guitar_chords/Bm6.png b/share/goodie/guitar_chords/Bm6.png
new file mode 100644
index 000000000..8d889a49b
Binary files /dev/null and b/share/goodie/guitar_chords/Bm6.png differ
diff --git a/share/goodie/guitar_chords/Bm7(9).png b/share/goodie/guitar_chords/Bm7(9).png
new file mode 100644
index 000000000..8db839e34
Binary files /dev/null and b/share/goodie/guitar_chords/Bm7(9).png differ
diff --git a/share/goodie/guitar_chords/Bm7(9,11).png b/share/goodie/guitar_chords/Bm7(9,11).png
new file mode 100644
index 000000000..7d550bd84
Binary files /dev/null and b/share/goodie/guitar_chords/Bm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Bm7(b5).png b/share/goodie/guitar_chords/Bm7(b5).png
new file mode 100644
index 000000000..b97cff09f
Binary files /dev/null and b/share/goodie/guitar_chords/Bm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Bm7.png b/share/goodie/guitar_chords/Bm7.png
new file mode 100644
index 000000000..41fdc4912
Binary files /dev/null and b/share/goodie/guitar_chords/Bm7.png differ
diff --git a/share/goodie/guitar_chords/BmM7.png b/share/goodie/guitar_chords/BmM7.png
new file mode 100644
index 000000000..34895145d
Binary files /dev/null and b/share/goodie/guitar_chords/BmM7.png differ
diff --git a/share/goodie/guitar_chords/Bsus4.png b/share/goodie/guitar_chords/Bsus4.png
new file mode 100644
index 000000000..8d70ba5dc
Binary files /dev/null and b/share/goodie/guitar_chords/Bsus4.png differ
diff --git a/share/goodie/guitar_chords/C#.png b/share/goodie/guitar_chords/C#.png
new file mode 100644
index 000000000..b93bdd78b
Binary files /dev/null and b/share/goodie/guitar_chords/C#.png differ
diff --git a/share/goodie/guitar_chords/C#6(9).png b/share/goodie/guitar_chords/C#6(9).png
new file mode 100644
index 000000000..c9b3a3a14
Binary files /dev/null and b/share/goodie/guitar_chords/C#6(9).png differ
diff --git a/share/goodie/guitar_chords/C#6.png b/share/goodie/guitar_chords/C#6.png
new file mode 100644
index 000000000..3acd0ad73
Binary files /dev/null and b/share/goodie/guitar_chords/C#6.png differ
diff --git a/share/goodie/guitar_chords/C#7(#11).png b/share/goodie/guitar_chords/C#7(#11).png
new file mode 100644
index 000000000..ff04fc4b5
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(#11).png differ
diff --git a/share/goodie/guitar_chords/C#7(#9).png b/share/goodie/guitar_chords/C#7(#9).png
new file mode 100644
index 000000000..b6fcca34e
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(#9).png differ
diff --git a/share/goodie/guitar_chords/C#7(13).png b/share/goodie/guitar_chords/C#7(13).png
new file mode 100644
index 000000000..763558c37
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(13).png differ
diff --git a/share/goodie/guitar_chords/C#7(9).png b/share/goodie/guitar_chords/C#7(9).png
new file mode 100644
index 000000000..978e26fee
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(9).png differ
diff --git a/share/goodie/guitar_chords/C#7(9,13).png b/share/goodie/guitar_chords/C#7(9,13).png
new file mode 100644
index 000000000..a4fc93ed3
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(9,13).png differ
diff --git a/share/goodie/guitar_chords/C#7(b13).png b/share/goodie/guitar_chords/C#7(b13).png
new file mode 100644
index 000000000..c53e5f326
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(b13).png differ
diff --git a/share/goodie/guitar_chords/C#7(b5).png b/share/goodie/guitar_chords/C#7(b5).png
new file mode 100644
index 000000000..409967f67
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(b5).png differ
diff --git a/share/goodie/guitar_chords/C#7(b9).png b/share/goodie/guitar_chords/C#7(b9).png
new file mode 100644
index 000000000..f24d475a5
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(b9).png differ
diff --git a/share/goodie/guitar_chords/C#7(b9,13).png b/share/goodie/guitar_chords/C#7(b9,13).png
new file mode 100644
index 000000000..9771a12d2
Binary files /dev/null and b/share/goodie/guitar_chords/C#7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/C#7.png b/share/goodie/guitar_chords/C#7.png
new file mode 100644
index 000000000..ea52be808
Binary files /dev/null and b/share/goodie/guitar_chords/C#7.png differ
diff --git a/share/goodie/guitar_chords/C#7sus4.png b/share/goodie/guitar_chords/C#7sus4.png
new file mode 100644
index 000000000..8dac3ad4e
Binary files /dev/null and b/share/goodie/guitar_chords/C#7sus4.png differ
diff --git a/share/goodie/guitar_chords/C#M7(9).png b/share/goodie/guitar_chords/C#M7(9).png
new file mode 100644
index 000000000..8fc69ac1d
Binary files /dev/null and b/share/goodie/guitar_chords/C#M7(9).png differ
diff --git a/share/goodie/guitar_chords/C#M7.png b/share/goodie/guitar_chords/C#M7.png
new file mode 100644
index 000000000..d6e50e108
Binary files /dev/null and b/share/goodie/guitar_chords/C#M7.png differ
diff --git a/share/goodie/guitar_chords/C#add9.png b/share/goodie/guitar_chords/C#add9.png
new file mode 100644
index 000000000..4f97c6c0a
Binary files /dev/null and b/share/goodie/guitar_chords/C#add9.png differ
diff --git a/share/goodie/guitar_chords/C#aug.png b/share/goodie/guitar_chords/C#aug.png
new file mode 100644
index 000000000..0be46c49a
Binary files /dev/null and b/share/goodie/guitar_chords/C#aug.png differ
diff --git a/share/goodie/guitar_chords/C#aug7.png b/share/goodie/guitar_chords/C#aug7.png
new file mode 100644
index 000000000..2d444af73
Binary files /dev/null and b/share/goodie/guitar_chords/C#aug7.png differ
diff --git a/share/goodie/guitar_chords/C#dim.png b/share/goodie/guitar_chords/C#dim.png
new file mode 100644
index 000000000..9bdb6e6c8
Binary files /dev/null and b/share/goodie/guitar_chords/C#dim.png differ
diff --git a/share/goodie/guitar_chords/C#m.png b/share/goodie/guitar_chords/C#m.png
new file mode 100644
index 000000000..a5757be95
Binary files /dev/null and b/share/goodie/guitar_chords/C#m.png differ
diff --git a/share/goodie/guitar_chords/C#m6(9).png b/share/goodie/guitar_chords/C#m6(9).png
new file mode 100644
index 000000000..2a300bdf7
Binary files /dev/null and b/share/goodie/guitar_chords/C#m6(9).png differ
diff --git a/share/goodie/guitar_chords/C#m6.png b/share/goodie/guitar_chords/C#m6.png
new file mode 100644
index 000000000..3a0950ff3
Binary files /dev/null and b/share/goodie/guitar_chords/C#m6.png differ
diff --git a/share/goodie/guitar_chords/C#m7(9).png b/share/goodie/guitar_chords/C#m7(9).png
new file mode 100644
index 000000000..93169ef3f
Binary files /dev/null and b/share/goodie/guitar_chords/C#m7(9).png differ
diff --git a/share/goodie/guitar_chords/C#m7(9,11).png b/share/goodie/guitar_chords/C#m7(9,11).png
new file mode 100644
index 000000000..f037a8c98
Binary files /dev/null and b/share/goodie/guitar_chords/C#m7(9,11).png differ
diff --git a/share/goodie/guitar_chords/C#m7(b5).png b/share/goodie/guitar_chords/C#m7(b5).png
new file mode 100644
index 000000000..75835e4d4
Binary files /dev/null and b/share/goodie/guitar_chords/C#m7(b5).png differ
diff --git a/share/goodie/guitar_chords/C#m7.png b/share/goodie/guitar_chords/C#m7.png
new file mode 100644
index 000000000..f932a68fd
Binary files /dev/null and b/share/goodie/guitar_chords/C#m7.png differ
diff --git a/share/goodie/guitar_chords/C#mM7.png b/share/goodie/guitar_chords/C#mM7.png
new file mode 100644
index 000000000..44583a136
Binary files /dev/null and b/share/goodie/guitar_chords/C#mM7.png differ
diff --git a/share/goodie/guitar_chords/C#sus4.png b/share/goodie/guitar_chords/C#sus4.png
new file mode 100644
index 000000000..964765451
Binary files /dev/null and b/share/goodie/guitar_chords/C#sus4.png differ
diff --git a/share/goodie/guitar_chords/C.png b/share/goodie/guitar_chords/C.png
new file mode 100644
index 000000000..aaaeaa16e
Binary files /dev/null and b/share/goodie/guitar_chords/C.png differ
diff --git a/share/goodie/guitar_chords/C6(9).png b/share/goodie/guitar_chords/C6(9).png
new file mode 100644
index 000000000..b850dfbcd
Binary files /dev/null and b/share/goodie/guitar_chords/C6(9).png differ
diff --git a/share/goodie/guitar_chords/C6.png b/share/goodie/guitar_chords/C6.png
new file mode 100644
index 000000000..9df7b22ea
Binary files /dev/null and b/share/goodie/guitar_chords/C6.png differ
diff --git a/share/goodie/guitar_chords/C7(#11).png b/share/goodie/guitar_chords/C7(#11).png
new file mode 100644
index 000000000..e75982d8a
Binary files /dev/null and b/share/goodie/guitar_chords/C7(#11).png differ
diff --git a/share/goodie/guitar_chords/C7(#9).png b/share/goodie/guitar_chords/C7(#9).png
new file mode 100644
index 000000000..1b44b2873
Binary files /dev/null and b/share/goodie/guitar_chords/C7(#9).png differ
diff --git a/share/goodie/guitar_chords/C7(13).png b/share/goodie/guitar_chords/C7(13).png
new file mode 100644
index 000000000..e193c3705
Binary files /dev/null and b/share/goodie/guitar_chords/C7(13).png differ
diff --git a/share/goodie/guitar_chords/C7(9).png b/share/goodie/guitar_chords/C7(9).png
new file mode 100644
index 000000000..4ee805901
Binary files /dev/null and b/share/goodie/guitar_chords/C7(9).png differ
diff --git a/share/goodie/guitar_chords/C7(9,13).png b/share/goodie/guitar_chords/C7(9,13).png
new file mode 100644
index 000000000..2051dc5bc
Binary files /dev/null and b/share/goodie/guitar_chords/C7(9,13).png differ
diff --git a/share/goodie/guitar_chords/C7(b13).png b/share/goodie/guitar_chords/C7(b13).png
new file mode 100644
index 000000000..583fc630b
Binary files /dev/null and b/share/goodie/guitar_chords/C7(b13).png differ
diff --git a/share/goodie/guitar_chords/C7(b5).png b/share/goodie/guitar_chords/C7(b5).png
new file mode 100644
index 000000000..6012b5043
Binary files /dev/null and b/share/goodie/guitar_chords/C7(b5).png differ
diff --git a/share/goodie/guitar_chords/C7(b9).png b/share/goodie/guitar_chords/C7(b9).png
new file mode 100644
index 000000000..ba1fa0065
Binary files /dev/null and b/share/goodie/guitar_chords/C7(b9).png differ
diff --git a/share/goodie/guitar_chords/C7(b9,13).png b/share/goodie/guitar_chords/C7(b9,13).png
new file mode 100644
index 000000000..046f74d09
Binary files /dev/null and b/share/goodie/guitar_chords/C7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/C7.png b/share/goodie/guitar_chords/C7.png
new file mode 100644
index 000000000..5963c0a14
Binary files /dev/null and b/share/goodie/guitar_chords/C7.png differ
diff --git a/share/goodie/guitar_chords/C7sus4.png b/share/goodie/guitar_chords/C7sus4.png
new file mode 100644
index 000000000..0b8adf371
Binary files /dev/null and b/share/goodie/guitar_chords/C7sus4.png differ
diff --git a/share/goodie/guitar_chords/CM7(9).png b/share/goodie/guitar_chords/CM7(9).png
new file mode 100644
index 000000000..fadbe3170
Binary files /dev/null and b/share/goodie/guitar_chords/CM7(9).png differ
diff --git a/share/goodie/guitar_chords/CM7.png b/share/goodie/guitar_chords/CM7.png
new file mode 100644
index 000000000..b70538dfe
Binary files /dev/null and b/share/goodie/guitar_chords/CM7.png differ
diff --git a/share/goodie/guitar_chords/Cadd9.png b/share/goodie/guitar_chords/Cadd9.png
new file mode 100644
index 000000000..af76e36af
Binary files /dev/null and b/share/goodie/guitar_chords/Cadd9.png differ
diff --git a/share/goodie/guitar_chords/Caug.png b/share/goodie/guitar_chords/Caug.png
new file mode 100644
index 000000000..39ccc2632
Binary files /dev/null and b/share/goodie/guitar_chords/Caug.png differ
diff --git a/share/goodie/guitar_chords/Caug7.png b/share/goodie/guitar_chords/Caug7.png
new file mode 100644
index 000000000..9d497553b
Binary files /dev/null and b/share/goodie/guitar_chords/Caug7.png differ
diff --git a/share/goodie/guitar_chords/Cdim.png b/share/goodie/guitar_chords/Cdim.png
new file mode 100644
index 000000000..2482923fc
Binary files /dev/null and b/share/goodie/guitar_chords/Cdim.png differ
diff --git a/share/goodie/guitar_chords/Cm.png b/share/goodie/guitar_chords/Cm.png
new file mode 100644
index 000000000..04e9b03da
Binary files /dev/null and b/share/goodie/guitar_chords/Cm.png differ
diff --git a/share/goodie/guitar_chords/Cm6(9).png b/share/goodie/guitar_chords/Cm6(9).png
new file mode 100644
index 000000000..63bc08d07
Binary files /dev/null and b/share/goodie/guitar_chords/Cm6(9).png differ
diff --git a/share/goodie/guitar_chords/Cm6.png b/share/goodie/guitar_chords/Cm6.png
new file mode 100644
index 000000000..393f2f7ef
Binary files /dev/null and b/share/goodie/guitar_chords/Cm6.png differ
diff --git a/share/goodie/guitar_chords/Cm7(9).png b/share/goodie/guitar_chords/Cm7(9).png
new file mode 100644
index 000000000..a2100b347
Binary files /dev/null and b/share/goodie/guitar_chords/Cm7(9).png differ
diff --git a/share/goodie/guitar_chords/Cm7(9,11).png b/share/goodie/guitar_chords/Cm7(9,11).png
new file mode 100644
index 000000000..4bef443e1
Binary files /dev/null and b/share/goodie/guitar_chords/Cm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Cm7(b5).png b/share/goodie/guitar_chords/Cm7(b5).png
new file mode 100644
index 000000000..017258403
Binary files /dev/null and b/share/goodie/guitar_chords/Cm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Cm7.png b/share/goodie/guitar_chords/Cm7.png
new file mode 100644
index 000000000..97e9fa7f9
Binary files /dev/null and b/share/goodie/guitar_chords/Cm7.png differ
diff --git a/share/goodie/guitar_chords/CmM7.png b/share/goodie/guitar_chords/CmM7.png
new file mode 100644
index 000000000..e8f4188fe
Binary files /dev/null and b/share/goodie/guitar_chords/CmM7.png differ
diff --git a/share/goodie/guitar_chords/Csus4.png b/share/goodie/guitar_chords/Csus4.png
new file mode 100644
index 000000000..08ed54454
Binary files /dev/null and b/share/goodie/guitar_chords/Csus4.png differ
diff --git a/share/goodie/guitar_chords/D#.png b/share/goodie/guitar_chords/D#.png
new file mode 100644
index 000000000..8a42e4064
Binary files /dev/null and b/share/goodie/guitar_chords/D#.png differ
diff --git a/share/goodie/guitar_chords/D#6(9).png b/share/goodie/guitar_chords/D#6(9).png
new file mode 100644
index 000000000..b0be9206c
Binary files /dev/null and b/share/goodie/guitar_chords/D#6(9).png differ
diff --git a/share/goodie/guitar_chords/D#6.png b/share/goodie/guitar_chords/D#6.png
new file mode 100644
index 000000000..420c2ce46
Binary files /dev/null and b/share/goodie/guitar_chords/D#6.png differ
diff --git a/share/goodie/guitar_chords/D#7(#11).png b/share/goodie/guitar_chords/D#7(#11).png
new file mode 100644
index 000000000..3570714ca
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(#11).png differ
diff --git a/share/goodie/guitar_chords/D#7(#9).png b/share/goodie/guitar_chords/D#7(#9).png
new file mode 100644
index 000000000..01999347d
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(#9).png differ
diff --git a/share/goodie/guitar_chords/D#7(13).png b/share/goodie/guitar_chords/D#7(13).png
new file mode 100644
index 000000000..1279551fd
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(13).png differ
diff --git a/share/goodie/guitar_chords/D#7(9).png b/share/goodie/guitar_chords/D#7(9).png
new file mode 100644
index 000000000..ebe7a113e
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(9).png differ
diff --git a/share/goodie/guitar_chords/D#7(9,13).png b/share/goodie/guitar_chords/D#7(9,13).png
new file mode 100644
index 000000000..a5f0b0127
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(9,13).png differ
diff --git a/share/goodie/guitar_chords/D#7(b13).png b/share/goodie/guitar_chords/D#7(b13).png
new file mode 100644
index 000000000..76afa4ed1
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(b13).png differ
diff --git a/share/goodie/guitar_chords/D#7(b5).png b/share/goodie/guitar_chords/D#7(b5).png
new file mode 100644
index 000000000..10ea76f05
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(b5).png differ
diff --git a/share/goodie/guitar_chords/D#7(b9).png b/share/goodie/guitar_chords/D#7(b9).png
new file mode 100644
index 000000000..574a24ae6
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(b9).png differ
diff --git a/share/goodie/guitar_chords/D#7(b9,13).png b/share/goodie/guitar_chords/D#7(b9,13).png
new file mode 100644
index 000000000..eb9fea276
Binary files /dev/null and b/share/goodie/guitar_chords/D#7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/D#7.png b/share/goodie/guitar_chords/D#7.png
new file mode 100644
index 000000000..dbeec5a47
Binary files /dev/null and b/share/goodie/guitar_chords/D#7.png differ
diff --git a/share/goodie/guitar_chords/D#7sus4.png b/share/goodie/guitar_chords/D#7sus4.png
new file mode 100644
index 000000000..18bdfd998
Binary files /dev/null and b/share/goodie/guitar_chords/D#7sus4.png differ
diff --git a/share/goodie/guitar_chords/D#M7(9).png b/share/goodie/guitar_chords/D#M7(9).png
new file mode 100644
index 000000000..7b9dbb982
Binary files /dev/null and b/share/goodie/guitar_chords/D#M7(9).png differ
diff --git a/share/goodie/guitar_chords/D#M7.png b/share/goodie/guitar_chords/D#M7.png
new file mode 100644
index 000000000..911ba9848
Binary files /dev/null and b/share/goodie/guitar_chords/D#M7.png differ
diff --git a/share/goodie/guitar_chords/D#add9.png b/share/goodie/guitar_chords/D#add9.png
new file mode 100644
index 000000000..1774a0d2e
Binary files /dev/null and b/share/goodie/guitar_chords/D#add9.png differ
diff --git a/share/goodie/guitar_chords/D#aug.png b/share/goodie/guitar_chords/D#aug.png
new file mode 100644
index 000000000..07d2ea6cf
Binary files /dev/null and b/share/goodie/guitar_chords/D#aug.png differ
diff --git a/share/goodie/guitar_chords/D#aug7.png b/share/goodie/guitar_chords/D#aug7.png
new file mode 100644
index 000000000..4438d4e33
Binary files /dev/null and b/share/goodie/guitar_chords/D#aug7.png differ
diff --git a/share/goodie/guitar_chords/D#dim.png b/share/goodie/guitar_chords/D#dim.png
new file mode 100644
index 000000000..1eaa3a4f7
Binary files /dev/null and b/share/goodie/guitar_chords/D#dim.png differ
diff --git a/share/goodie/guitar_chords/D#m.png b/share/goodie/guitar_chords/D#m.png
new file mode 100644
index 000000000..cc8306660
Binary files /dev/null and b/share/goodie/guitar_chords/D#m.png differ
diff --git a/share/goodie/guitar_chords/D#m6(9).png b/share/goodie/guitar_chords/D#m6(9).png
new file mode 100644
index 000000000..1426f493b
Binary files /dev/null and b/share/goodie/guitar_chords/D#m6(9).png differ
diff --git a/share/goodie/guitar_chords/D#m6.png b/share/goodie/guitar_chords/D#m6.png
new file mode 100644
index 000000000..b55c03f59
Binary files /dev/null and b/share/goodie/guitar_chords/D#m6.png differ
diff --git a/share/goodie/guitar_chords/D#m7(9).png b/share/goodie/guitar_chords/D#m7(9).png
new file mode 100644
index 000000000..e6aee3faa
Binary files /dev/null and b/share/goodie/guitar_chords/D#m7(9).png differ
diff --git a/share/goodie/guitar_chords/D#m7(9,11).png b/share/goodie/guitar_chords/D#m7(9,11).png
new file mode 100644
index 000000000..79899be06
Binary files /dev/null and b/share/goodie/guitar_chords/D#m7(9,11).png differ
diff --git a/share/goodie/guitar_chords/D#m7(b5).png b/share/goodie/guitar_chords/D#m7(b5).png
new file mode 100644
index 000000000..bbe651012
Binary files /dev/null and b/share/goodie/guitar_chords/D#m7(b5).png differ
diff --git a/share/goodie/guitar_chords/D#m7.png b/share/goodie/guitar_chords/D#m7.png
new file mode 100644
index 000000000..aaf2cd37d
Binary files /dev/null and b/share/goodie/guitar_chords/D#m7.png differ
diff --git a/share/goodie/guitar_chords/D#mM7.png b/share/goodie/guitar_chords/D#mM7.png
new file mode 100644
index 000000000..b3272021f
Binary files /dev/null and b/share/goodie/guitar_chords/D#mM7.png differ
diff --git a/share/goodie/guitar_chords/D#sus4.png b/share/goodie/guitar_chords/D#sus4.png
new file mode 100644
index 000000000..fd3d759ca
Binary files /dev/null and b/share/goodie/guitar_chords/D#sus4.png differ
diff --git a/share/goodie/guitar_chords/D.png b/share/goodie/guitar_chords/D.png
new file mode 100644
index 000000000..09e1c9746
Binary files /dev/null and b/share/goodie/guitar_chords/D.png differ
diff --git a/share/goodie/guitar_chords/D6(9).png b/share/goodie/guitar_chords/D6(9).png
new file mode 100644
index 000000000..5485dc2d6
Binary files /dev/null and b/share/goodie/guitar_chords/D6(9).png differ
diff --git a/share/goodie/guitar_chords/D6.png b/share/goodie/guitar_chords/D6.png
new file mode 100644
index 000000000..d61ab8744
Binary files /dev/null and b/share/goodie/guitar_chords/D6.png differ
diff --git a/share/goodie/guitar_chords/D7(#11).png b/share/goodie/guitar_chords/D7(#11).png
new file mode 100644
index 000000000..6d06957b9
Binary files /dev/null and b/share/goodie/guitar_chords/D7(#11).png differ
diff --git a/share/goodie/guitar_chords/D7(#9).png b/share/goodie/guitar_chords/D7(#9).png
new file mode 100644
index 000000000..6e9f9870e
Binary files /dev/null and b/share/goodie/guitar_chords/D7(#9).png differ
diff --git a/share/goodie/guitar_chords/D7(13).png b/share/goodie/guitar_chords/D7(13).png
new file mode 100644
index 000000000..3ff13e37d
Binary files /dev/null and b/share/goodie/guitar_chords/D7(13).png differ
diff --git a/share/goodie/guitar_chords/D7(9).png b/share/goodie/guitar_chords/D7(9).png
new file mode 100644
index 000000000..f65fcff07
Binary files /dev/null and b/share/goodie/guitar_chords/D7(9).png differ
diff --git a/share/goodie/guitar_chords/D7(9,13).png b/share/goodie/guitar_chords/D7(9,13).png
new file mode 100644
index 000000000..fd46cb652
Binary files /dev/null and b/share/goodie/guitar_chords/D7(9,13).png differ
diff --git a/share/goodie/guitar_chords/D7(b13).png b/share/goodie/guitar_chords/D7(b13).png
new file mode 100644
index 000000000..2d5a23752
Binary files /dev/null and b/share/goodie/guitar_chords/D7(b13).png differ
diff --git a/share/goodie/guitar_chords/D7(b5).png b/share/goodie/guitar_chords/D7(b5).png
new file mode 100644
index 000000000..c22290cdf
Binary files /dev/null and b/share/goodie/guitar_chords/D7(b5).png differ
diff --git a/share/goodie/guitar_chords/D7(b9).png b/share/goodie/guitar_chords/D7(b9).png
new file mode 100644
index 000000000..e11f58db0
Binary files /dev/null and b/share/goodie/guitar_chords/D7(b9).png differ
diff --git a/share/goodie/guitar_chords/D7(b9,13).png b/share/goodie/guitar_chords/D7(b9,13).png
new file mode 100644
index 000000000..986783fa9
Binary files /dev/null and b/share/goodie/guitar_chords/D7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/D7.png b/share/goodie/guitar_chords/D7.png
new file mode 100644
index 000000000..5c50094b0
Binary files /dev/null and b/share/goodie/guitar_chords/D7.png differ
diff --git a/share/goodie/guitar_chords/D7sus4.png b/share/goodie/guitar_chords/D7sus4.png
new file mode 100644
index 000000000..4f23c1625
Binary files /dev/null and b/share/goodie/guitar_chords/D7sus4.png differ
diff --git a/share/goodie/guitar_chords/DM7(9).png b/share/goodie/guitar_chords/DM7(9).png
new file mode 100644
index 000000000..513243b50
Binary files /dev/null and b/share/goodie/guitar_chords/DM7(9).png differ
diff --git a/share/goodie/guitar_chords/DM7.png b/share/goodie/guitar_chords/DM7.png
new file mode 100644
index 000000000..943153230
Binary files /dev/null and b/share/goodie/guitar_chords/DM7.png differ
diff --git a/share/goodie/guitar_chords/Dadd9.png b/share/goodie/guitar_chords/Dadd9.png
new file mode 100644
index 000000000..d4788619c
Binary files /dev/null and b/share/goodie/guitar_chords/Dadd9.png differ
diff --git a/share/goodie/guitar_chords/Daug.png b/share/goodie/guitar_chords/Daug.png
new file mode 100644
index 000000000..5e7ab3e3a
Binary files /dev/null and b/share/goodie/guitar_chords/Daug.png differ
diff --git a/share/goodie/guitar_chords/Daug7.png b/share/goodie/guitar_chords/Daug7.png
new file mode 100644
index 000000000..e64135ac9
Binary files /dev/null and b/share/goodie/guitar_chords/Daug7.png differ
diff --git a/share/goodie/guitar_chords/Db.png b/share/goodie/guitar_chords/Db.png
new file mode 100644
index 000000000..1cd1bbefd
Binary files /dev/null and b/share/goodie/guitar_chords/Db.png differ
diff --git a/share/goodie/guitar_chords/Db6(9).png b/share/goodie/guitar_chords/Db6(9).png
new file mode 100644
index 000000000..3e6d44417
Binary files /dev/null and b/share/goodie/guitar_chords/Db6(9).png differ
diff --git a/share/goodie/guitar_chords/Db6.png b/share/goodie/guitar_chords/Db6.png
new file mode 100644
index 000000000..16bcab35f
Binary files /dev/null and b/share/goodie/guitar_chords/Db6.png differ
diff --git a/share/goodie/guitar_chords/Db7(#11).png b/share/goodie/guitar_chords/Db7(#11).png
new file mode 100644
index 000000000..d334241c2
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(#11).png differ
diff --git a/share/goodie/guitar_chords/Db7(#9).png b/share/goodie/guitar_chords/Db7(#9).png
new file mode 100644
index 000000000..af7ca619c
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(#9).png differ
diff --git a/share/goodie/guitar_chords/Db7(13).png b/share/goodie/guitar_chords/Db7(13).png
new file mode 100644
index 000000000..2971ad168
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(13).png differ
diff --git a/share/goodie/guitar_chords/Db7(9).png b/share/goodie/guitar_chords/Db7(9).png
new file mode 100644
index 000000000..ae22d84b3
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(9).png differ
diff --git a/share/goodie/guitar_chords/Db7(9,13).png b/share/goodie/guitar_chords/Db7(9,13).png
new file mode 100644
index 000000000..a2ab8e1dd
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(9,13).png differ
diff --git a/share/goodie/guitar_chords/Db7(b13).png b/share/goodie/guitar_chords/Db7(b13).png
new file mode 100644
index 000000000..da2586331
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(b13).png differ
diff --git a/share/goodie/guitar_chords/Db7(b5).png b/share/goodie/guitar_chords/Db7(b5).png
new file mode 100644
index 000000000..cec10b613
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(b5).png differ
diff --git a/share/goodie/guitar_chords/Db7(b9).png b/share/goodie/guitar_chords/Db7(b9).png
new file mode 100644
index 000000000..9a7adcec9
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(b9).png differ
diff --git a/share/goodie/guitar_chords/Db7(b9,13).png b/share/goodie/guitar_chords/Db7(b9,13).png
new file mode 100644
index 000000000..8fc70e897
Binary files /dev/null and b/share/goodie/guitar_chords/Db7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/Db7.png b/share/goodie/guitar_chords/Db7.png
new file mode 100644
index 000000000..f0d0fd5ae
Binary files /dev/null and b/share/goodie/guitar_chords/Db7.png differ
diff --git a/share/goodie/guitar_chords/Db7sus4.png b/share/goodie/guitar_chords/Db7sus4.png
new file mode 100644
index 000000000..4d4d835e5
Binary files /dev/null and b/share/goodie/guitar_chords/Db7sus4.png differ
diff --git a/share/goodie/guitar_chords/DbM7(9).png b/share/goodie/guitar_chords/DbM7(9).png
new file mode 100644
index 000000000..e14e48494
Binary files /dev/null and b/share/goodie/guitar_chords/DbM7(9).png differ
diff --git a/share/goodie/guitar_chords/DbM7.png b/share/goodie/guitar_chords/DbM7.png
new file mode 100644
index 000000000..35f4e917c
Binary files /dev/null and b/share/goodie/guitar_chords/DbM7.png differ
diff --git a/share/goodie/guitar_chords/Dbadd9.png b/share/goodie/guitar_chords/Dbadd9.png
new file mode 100644
index 000000000..90a22fd50
Binary files /dev/null and b/share/goodie/guitar_chords/Dbadd9.png differ
diff --git a/share/goodie/guitar_chords/Dbaug.png b/share/goodie/guitar_chords/Dbaug.png
new file mode 100644
index 000000000..333009a3e
Binary files /dev/null and b/share/goodie/guitar_chords/Dbaug.png differ
diff --git a/share/goodie/guitar_chords/Dbaug7.png b/share/goodie/guitar_chords/Dbaug7.png
new file mode 100644
index 000000000..6f526e820
Binary files /dev/null and b/share/goodie/guitar_chords/Dbaug7.png differ
diff --git a/share/goodie/guitar_chords/Dbdim.png b/share/goodie/guitar_chords/Dbdim.png
new file mode 100644
index 000000000..738dc2814
Binary files /dev/null and b/share/goodie/guitar_chords/Dbdim.png differ
diff --git a/share/goodie/guitar_chords/Dbm.png b/share/goodie/guitar_chords/Dbm.png
new file mode 100644
index 000000000..849df7b19
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm.png differ
diff --git a/share/goodie/guitar_chords/Dbm6(9).png b/share/goodie/guitar_chords/Dbm6(9).png
new file mode 100644
index 000000000..9820b5946
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm6(9).png differ
diff --git a/share/goodie/guitar_chords/Dbm6.png b/share/goodie/guitar_chords/Dbm6.png
new file mode 100644
index 000000000..1cc1dcb0d
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm6.png differ
diff --git a/share/goodie/guitar_chords/Dbm7(9).png b/share/goodie/guitar_chords/Dbm7(9).png
new file mode 100644
index 000000000..94b86be2a
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm7(9).png differ
diff --git a/share/goodie/guitar_chords/Dbm7(9,11).png b/share/goodie/guitar_chords/Dbm7(9,11).png
new file mode 100644
index 000000000..52d6d4f5c
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Dbm7(b5).png b/share/goodie/guitar_chords/Dbm7(b5).png
new file mode 100644
index 000000000..d0e5f1a99
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Dbm7.png b/share/goodie/guitar_chords/Dbm7.png
new file mode 100644
index 000000000..7d275873c
Binary files /dev/null and b/share/goodie/guitar_chords/Dbm7.png differ
diff --git a/share/goodie/guitar_chords/DbmM7.png b/share/goodie/guitar_chords/DbmM7.png
new file mode 100644
index 000000000..a5f2fdf34
Binary files /dev/null and b/share/goodie/guitar_chords/DbmM7.png differ
diff --git a/share/goodie/guitar_chords/Dbsus4.png b/share/goodie/guitar_chords/Dbsus4.png
new file mode 100644
index 000000000..868d1a3f7
Binary files /dev/null and b/share/goodie/guitar_chords/Dbsus4.png differ
diff --git a/share/goodie/guitar_chords/Ddim.png b/share/goodie/guitar_chords/Ddim.png
new file mode 100644
index 000000000..dae3e9dec
Binary files /dev/null and b/share/goodie/guitar_chords/Ddim.png differ
diff --git a/share/goodie/guitar_chords/Dm.png b/share/goodie/guitar_chords/Dm.png
new file mode 100644
index 000000000..b19556eda
Binary files /dev/null and b/share/goodie/guitar_chords/Dm.png differ
diff --git a/share/goodie/guitar_chords/Dm6(9).png b/share/goodie/guitar_chords/Dm6(9).png
new file mode 100644
index 000000000..acc39c867
Binary files /dev/null and b/share/goodie/guitar_chords/Dm6(9).png differ
diff --git a/share/goodie/guitar_chords/Dm6.png b/share/goodie/guitar_chords/Dm6.png
new file mode 100644
index 000000000..fa00e50ea
Binary files /dev/null and b/share/goodie/guitar_chords/Dm6.png differ
diff --git a/share/goodie/guitar_chords/Dm7(9).png b/share/goodie/guitar_chords/Dm7(9).png
new file mode 100644
index 000000000..6eb6f6a83
Binary files /dev/null and b/share/goodie/guitar_chords/Dm7(9).png differ
diff --git a/share/goodie/guitar_chords/Dm7(9,11).png b/share/goodie/guitar_chords/Dm7(9,11).png
new file mode 100644
index 000000000..ac1e2f47e
Binary files /dev/null and b/share/goodie/guitar_chords/Dm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Dm7(b5).png b/share/goodie/guitar_chords/Dm7(b5).png
new file mode 100644
index 000000000..d0e4605b3
Binary files /dev/null and b/share/goodie/guitar_chords/Dm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Dm7.png b/share/goodie/guitar_chords/Dm7.png
new file mode 100644
index 000000000..e0c396a35
Binary files /dev/null and b/share/goodie/guitar_chords/Dm7.png differ
diff --git a/share/goodie/guitar_chords/DmM7.png b/share/goodie/guitar_chords/DmM7.png
new file mode 100644
index 000000000..38a2c6457
Binary files /dev/null and b/share/goodie/guitar_chords/DmM7.png differ
diff --git a/share/goodie/guitar_chords/Dsus4.png b/share/goodie/guitar_chords/Dsus4.png
new file mode 100644
index 000000000..b9db3061f
Binary files /dev/null and b/share/goodie/guitar_chords/Dsus4.png differ
diff --git a/share/goodie/guitar_chords/E.png b/share/goodie/guitar_chords/E.png
new file mode 100644
index 000000000..04a9e7c8a
Binary files /dev/null and b/share/goodie/guitar_chords/E.png differ
diff --git a/share/goodie/guitar_chords/E6(9).png b/share/goodie/guitar_chords/E6(9).png
new file mode 100644
index 000000000..3cd2eff2d
Binary files /dev/null and b/share/goodie/guitar_chords/E6(9).png differ
diff --git a/share/goodie/guitar_chords/E6.png b/share/goodie/guitar_chords/E6.png
new file mode 100644
index 000000000..89197b5e2
Binary files /dev/null and b/share/goodie/guitar_chords/E6.png differ
diff --git a/share/goodie/guitar_chords/E7(#11).png b/share/goodie/guitar_chords/E7(#11).png
new file mode 100644
index 000000000..2d15d5826
Binary files /dev/null and b/share/goodie/guitar_chords/E7(#11).png differ
diff --git a/share/goodie/guitar_chords/E7(#9).png b/share/goodie/guitar_chords/E7(#9).png
new file mode 100644
index 000000000..847ae4dfc
Binary files /dev/null and b/share/goodie/guitar_chords/E7(#9).png differ
diff --git a/share/goodie/guitar_chords/E7(13).png b/share/goodie/guitar_chords/E7(13).png
new file mode 100644
index 000000000..d03ce2d8e
Binary files /dev/null and b/share/goodie/guitar_chords/E7(13).png differ
diff --git a/share/goodie/guitar_chords/E7(9).png b/share/goodie/guitar_chords/E7(9).png
new file mode 100644
index 000000000..62b0e03d1
Binary files /dev/null and b/share/goodie/guitar_chords/E7(9).png differ
diff --git a/share/goodie/guitar_chords/E7(9,13).png b/share/goodie/guitar_chords/E7(9,13).png
new file mode 100644
index 000000000..74d1136e0
Binary files /dev/null and b/share/goodie/guitar_chords/E7(9,13).png differ
diff --git a/share/goodie/guitar_chords/E7(b13).png b/share/goodie/guitar_chords/E7(b13).png
new file mode 100644
index 000000000..8a543ccda
Binary files /dev/null and b/share/goodie/guitar_chords/E7(b13).png differ
diff --git a/share/goodie/guitar_chords/E7(b5).png b/share/goodie/guitar_chords/E7(b5).png
new file mode 100644
index 000000000..eb9a7bea5
Binary files /dev/null and b/share/goodie/guitar_chords/E7(b5).png differ
diff --git a/share/goodie/guitar_chords/E7(b9).png b/share/goodie/guitar_chords/E7(b9).png
new file mode 100644
index 000000000..5347b29c4
Binary files /dev/null and b/share/goodie/guitar_chords/E7(b9).png differ
diff --git a/share/goodie/guitar_chords/E7(b9,13).png b/share/goodie/guitar_chords/E7(b9,13).png
new file mode 100644
index 000000000..7fcb898b6
Binary files /dev/null and b/share/goodie/guitar_chords/E7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/E7.png b/share/goodie/guitar_chords/E7.png
new file mode 100644
index 000000000..ea998cd1c
Binary files /dev/null and b/share/goodie/guitar_chords/E7.png differ
diff --git a/share/goodie/guitar_chords/E7sus4.png b/share/goodie/guitar_chords/E7sus4.png
new file mode 100644
index 000000000..741d48541
Binary files /dev/null and b/share/goodie/guitar_chords/E7sus4.png differ
diff --git a/share/goodie/guitar_chords/EM7(9).png b/share/goodie/guitar_chords/EM7(9).png
new file mode 100644
index 000000000..5fb466d72
Binary files /dev/null and b/share/goodie/guitar_chords/EM7(9).png differ
diff --git a/share/goodie/guitar_chords/EM7.png b/share/goodie/guitar_chords/EM7.png
new file mode 100644
index 000000000..263ee12b5
Binary files /dev/null and b/share/goodie/guitar_chords/EM7.png differ
diff --git a/share/goodie/guitar_chords/Eadd9.png b/share/goodie/guitar_chords/Eadd9.png
new file mode 100644
index 000000000..b6f27bbb8
Binary files /dev/null and b/share/goodie/guitar_chords/Eadd9.png differ
diff --git a/share/goodie/guitar_chords/Eaug.png b/share/goodie/guitar_chords/Eaug.png
new file mode 100644
index 000000000..97dbcce07
Binary files /dev/null and b/share/goodie/guitar_chords/Eaug.png differ
diff --git a/share/goodie/guitar_chords/Eaug7.png b/share/goodie/guitar_chords/Eaug7.png
new file mode 100644
index 000000000..842a76334
Binary files /dev/null and b/share/goodie/guitar_chords/Eaug7.png differ
diff --git a/share/goodie/guitar_chords/Eb.png b/share/goodie/guitar_chords/Eb.png
new file mode 100644
index 000000000..da3330dde
Binary files /dev/null and b/share/goodie/guitar_chords/Eb.png differ
diff --git a/share/goodie/guitar_chords/Eb6(9).png b/share/goodie/guitar_chords/Eb6(9).png
new file mode 100644
index 000000000..bf1ffbb4b
Binary files /dev/null and b/share/goodie/guitar_chords/Eb6(9).png differ
diff --git a/share/goodie/guitar_chords/Eb6.png b/share/goodie/guitar_chords/Eb6.png
new file mode 100644
index 000000000..bf6df3df1
Binary files /dev/null and b/share/goodie/guitar_chords/Eb6.png differ
diff --git a/share/goodie/guitar_chords/Eb7(#11).png b/share/goodie/guitar_chords/Eb7(#11).png
new file mode 100644
index 000000000..563f7d1ee
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(#11).png differ
diff --git a/share/goodie/guitar_chords/Eb7(#9).png b/share/goodie/guitar_chords/Eb7(#9).png
new file mode 100644
index 000000000..5280a70f0
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(#9).png differ
diff --git a/share/goodie/guitar_chords/Eb7(13).png b/share/goodie/guitar_chords/Eb7(13).png
new file mode 100644
index 000000000..cb4bf511f
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(13).png differ
diff --git a/share/goodie/guitar_chords/Eb7(9).png b/share/goodie/guitar_chords/Eb7(9).png
new file mode 100644
index 000000000..092a090b9
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(9).png differ
diff --git a/share/goodie/guitar_chords/Eb7(9,13).png b/share/goodie/guitar_chords/Eb7(9,13).png
new file mode 100644
index 000000000..cf17f8064
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(9,13).png differ
diff --git a/share/goodie/guitar_chords/Eb7(b13).png b/share/goodie/guitar_chords/Eb7(b13).png
new file mode 100644
index 000000000..b8ba239f2
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(b13).png differ
diff --git a/share/goodie/guitar_chords/Eb7(b5).png b/share/goodie/guitar_chords/Eb7(b5).png
new file mode 100644
index 000000000..9becb06c3
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(b5).png differ
diff --git a/share/goodie/guitar_chords/Eb7(b9).png b/share/goodie/guitar_chords/Eb7(b9).png
new file mode 100644
index 000000000..4e853a152
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(b9).png differ
diff --git a/share/goodie/guitar_chords/Eb7(b9,13).png b/share/goodie/guitar_chords/Eb7(b9,13).png
new file mode 100644
index 000000000..d1cfa4a5e
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/Eb7.png b/share/goodie/guitar_chords/Eb7.png
new file mode 100644
index 000000000..dca58749c
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7.png differ
diff --git a/share/goodie/guitar_chords/Eb7sus4.png b/share/goodie/guitar_chords/Eb7sus4.png
new file mode 100644
index 000000000..36900d5d6
Binary files /dev/null and b/share/goodie/guitar_chords/Eb7sus4.png differ
diff --git a/share/goodie/guitar_chords/EbM7(9).png b/share/goodie/guitar_chords/EbM7(9).png
new file mode 100644
index 000000000..cccd31122
Binary files /dev/null and b/share/goodie/guitar_chords/EbM7(9).png differ
diff --git a/share/goodie/guitar_chords/EbM7.png b/share/goodie/guitar_chords/EbM7.png
new file mode 100644
index 000000000..813a63371
Binary files /dev/null and b/share/goodie/guitar_chords/EbM7.png differ
diff --git a/share/goodie/guitar_chords/Ebadd9.png b/share/goodie/guitar_chords/Ebadd9.png
new file mode 100644
index 000000000..3367b0e37
Binary files /dev/null and b/share/goodie/guitar_chords/Ebadd9.png differ
diff --git a/share/goodie/guitar_chords/Ebaug.png b/share/goodie/guitar_chords/Ebaug.png
new file mode 100644
index 000000000..b89763685
Binary files /dev/null and b/share/goodie/guitar_chords/Ebaug.png differ
diff --git a/share/goodie/guitar_chords/Ebaug7.png b/share/goodie/guitar_chords/Ebaug7.png
new file mode 100644
index 000000000..c12a3dea3
Binary files /dev/null and b/share/goodie/guitar_chords/Ebaug7.png differ
diff --git a/share/goodie/guitar_chords/Ebdim.png b/share/goodie/guitar_chords/Ebdim.png
new file mode 100644
index 000000000..c268afaa6
Binary files /dev/null and b/share/goodie/guitar_chords/Ebdim.png differ
diff --git a/share/goodie/guitar_chords/Ebm.png b/share/goodie/guitar_chords/Ebm.png
new file mode 100644
index 000000000..0dea3edc1
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm.png differ
diff --git a/share/goodie/guitar_chords/Ebm6(9).png b/share/goodie/guitar_chords/Ebm6(9).png
new file mode 100644
index 000000000..930229a60
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm6(9).png differ
diff --git a/share/goodie/guitar_chords/Ebm6.png b/share/goodie/guitar_chords/Ebm6.png
new file mode 100644
index 000000000..c17fd132a
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm6.png differ
diff --git a/share/goodie/guitar_chords/Ebm7(9).png b/share/goodie/guitar_chords/Ebm7(9).png
new file mode 100644
index 000000000..bfc0f1a4e
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm7(9).png differ
diff --git a/share/goodie/guitar_chords/Ebm7(9,11).png b/share/goodie/guitar_chords/Ebm7(9,11).png
new file mode 100644
index 000000000..75e638721
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Ebm7(b5).png b/share/goodie/guitar_chords/Ebm7(b5).png
new file mode 100644
index 000000000..9e5128e1c
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Ebm7.png b/share/goodie/guitar_chords/Ebm7.png
new file mode 100644
index 000000000..9d42a1e51
Binary files /dev/null and b/share/goodie/guitar_chords/Ebm7.png differ
diff --git a/share/goodie/guitar_chords/EbmM7.png b/share/goodie/guitar_chords/EbmM7.png
new file mode 100644
index 000000000..5cd418115
Binary files /dev/null and b/share/goodie/guitar_chords/EbmM7.png differ
diff --git a/share/goodie/guitar_chords/Ebsus4.png b/share/goodie/guitar_chords/Ebsus4.png
new file mode 100644
index 000000000..8ac21d150
Binary files /dev/null and b/share/goodie/guitar_chords/Ebsus4.png differ
diff --git a/share/goodie/guitar_chords/Edim.png b/share/goodie/guitar_chords/Edim.png
new file mode 100644
index 000000000..3b54bc5c9
Binary files /dev/null and b/share/goodie/guitar_chords/Edim.png differ
diff --git a/share/goodie/guitar_chords/Em.png b/share/goodie/guitar_chords/Em.png
new file mode 100644
index 000000000..0f6ab2a33
Binary files /dev/null and b/share/goodie/guitar_chords/Em.png differ
diff --git a/share/goodie/guitar_chords/Em6(9).png b/share/goodie/guitar_chords/Em6(9).png
new file mode 100644
index 000000000..72ef67ccd
Binary files /dev/null and b/share/goodie/guitar_chords/Em6(9).png differ
diff --git a/share/goodie/guitar_chords/Em6.png b/share/goodie/guitar_chords/Em6.png
new file mode 100644
index 000000000..88c717a5e
Binary files /dev/null and b/share/goodie/guitar_chords/Em6.png differ
diff --git a/share/goodie/guitar_chords/Em7(9).png b/share/goodie/guitar_chords/Em7(9).png
new file mode 100644
index 000000000..3b6691a3e
Binary files /dev/null and b/share/goodie/guitar_chords/Em7(9).png differ
diff --git a/share/goodie/guitar_chords/Em7(9,11).png b/share/goodie/guitar_chords/Em7(9,11).png
new file mode 100644
index 000000000..ef8d28bc6
Binary files /dev/null and b/share/goodie/guitar_chords/Em7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Em7(b5).png b/share/goodie/guitar_chords/Em7(b5).png
new file mode 100644
index 000000000..4e607a7bb
Binary files /dev/null and b/share/goodie/guitar_chords/Em7(b5).png differ
diff --git a/share/goodie/guitar_chords/Em7.png b/share/goodie/guitar_chords/Em7.png
new file mode 100644
index 000000000..ecb0cd2c9
Binary files /dev/null and b/share/goodie/guitar_chords/Em7.png differ
diff --git a/share/goodie/guitar_chords/EmM7.png b/share/goodie/guitar_chords/EmM7.png
new file mode 100644
index 000000000..d6467669f
Binary files /dev/null and b/share/goodie/guitar_chords/EmM7.png differ
diff --git a/share/goodie/guitar_chords/Esus4.png b/share/goodie/guitar_chords/Esus4.png
new file mode 100644
index 000000000..71a41d1f1
Binary files /dev/null and b/share/goodie/guitar_chords/Esus4.png differ
diff --git a/share/goodie/guitar_chords/F#.png b/share/goodie/guitar_chords/F#.png
new file mode 100644
index 000000000..61649d2f5
Binary files /dev/null and b/share/goodie/guitar_chords/F#.png differ
diff --git a/share/goodie/guitar_chords/F#6(9).png b/share/goodie/guitar_chords/F#6(9).png
new file mode 100644
index 000000000..325017bc6
Binary files /dev/null and b/share/goodie/guitar_chords/F#6(9).png differ
diff --git a/share/goodie/guitar_chords/F#6.png b/share/goodie/guitar_chords/F#6.png
new file mode 100644
index 000000000..e3529a0cc
Binary files /dev/null and b/share/goodie/guitar_chords/F#6.png differ
diff --git a/share/goodie/guitar_chords/F#7(#11).png b/share/goodie/guitar_chords/F#7(#11).png
new file mode 100644
index 000000000..be1692d7b
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(#11).png differ
diff --git a/share/goodie/guitar_chords/F#7(#9).png b/share/goodie/guitar_chords/F#7(#9).png
new file mode 100644
index 000000000..3869f069f
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(#9).png differ
diff --git a/share/goodie/guitar_chords/F#7(13).png b/share/goodie/guitar_chords/F#7(13).png
new file mode 100644
index 000000000..cad502d0d
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(13).png differ
diff --git a/share/goodie/guitar_chords/F#7(9).png b/share/goodie/guitar_chords/F#7(9).png
new file mode 100644
index 000000000..7afcbe4da
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(9).png differ
diff --git a/share/goodie/guitar_chords/F#7(9,13).png b/share/goodie/guitar_chords/F#7(9,13).png
new file mode 100644
index 000000000..59d21af5c
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(9,13).png differ
diff --git a/share/goodie/guitar_chords/F#7(b13).png b/share/goodie/guitar_chords/F#7(b13).png
new file mode 100644
index 000000000..a7adf7e1e
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(b13).png differ
diff --git a/share/goodie/guitar_chords/F#7(b5).png b/share/goodie/guitar_chords/F#7(b5).png
new file mode 100644
index 000000000..83166c48b
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(b5).png differ
diff --git a/share/goodie/guitar_chords/F#7(b9).png b/share/goodie/guitar_chords/F#7(b9).png
new file mode 100644
index 000000000..0eefa9735
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(b9).png differ
diff --git a/share/goodie/guitar_chords/F#7(b9,13).png b/share/goodie/guitar_chords/F#7(b9,13).png
new file mode 100644
index 000000000..785ce9a84
Binary files /dev/null and b/share/goodie/guitar_chords/F#7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/F#7.png b/share/goodie/guitar_chords/F#7.png
new file mode 100644
index 000000000..ebf3a90aa
Binary files /dev/null and b/share/goodie/guitar_chords/F#7.png differ
diff --git a/share/goodie/guitar_chords/F#7sus4.png b/share/goodie/guitar_chords/F#7sus4.png
new file mode 100644
index 000000000..6ba6bd642
Binary files /dev/null and b/share/goodie/guitar_chords/F#7sus4.png differ
diff --git a/share/goodie/guitar_chords/F#M7(9).png b/share/goodie/guitar_chords/F#M7(9).png
new file mode 100644
index 000000000..a4fb71c46
Binary files /dev/null and b/share/goodie/guitar_chords/F#M7(9).png differ
diff --git a/share/goodie/guitar_chords/F#M7.png b/share/goodie/guitar_chords/F#M7.png
new file mode 100644
index 000000000..fdddd1a49
Binary files /dev/null and b/share/goodie/guitar_chords/F#M7.png differ
diff --git a/share/goodie/guitar_chords/F#add9.png b/share/goodie/guitar_chords/F#add9.png
new file mode 100644
index 000000000..e73ec9e56
Binary files /dev/null and b/share/goodie/guitar_chords/F#add9.png differ
diff --git a/share/goodie/guitar_chords/F#aug.png b/share/goodie/guitar_chords/F#aug.png
new file mode 100644
index 000000000..eebe49186
Binary files /dev/null and b/share/goodie/guitar_chords/F#aug.png differ
diff --git a/share/goodie/guitar_chords/F#aug7.png b/share/goodie/guitar_chords/F#aug7.png
new file mode 100644
index 000000000..896fecbea
Binary files /dev/null and b/share/goodie/guitar_chords/F#aug7.png differ
diff --git a/share/goodie/guitar_chords/F#dim.png b/share/goodie/guitar_chords/F#dim.png
new file mode 100644
index 000000000..8a632c3db
Binary files /dev/null and b/share/goodie/guitar_chords/F#dim.png differ
diff --git a/share/goodie/guitar_chords/F#m.png b/share/goodie/guitar_chords/F#m.png
new file mode 100644
index 000000000..333152873
Binary files /dev/null and b/share/goodie/guitar_chords/F#m.png differ
diff --git a/share/goodie/guitar_chords/F#m6(9).png b/share/goodie/guitar_chords/F#m6(9).png
new file mode 100644
index 000000000..02992e98f
Binary files /dev/null and b/share/goodie/guitar_chords/F#m6(9).png differ
diff --git a/share/goodie/guitar_chords/F#m6.png b/share/goodie/guitar_chords/F#m6.png
new file mode 100644
index 000000000..b4c619d0f
Binary files /dev/null and b/share/goodie/guitar_chords/F#m6.png differ
diff --git a/share/goodie/guitar_chords/F#m7(9).png b/share/goodie/guitar_chords/F#m7(9).png
new file mode 100644
index 000000000..f6a4ead69
Binary files /dev/null and b/share/goodie/guitar_chords/F#m7(9).png differ
diff --git a/share/goodie/guitar_chords/F#m7(9,11).png b/share/goodie/guitar_chords/F#m7(9,11).png
new file mode 100644
index 000000000..3ba2291ba
Binary files /dev/null and b/share/goodie/guitar_chords/F#m7(9,11).png differ
diff --git a/share/goodie/guitar_chords/F#m7(b5).png b/share/goodie/guitar_chords/F#m7(b5).png
new file mode 100644
index 000000000..1e6f20c26
Binary files /dev/null and b/share/goodie/guitar_chords/F#m7(b5).png differ
diff --git a/share/goodie/guitar_chords/F#m7.png b/share/goodie/guitar_chords/F#m7.png
new file mode 100644
index 000000000..d8cdfc8ce
Binary files /dev/null and b/share/goodie/guitar_chords/F#m7.png differ
diff --git a/share/goodie/guitar_chords/F#mM7.png b/share/goodie/guitar_chords/F#mM7.png
new file mode 100644
index 000000000..9a690d7d5
Binary files /dev/null and b/share/goodie/guitar_chords/F#mM7.png differ
diff --git a/share/goodie/guitar_chords/F#sus4.png b/share/goodie/guitar_chords/F#sus4.png
new file mode 100644
index 000000000..e41b46cc9
Binary files /dev/null and b/share/goodie/guitar_chords/F#sus4.png differ
diff --git a/share/goodie/guitar_chords/F.png b/share/goodie/guitar_chords/F.png
new file mode 100644
index 000000000..1208bcea3
Binary files /dev/null and b/share/goodie/guitar_chords/F.png differ
diff --git a/share/goodie/guitar_chords/F6(9).png b/share/goodie/guitar_chords/F6(9).png
new file mode 100644
index 000000000..66593f2ee
Binary files /dev/null and b/share/goodie/guitar_chords/F6(9).png differ
diff --git a/share/goodie/guitar_chords/F6.png b/share/goodie/guitar_chords/F6.png
new file mode 100644
index 000000000..1b2ebb50a
Binary files /dev/null and b/share/goodie/guitar_chords/F6.png differ
diff --git a/share/goodie/guitar_chords/F7(#11).png b/share/goodie/guitar_chords/F7(#11).png
new file mode 100644
index 000000000..c999ad1e2
Binary files /dev/null and b/share/goodie/guitar_chords/F7(#11).png differ
diff --git a/share/goodie/guitar_chords/F7(#9).png b/share/goodie/guitar_chords/F7(#9).png
new file mode 100644
index 000000000..8bbbb6c84
Binary files /dev/null and b/share/goodie/guitar_chords/F7(#9).png differ
diff --git a/share/goodie/guitar_chords/F7(13).png b/share/goodie/guitar_chords/F7(13).png
new file mode 100644
index 000000000..98d2c1f8b
Binary files /dev/null and b/share/goodie/guitar_chords/F7(13).png differ
diff --git a/share/goodie/guitar_chords/F7(9).png b/share/goodie/guitar_chords/F7(9).png
new file mode 100644
index 000000000..86a7cd570
Binary files /dev/null and b/share/goodie/guitar_chords/F7(9).png differ
diff --git a/share/goodie/guitar_chords/F7(9,13).png b/share/goodie/guitar_chords/F7(9,13).png
new file mode 100644
index 000000000..a0b0e951b
Binary files /dev/null and b/share/goodie/guitar_chords/F7(9,13).png differ
diff --git a/share/goodie/guitar_chords/F7(b13).png b/share/goodie/guitar_chords/F7(b13).png
new file mode 100644
index 000000000..3204845a8
Binary files /dev/null and b/share/goodie/guitar_chords/F7(b13).png differ
diff --git a/share/goodie/guitar_chords/F7(b5).png b/share/goodie/guitar_chords/F7(b5).png
new file mode 100644
index 000000000..44a277ae5
Binary files /dev/null and b/share/goodie/guitar_chords/F7(b5).png differ
diff --git a/share/goodie/guitar_chords/F7(b9).png b/share/goodie/guitar_chords/F7(b9).png
new file mode 100644
index 000000000..d66013619
Binary files /dev/null and b/share/goodie/guitar_chords/F7(b9).png differ
diff --git a/share/goodie/guitar_chords/F7(b9,13).png b/share/goodie/guitar_chords/F7(b9,13).png
new file mode 100644
index 000000000..f814e3cee
Binary files /dev/null and b/share/goodie/guitar_chords/F7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/F7.png b/share/goodie/guitar_chords/F7.png
new file mode 100644
index 000000000..0f842ddf1
Binary files /dev/null and b/share/goodie/guitar_chords/F7.png differ
diff --git a/share/goodie/guitar_chords/F7sus4.png b/share/goodie/guitar_chords/F7sus4.png
new file mode 100644
index 000000000..5adce2c5d
Binary files /dev/null and b/share/goodie/guitar_chords/F7sus4.png differ
diff --git a/share/goodie/guitar_chords/FM7(9).png b/share/goodie/guitar_chords/FM7(9).png
new file mode 100644
index 000000000..bdcb2c88d
Binary files /dev/null and b/share/goodie/guitar_chords/FM7(9).png differ
diff --git a/share/goodie/guitar_chords/FM7.png b/share/goodie/guitar_chords/FM7.png
new file mode 100644
index 000000000..8ae304dc6
Binary files /dev/null and b/share/goodie/guitar_chords/FM7.png differ
diff --git a/share/goodie/guitar_chords/Fadd9.png b/share/goodie/guitar_chords/Fadd9.png
new file mode 100644
index 000000000..73e819647
Binary files /dev/null and b/share/goodie/guitar_chords/Fadd9.png differ
diff --git a/share/goodie/guitar_chords/Faug.png b/share/goodie/guitar_chords/Faug.png
new file mode 100644
index 000000000..b43097488
Binary files /dev/null and b/share/goodie/guitar_chords/Faug.png differ
diff --git a/share/goodie/guitar_chords/Faug7.png b/share/goodie/guitar_chords/Faug7.png
new file mode 100644
index 000000000..ba2d632f1
Binary files /dev/null and b/share/goodie/guitar_chords/Faug7.png differ
diff --git a/share/goodie/guitar_chords/Fdim.png b/share/goodie/guitar_chords/Fdim.png
new file mode 100644
index 000000000..66dbdeafe
Binary files /dev/null and b/share/goodie/guitar_chords/Fdim.png differ
diff --git a/share/goodie/guitar_chords/Fm.png b/share/goodie/guitar_chords/Fm.png
new file mode 100644
index 000000000..c1e1bac57
Binary files /dev/null and b/share/goodie/guitar_chords/Fm.png differ
diff --git a/share/goodie/guitar_chords/Fm6(9).png b/share/goodie/guitar_chords/Fm6(9).png
new file mode 100644
index 000000000..043a619bc
Binary files /dev/null and b/share/goodie/guitar_chords/Fm6(9).png differ
diff --git a/share/goodie/guitar_chords/Fm6.png b/share/goodie/guitar_chords/Fm6.png
new file mode 100644
index 000000000..0d007fd6d
Binary files /dev/null and b/share/goodie/guitar_chords/Fm6.png differ
diff --git a/share/goodie/guitar_chords/Fm7(9).png b/share/goodie/guitar_chords/Fm7(9).png
new file mode 100644
index 000000000..958076097
Binary files /dev/null and b/share/goodie/guitar_chords/Fm7(9).png differ
diff --git a/share/goodie/guitar_chords/Fm7(9,11).png b/share/goodie/guitar_chords/Fm7(9,11).png
new file mode 100644
index 000000000..32a94b5af
Binary files /dev/null and b/share/goodie/guitar_chords/Fm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Fm7(b5).png b/share/goodie/guitar_chords/Fm7(b5).png
new file mode 100644
index 000000000..64fafe6cb
Binary files /dev/null and b/share/goodie/guitar_chords/Fm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Fm7.png b/share/goodie/guitar_chords/Fm7.png
new file mode 100644
index 000000000..2b443820a
Binary files /dev/null and b/share/goodie/guitar_chords/Fm7.png differ
diff --git a/share/goodie/guitar_chords/FmM7.png b/share/goodie/guitar_chords/FmM7.png
new file mode 100644
index 000000000..bd1083ad0
Binary files /dev/null and b/share/goodie/guitar_chords/FmM7.png differ
diff --git a/share/goodie/guitar_chords/Fsus4.png b/share/goodie/guitar_chords/Fsus4.png
new file mode 100644
index 000000000..d23f54932
Binary files /dev/null and b/share/goodie/guitar_chords/Fsus4.png differ
diff --git a/share/goodie/guitar_chords/G#.png b/share/goodie/guitar_chords/G#.png
new file mode 100644
index 000000000..9409a4348
Binary files /dev/null and b/share/goodie/guitar_chords/G#.png differ
diff --git a/share/goodie/guitar_chords/G#6(9).png b/share/goodie/guitar_chords/G#6(9).png
new file mode 100644
index 000000000..28d7a0542
Binary files /dev/null and b/share/goodie/guitar_chords/G#6(9).png differ
diff --git a/share/goodie/guitar_chords/G#6.png b/share/goodie/guitar_chords/G#6.png
new file mode 100644
index 000000000..321cee306
Binary files /dev/null and b/share/goodie/guitar_chords/G#6.png differ
diff --git a/share/goodie/guitar_chords/G#7(#11).png b/share/goodie/guitar_chords/G#7(#11).png
new file mode 100644
index 000000000..ef9c0a894
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(#11).png differ
diff --git a/share/goodie/guitar_chords/G#7(#9).png b/share/goodie/guitar_chords/G#7(#9).png
new file mode 100644
index 000000000..c19b5564f
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(#9).png differ
diff --git a/share/goodie/guitar_chords/G#7(13).png b/share/goodie/guitar_chords/G#7(13).png
new file mode 100644
index 000000000..f931a4db8
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(13).png differ
diff --git a/share/goodie/guitar_chords/G#7(9).png b/share/goodie/guitar_chords/G#7(9).png
new file mode 100644
index 000000000..7ecaeea28
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(9).png differ
diff --git a/share/goodie/guitar_chords/G#7(9,13).png b/share/goodie/guitar_chords/G#7(9,13).png
new file mode 100644
index 000000000..f8c9e3680
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(9,13).png differ
diff --git a/share/goodie/guitar_chords/G#7(b13).png b/share/goodie/guitar_chords/G#7(b13).png
new file mode 100644
index 000000000..df6f8b184
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(b13).png differ
diff --git a/share/goodie/guitar_chords/G#7(b5).png b/share/goodie/guitar_chords/G#7(b5).png
new file mode 100644
index 000000000..be8e15e30
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(b5).png differ
diff --git a/share/goodie/guitar_chords/G#7(b9).png b/share/goodie/guitar_chords/G#7(b9).png
new file mode 100644
index 000000000..eb2b9d92a
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(b9).png differ
diff --git a/share/goodie/guitar_chords/G#7(b9,13).png b/share/goodie/guitar_chords/G#7(b9,13).png
new file mode 100644
index 000000000..989b4710a
Binary files /dev/null and b/share/goodie/guitar_chords/G#7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/G#7.png b/share/goodie/guitar_chords/G#7.png
new file mode 100644
index 000000000..1e43ff623
Binary files /dev/null and b/share/goodie/guitar_chords/G#7.png differ
diff --git a/share/goodie/guitar_chords/G#7sus4.png b/share/goodie/guitar_chords/G#7sus4.png
new file mode 100644
index 000000000..d32df2358
Binary files /dev/null and b/share/goodie/guitar_chords/G#7sus4.png differ
diff --git a/share/goodie/guitar_chords/G#M7(9).png b/share/goodie/guitar_chords/G#M7(9).png
new file mode 100644
index 000000000..291dc6648
Binary files /dev/null and b/share/goodie/guitar_chords/G#M7(9).png differ
diff --git a/share/goodie/guitar_chords/G#M7.png b/share/goodie/guitar_chords/G#M7.png
new file mode 100644
index 000000000..c52282a20
Binary files /dev/null and b/share/goodie/guitar_chords/G#M7.png differ
diff --git a/share/goodie/guitar_chords/G#add9.png b/share/goodie/guitar_chords/G#add9.png
new file mode 100644
index 000000000..3e9e588a1
Binary files /dev/null and b/share/goodie/guitar_chords/G#add9.png differ
diff --git a/share/goodie/guitar_chords/G#aug.png b/share/goodie/guitar_chords/G#aug.png
new file mode 100644
index 000000000..dcfc5f302
Binary files /dev/null and b/share/goodie/guitar_chords/G#aug.png differ
diff --git a/share/goodie/guitar_chords/G#aug7.png b/share/goodie/guitar_chords/G#aug7.png
new file mode 100644
index 000000000..7e93f362f
Binary files /dev/null and b/share/goodie/guitar_chords/G#aug7.png differ
diff --git a/share/goodie/guitar_chords/G#dim.png b/share/goodie/guitar_chords/G#dim.png
new file mode 100644
index 000000000..075691348
Binary files /dev/null and b/share/goodie/guitar_chords/G#dim.png differ
diff --git a/share/goodie/guitar_chords/G#m.png b/share/goodie/guitar_chords/G#m.png
new file mode 100644
index 000000000..3d59fd063
Binary files /dev/null and b/share/goodie/guitar_chords/G#m.png differ
diff --git a/share/goodie/guitar_chords/G#m6(9).png b/share/goodie/guitar_chords/G#m6(9).png
new file mode 100644
index 000000000..fcfc0f32b
Binary files /dev/null and b/share/goodie/guitar_chords/G#m6(9).png differ
diff --git a/share/goodie/guitar_chords/G#m6.png b/share/goodie/guitar_chords/G#m6.png
new file mode 100644
index 000000000..97b227447
Binary files /dev/null and b/share/goodie/guitar_chords/G#m6.png differ
diff --git a/share/goodie/guitar_chords/G#m7(9).png b/share/goodie/guitar_chords/G#m7(9).png
new file mode 100644
index 000000000..2f2d198e6
Binary files /dev/null and b/share/goodie/guitar_chords/G#m7(9).png differ
diff --git a/share/goodie/guitar_chords/G#m7(9,11).png b/share/goodie/guitar_chords/G#m7(9,11).png
new file mode 100644
index 000000000..6b43cd3ac
Binary files /dev/null and b/share/goodie/guitar_chords/G#m7(9,11).png differ
diff --git a/share/goodie/guitar_chords/G#m7(b5).png b/share/goodie/guitar_chords/G#m7(b5).png
new file mode 100644
index 000000000..8fa26aa36
Binary files /dev/null and b/share/goodie/guitar_chords/G#m7(b5).png differ
diff --git a/share/goodie/guitar_chords/G#m7.png b/share/goodie/guitar_chords/G#m7.png
new file mode 100644
index 000000000..2c086e371
Binary files /dev/null and b/share/goodie/guitar_chords/G#m7.png differ
diff --git a/share/goodie/guitar_chords/G#mM7.png b/share/goodie/guitar_chords/G#mM7.png
new file mode 100644
index 000000000..871956c35
Binary files /dev/null and b/share/goodie/guitar_chords/G#mM7.png differ
diff --git a/share/goodie/guitar_chords/G#sus4.png b/share/goodie/guitar_chords/G#sus4.png
new file mode 100644
index 000000000..8e84da4ce
Binary files /dev/null and b/share/goodie/guitar_chords/G#sus4.png differ
diff --git a/share/goodie/guitar_chords/G.png b/share/goodie/guitar_chords/G.png
new file mode 100644
index 000000000..659932f2a
Binary files /dev/null and b/share/goodie/guitar_chords/G.png differ
diff --git a/share/goodie/guitar_chords/G6(9).png b/share/goodie/guitar_chords/G6(9).png
new file mode 100644
index 000000000..d32a63139
Binary files /dev/null and b/share/goodie/guitar_chords/G6(9).png differ
diff --git a/share/goodie/guitar_chords/G6.png b/share/goodie/guitar_chords/G6.png
new file mode 100644
index 000000000..66f8c094c
Binary files /dev/null and b/share/goodie/guitar_chords/G6.png differ
diff --git a/share/goodie/guitar_chords/G7(#11).png b/share/goodie/guitar_chords/G7(#11).png
new file mode 100644
index 000000000..fce679b98
Binary files /dev/null and b/share/goodie/guitar_chords/G7(#11).png differ
diff --git a/share/goodie/guitar_chords/G7(#9).png b/share/goodie/guitar_chords/G7(#9).png
new file mode 100644
index 000000000..dd5fdecdb
Binary files /dev/null and b/share/goodie/guitar_chords/G7(#9).png differ
diff --git a/share/goodie/guitar_chords/G7(13).png b/share/goodie/guitar_chords/G7(13).png
new file mode 100644
index 000000000..78bdf5feb
Binary files /dev/null and b/share/goodie/guitar_chords/G7(13).png differ
diff --git a/share/goodie/guitar_chords/G7(9).png b/share/goodie/guitar_chords/G7(9).png
new file mode 100644
index 000000000..4427544e4
Binary files /dev/null and b/share/goodie/guitar_chords/G7(9).png differ
diff --git a/share/goodie/guitar_chords/G7(9,13).png b/share/goodie/guitar_chords/G7(9,13).png
new file mode 100644
index 000000000..e7bfe9d80
Binary files /dev/null and b/share/goodie/guitar_chords/G7(9,13).png differ
diff --git a/share/goodie/guitar_chords/G7(b13).png b/share/goodie/guitar_chords/G7(b13).png
new file mode 100644
index 000000000..920606f72
Binary files /dev/null and b/share/goodie/guitar_chords/G7(b13).png differ
diff --git a/share/goodie/guitar_chords/G7(b5).png b/share/goodie/guitar_chords/G7(b5).png
new file mode 100644
index 000000000..1d5b4abb0
Binary files /dev/null and b/share/goodie/guitar_chords/G7(b5).png differ
diff --git a/share/goodie/guitar_chords/G7(b9).png b/share/goodie/guitar_chords/G7(b9).png
new file mode 100644
index 000000000..f429bf92f
Binary files /dev/null and b/share/goodie/guitar_chords/G7(b9).png differ
diff --git a/share/goodie/guitar_chords/G7(b9,13).png b/share/goodie/guitar_chords/G7(b9,13).png
new file mode 100644
index 000000000..9df63d1f9
Binary files /dev/null and b/share/goodie/guitar_chords/G7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/G7.png b/share/goodie/guitar_chords/G7.png
new file mode 100644
index 000000000..7388b5782
Binary files /dev/null and b/share/goodie/guitar_chords/G7.png differ
diff --git a/share/goodie/guitar_chords/G7sus4.png b/share/goodie/guitar_chords/G7sus4.png
new file mode 100644
index 000000000..18b41de24
Binary files /dev/null and b/share/goodie/guitar_chords/G7sus4.png differ
diff --git a/share/goodie/guitar_chords/GM7(9).png b/share/goodie/guitar_chords/GM7(9).png
new file mode 100644
index 000000000..2f6c21af7
Binary files /dev/null and b/share/goodie/guitar_chords/GM7(9).png differ
diff --git a/share/goodie/guitar_chords/GM7.png b/share/goodie/guitar_chords/GM7.png
new file mode 100644
index 000000000..e1b4b685a
Binary files /dev/null and b/share/goodie/guitar_chords/GM7.png differ
diff --git a/share/goodie/guitar_chords/Gadd9.png b/share/goodie/guitar_chords/Gadd9.png
new file mode 100644
index 000000000..43e2c9690
Binary files /dev/null and b/share/goodie/guitar_chords/Gadd9.png differ
diff --git a/share/goodie/guitar_chords/Gaug.png b/share/goodie/guitar_chords/Gaug.png
new file mode 100644
index 000000000..4eb26d0ae
Binary files /dev/null and b/share/goodie/guitar_chords/Gaug.png differ
diff --git a/share/goodie/guitar_chords/Gaug7.png b/share/goodie/guitar_chords/Gaug7.png
new file mode 100644
index 000000000..ff5f04d74
Binary files /dev/null and b/share/goodie/guitar_chords/Gaug7.png differ
diff --git a/share/goodie/guitar_chords/Gb.png b/share/goodie/guitar_chords/Gb.png
new file mode 100644
index 000000000..d6b63d619
Binary files /dev/null and b/share/goodie/guitar_chords/Gb.png differ
diff --git a/share/goodie/guitar_chords/Gb6(9).png b/share/goodie/guitar_chords/Gb6(9).png
new file mode 100644
index 000000000..cd0482506
Binary files /dev/null and b/share/goodie/guitar_chords/Gb6(9).png differ
diff --git a/share/goodie/guitar_chords/Gb6.png b/share/goodie/guitar_chords/Gb6.png
new file mode 100644
index 000000000..944e60979
Binary files /dev/null and b/share/goodie/guitar_chords/Gb6.png differ
diff --git a/share/goodie/guitar_chords/Gb7(#11).png b/share/goodie/guitar_chords/Gb7(#11).png
new file mode 100644
index 000000000..6633f6848
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(#11).png differ
diff --git a/share/goodie/guitar_chords/Gb7(#9).png b/share/goodie/guitar_chords/Gb7(#9).png
new file mode 100644
index 000000000..3a5136ee9
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(#9).png differ
diff --git a/share/goodie/guitar_chords/Gb7(13).png b/share/goodie/guitar_chords/Gb7(13).png
new file mode 100644
index 000000000..d7a9be214
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(13).png differ
diff --git a/share/goodie/guitar_chords/Gb7(9).png b/share/goodie/guitar_chords/Gb7(9).png
new file mode 100644
index 000000000..728875861
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(9).png differ
diff --git a/share/goodie/guitar_chords/Gb7(9,13).png b/share/goodie/guitar_chords/Gb7(9,13).png
new file mode 100644
index 000000000..d53594134
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(9,13).png differ
diff --git a/share/goodie/guitar_chords/Gb7(b13).png b/share/goodie/guitar_chords/Gb7(b13).png
new file mode 100644
index 000000000..3500e3963
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(b13).png differ
diff --git a/share/goodie/guitar_chords/Gb7(b5).png b/share/goodie/guitar_chords/Gb7(b5).png
new file mode 100644
index 000000000..2ae8a3adc
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(b5).png differ
diff --git a/share/goodie/guitar_chords/Gb7(b9).png b/share/goodie/guitar_chords/Gb7(b9).png
new file mode 100644
index 000000000..c2b99b012
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(b9).png differ
diff --git a/share/goodie/guitar_chords/Gb7(b9,13).png b/share/goodie/guitar_chords/Gb7(b9,13).png
new file mode 100644
index 000000000..7754063ff
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7(b9,13).png differ
diff --git a/share/goodie/guitar_chords/Gb7.png b/share/goodie/guitar_chords/Gb7.png
new file mode 100644
index 000000000..1c843f5bb
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7.png differ
diff --git a/share/goodie/guitar_chords/Gb7sus4.png b/share/goodie/guitar_chords/Gb7sus4.png
new file mode 100644
index 000000000..cf9704c00
Binary files /dev/null and b/share/goodie/guitar_chords/Gb7sus4.png differ
diff --git a/share/goodie/guitar_chords/GbM7(9).png b/share/goodie/guitar_chords/GbM7(9).png
new file mode 100644
index 000000000..48b83ac50
Binary files /dev/null and b/share/goodie/guitar_chords/GbM7(9).png differ
diff --git a/share/goodie/guitar_chords/GbM7.png b/share/goodie/guitar_chords/GbM7.png
new file mode 100644
index 000000000..75263c649
Binary files /dev/null and b/share/goodie/guitar_chords/GbM7.png differ
diff --git a/share/goodie/guitar_chords/Gbadd9.png b/share/goodie/guitar_chords/Gbadd9.png
new file mode 100644
index 000000000..0f0bdc403
Binary files /dev/null and b/share/goodie/guitar_chords/Gbadd9.png differ
diff --git a/share/goodie/guitar_chords/Gbaug.png b/share/goodie/guitar_chords/Gbaug.png
new file mode 100644
index 000000000..bdeea783d
Binary files /dev/null and b/share/goodie/guitar_chords/Gbaug.png differ
diff --git a/share/goodie/guitar_chords/Gbaug7.png b/share/goodie/guitar_chords/Gbaug7.png
new file mode 100644
index 000000000..9342c0812
Binary files /dev/null and b/share/goodie/guitar_chords/Gbaug7.png differ
diff --git a/share/goodie/guitar_chords/Gbdim.png b/share/goodie/guitar_chords/Gbdim.png
new file mode 100644
index 000000000..3fc02c5e7
Binary files /dev/null and b/share/goodie/guitar_chords/Gbdim.png differ
diff --git a/share/goodie/guitar_chords/Gbm.png b/share/goodie/guitar_chords/Gbm.png
new file mode 100644
index 000000000..3e382b779
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm.png differ
diff --git a/share/goodie/guitar_chords/Gbm6(9).png b/share/goodie/guitar_chords/Gbm6(9).png
new file mode 100644
index 000000000..bab961b40
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm6(9).png differ
diff --git a/share/goodie/guitar_chords/Gbm6.png b/share/goodie/guitar_chords/Gbm6.png
new file mode 100644
index 000000000..fe7f0fa63
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm6.png differ
diff --git a/share/goodie/guitar_chords/Gbm7(9).png b/share/goodie/guitar_chords/Gbm7(9).png
new file mode 100644
index 000000000..3c7e36fd2
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm7(9).png differ
diff --git a/share/goodie/guitar_chords/Gbm7(9,11).png b/share/goodie/guitar_chords/Gbm7(9,11).png
new file mode 100644
index 000000000..b63608a39
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Gbm7(b5).png b/share/goodie/guitar_chords/Gbm7(b5).png
new file mode 100644
index 000000000..926bcc423
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Gbm7.png b/share/goodie/guitar_chords/Gbm7.png
new file mode 100644
index 000000000..fb3d34360
Binary files /dev/null and b/share/goodie/guitar_chords/Gbm7.png differ
diff --git a/share/goodie/guitar_chords/GbmM7.png b/share/goodie/guitar_chords/GbmM7.png
new file mode 100644
index 000000000..e0667d26c
Binary files /dev/null and b/share/goodie/guitar_chords/GbmM7.png differ
diff --git a/share/goodie/guitar_chords/Gbsus4.png b/share/goodie/guitar_chords/Gbsus4.png
new file mode 100644
index 000000000..acaaad327
Binary files /dev/null and b/share/goodie/guitar_chords/Gbsus4.png differ
diff --git a/share/goodie/guitar_chords/Gdim.png b/share/goodie/guitar_chords/Gdim.png
new file mode 100644
index 000000000..bbe537154
Binary files /dev/null and b/share/goodie/guitar_chords/Gdim.png differ
diff --git a/share/goodie/guitar_chords/Gm.png b/share/goodie/guitar_chords/Gm.png
new file mode 100644
index 000000000..3d18d5fea
Binary files /dev/null and b/share/goodie/guitar_chords/Gm.png differ
diff --git a/share/goodie/guitar_chords/Gm6(9).png b/share/goodie/guitar_chords/Gm6(9).png
new file mode 100644
index 000000000..236ff072e
Binary files /dev/null and b/share/goodie/guitar_chords/Gm6(9).png differ
diff --git a/share/goodie/guitar_chords/Gm6.png b/share/goodie/guitar_chords/Gm6.png
new file mode 100644
index 000000000..5707c9adf
Binary files /dev/null and b/share/goodie/guitar_chords/Gm6.png differ
diff --git a/share/goodie/guitar_chords/Gm7(9).png b/share/goodie/guitar_chords/Gm7(9).png
new file mode 100644
index 000000000..f390a3065
Binary files /dev/null and b/share/goodie/guitar_chords/Gm7(9).png differ
diff --git a/share/goodie/guitar_chords/Gm7(9,11).png b/share/goodie/guitar_chords/Gm7(9,11).png
new file mode 100644
index 000000000..b8fc369d9
Binary files /dev/null and b/share/goodie/guitar_chords/Gm7(9,11).png differ
diff --git a/share/goodie/guitar_chords/Gm7(b5).png b/share/goodie/guitar_chords/Gm7(b5).png
new file mode 100644
index 000000000..a6f9ee44f
Binary files /dev/null and b/share/goodie/guitar_chords/Gm7(b5).png differ
diff --git a/share/goodie/guitar_chords/Gm7.png b/share/goodie/guitar_chords/Gm7.png
new file mode 100644
index 000000000..9878e2404
Binary files /dev/null and b/share/goodie/guitar_chords/Gm7.png differ
diff --git a/share/goodie/guitar_chords/GmM7.png b/share/goodie/guitar_chords/GmM7.png
new file mode 100644
index 000000000..c84462070
Binary files /dev/null and b/share/goodie/guitar_chords/GmM7.png differ
diff --git a/share/goodie/guitar_chords/Gsus4.png b/share/goodie/guitar_chords/Gsus4.png
new file mode 100644
index 000000000..1797080ff
Binary files /dev/null and b/share/goodie/guitar_chords/Gsus4.png differ
diff --git a/share/goodie/guitar_chords/Guitar.pm b/share/goodie/guitar_chords/Guitar.pm
index 1d7f78bb3..b791473c3 100644
--- a/share/goodie/guitar_chords/Guitar.pm
+++ b/share/goodie/guitar_chords/Guitar.pm
@@ -1,24 +1,25 @@
 # Modified version of http://search.cpan.org/~taniguchi/GD-Tab-Guitar/lib/GD/Tab/Guitar.pm by Koichi Taniguchi <taniguchi@livedoor.jp>
-
 package Guitar;
 use strict;
 use warnings;
 use Carp;
 use GD;
+require "chords.pm";
 use base qw(Class::Accessor::Fast);
 use List::Util qw(max);
 
 __PACKAGE__->mk_accessors(qw(bgcolor color interlaced));
 
 our $VERSION = '0.03';
-my $SIZE = 1.5;
+our %chord_lists;
+my $SIZE = 3;
 my @lines = (
-    [5*$SIZE,15*$SIZE,46*$SIZE,15*$SIZE],
-    [5*$SIZE,21*$SIZE,46*$SIZE,21*$SIZE],
-    [5*$SIZE,27*$SIZE,46*$SIZE,27*$SIZE],
-    [5*$SIZE,33*$SIZE,46*$SIZE,33*$SIZE],
-    [5*$SIZE,39*$SIZE,46*$SIZE,39*$SIZE],
-    [5*$SIZE,45*$SIZE,46*$SIZE,45*$SIZE],
+    [4*$SIZE,15*$SIZE,46*$SIZE,15*$SIZE],
+    [4*$SIZE,21*$SIZE,46*$SIZE,21*$SIZE],
+    [4*$SIZE,27*$SIZE,46*$SIZE,27*$SIZE],
+    [4*$SIZE,33*$SIZE,46*$SIZE,33*$SIZE],
+    [4*$SIZE,39*$SIZE,46*$SIZE,39*$SIZE],
+    [4*$SIZE,45*$SIZE,46*$SIZE,45*$SIZE],
     [4*$SIZE,15*$SIZE,4*$SIZE,45*$SIZE],
     [6*$SIZE,15*$SIZE,6*$SIZE,45*$SIZE],
     [14*$SIZE,15*$SIZE,14*$SIZE,45*$SIZE],
@@ -27,357 +28,6 @@ my @lines = (
     [38*$SIZE,15*$SIZE,38*$SIZE,45*$SIZE],
 );
 
-my %chord_lists = (
-    'C'          => 'x32010',
-    'C6'         => 'x32210',
-    'C6(9)'      => 'x32233',
-    'CM7'        => 'x32000',
-    'CM7(9)'     => 'x30000',
-    'C7'         => 'x32310',
-    'C7(b5)'     => 'x34310',
-    'C7(b9)'     => 'x32323',
-    'C7(b9,13)'  => 'x21214',
-    'C7(9)'      => 'x3233x',
-    'C7(9,13)'   => 'x32335',
-    'C7(#9)'     => 'x3234x',
-    'C7(#11)'    => 'x1213x',
-    'C7(b13)'    => 'x1211x',
-    'C7(13)'     => 'x1221x',
-    'Cm'         => 'x35543',
-    'Cm6'        => 'x31213',
-    'Cm6(9)'     => 'x3124x',
-    'CmM7'       => 'x31003',
-    'Cm7'        => 'x31313',
-    'Cm7(b5)'    => 'x3434x',
-    'Cm7(9)'     => 'x3133x',
-    'Cm7(9,11)'  => 'x31331',
-    'Cdim'       => 'x3424x',
-    'Caug'       => 'x3211x',
-    'Caug7'      => 'x323x4',
-    'Csus4'      => 'x33011',
-    'C7sus4'     => 'x33311',
-    'Cadd9'      => 'x32030',
-    'C#'         => 'x43121',
-    'C#6'        => 'x4332x',
-    'C#6(9)'     => 'x43344',
-    'C#M7'       => 'x43111',
-    'C#M7(9)'    => 'x4354x',
-    'C#7'        => 'x4342x',
-    'C#7(b5)'    => 'x4542x',
-    'C#7(b9)'    => 'x43434',
-    'C#7(b9,13)' => 'x43436',
-    'C#7(9)'     => 'x4344x',
-    'C#7(9,13)'  => 'x43445',
-    'C#7(#9)'    => 'x4345x',
-    'C#7(#11)'   => 'x4546x',
-    'C#7(b13)'   => 'x2322x',
-    'C#7(13)'    => 'x2332x',
-    'C#m'        => 'x46654',
-    'C#m6'       => 'x42324',
-    'C#m6(9)'    => 'x4234x',
-    'C#mM7'      => 'x4211x',
-    'C#m7'       => 'x42100',
-    'C#m7(b5)'   => 'x4545x',
-    'C#m7(9)'    => 'x4244x',
-    'C#m7(9,11)' => 'x42442',
-    'C#dim'      => 'x4535x',
-    'C#aug'      => 'x4322x',
-    'C#aug7'     => 'x2322x',
-    'C#sus4'     => 'x46674',
-    'C#7sus4'    => 'x44422',
-    'C#add9'     => 'x43141',
-    'D'          => 'xx0232',
-    'D6'         => 'xx0202',
-    'D6(9)'      => 'x54455',
-    'DM7'        => 'xx0222',
-    'DM7(9)'     => 'xx0220',
-    'D7'         => 'xx0212',
-    'D7(b5)'     => 'xx0112',
-    'D7(b9)'     => 'x5454x',
-    'D7(b9,13)'  => 'x54547',
-    'D7(9)'      => 'xx0210',
-    'D7(9,13)'   => 'x54557',
-    'D7(#9)'     => 'x5456x',
-    'D7(#11)'    => 'xx0112',
-    'D7(b13)'    => 'x3433x',
-    'D7(13)'     => 'x3443x',
-    'Dm'         => 'xx0231',
-    'Dm6'        => 'xx0201',
-    'Dm6(9)'     => 'x5345x',
-    'DmM7'       => 'x5322x',
-    'Dm7'        => 'xx0211',
-    'Dm7(b5)'    => 'xx0111',
-    'Dm7(9)'     => 'x5355x',
-    'Dm7(9,11)'  => 'x53553',
-    'Ddim'       => 'xx0101',
-    'Daug'       => 'xx0332',
-    'Daug7'      => 'xx0312',
-    'Dsus4'      => 'x55033',
-    'D7sus4'     => 'xx0213',
-    'Dadd9'      => 'xx0230',
-    'Eb'         => 'xx1343',
-    'Eb6'        => 'xx1313',
-    'Eb6(9)'     => 'x65566',
-    'EbM7'       => 'xx1333',
-    'EbM7(9)'    => 'xx1331',
-    'Eb7'        => 'xx1323',
-    'Eb7(b5)'    => 'xx1223',
-    'Eb7(b9)'    => 'xx1020',
-    'Eb7(b9,13)' => 'x65658',
-    'Eb7(9)'     => 'xx1021',
-    'Eb7(9,13)'  => 'x65668',
-    'Eb7(#9)'    => 'xx1022',
-    'Eb7(#11)'   => 'xx1223',
-    'Eb7(b13)'   => 'x4544x',
-    'Eb7(13)'    => 'x4554x',
-    'Ebm'        => 'xx1342',
-    'Ebm6'       => 'xx1312',
-    'Ebm6(9)'    => 'x6456x',
-    'EbmM7'      => 'xx1332',
-    'Ebm7'       => 'xx1322',
-    'Ebm7(b5)'   => 'xx1222',
-    'Ebm7(9)'    => 'x6466x',
-    'Ebm7(9,11)' => 'xx1121',
-    'Ebdim'      => 'xx1212',
-    'Ebaug'      => 'xx1003',
-    'Ebaug7'     => 'x2102x',
-    'Ebsus4'     => 'xx1344',
-    'Eb7sus4'    => 'xx1324',
-    'Ebadd9'     => 'xx1341',
-    'E'          => '022100',
-    'E6'         => '022120',
-    'E6(9)'      => 'xx2122',
-    'EM7'        => '02110x',
-    'EM7(9)'     => '021102',
-    'E7'         => '020100',
-    'E7(b5)'     => 'xx2334',
-    'E7(b9)'     => '020101',
-    'E7(b9,13)'  => '020131',
-    'E7(9)'      => '020132',
-    'E7(9,13)'   => '020122',
-    'E7(#9)'     => '020103',
-    'E7(#11)'    => '6x675x',
-    'E7(b13)'    => '020110',
-    'E7(13)'     => '020120',
-    'Em'         => '022000',
-    'Em6'        => '022020',
-    'Em6(9)'     => '022022',
-    'EmM7'       => '021000',
-    'Em7'        => '020000',
-    'Em7(b5)'    => '0x2333',
-    'Em7(9)'     => '020002',
-    'Em7(9,11)'  => 'xx2232',
-    'Edim'       => '012020',
-    'Eaug'       => '03211x',
-    'Eaug7'      => '032130',
-    'Esus4'      => '022200',
-    'E7sus4'     => '020200',
-    'Eadd9'      => '024100',
-    'F'          => '133211',
-    'F6'         => '1x323x',
-    'F6(9)'      => '100011',
-    'FM7'        => 'xx3210',
-    'FM7(9)'     => '1x2010',
-    'F7'         => '131211',
-    'F7(b5)'     => '1x120x',
-    'F7(b9)'     => 'xx1212',
-    'F7(b9,13)'  => '1x1232',
-    'F7(9)'      => '131213',
-    'F7(9,13)'   => '1x123x',
-    'F7(#9)'     => '131214',
-    'F7(#11)'    => '101201',
-    'F7(b13)'    => '1x122x',
-    'F7(13)'     => '1x123x',
-    'Fm'         => '133111',
-    'Fm6'        => '133131',
-    'Fm6(9)'     => '1xx133',
-    'FmM7'       => '13211x',
-    'Fm7'        => '131111',
-    'Fm7(b5)'    => '1x110x',
-    'Fm7(9)'     => '131113',
-    'Fm7(9,11)'  => '131313',
-    'Fdim'       => '1x0101',
-    'Faug'       => 'xx3221',
-    'Faug7'      => '1x1221',
-    'Fsus4'      => '133311',
-    'F7sus4'     => '131311',
-    'Fadd9'      => 'xx3213',
-    'F#'         => '244322',
-    'F#6'        => '2x434x',
-    'F#6(9)'     => '2x112x',
-    'F#M7'       => 'xx4321',
-    'F#M7(9)'    => '2x312x',
-    'F#7'        => '242322',
-    'F#7(b5)'    => '2x231x',
-    'F#7(b9)'    => '212020',
-    'F#7(b9,13)' => 'x1204x',
-    'F#7(9)'     => '21212x',
-    'F#7(9,13)'  => '21213x',
-    'F#7(#9)'    => '242325',
-    'F#7(#11)'   => '2x231x',
-    'F#7(b13)'   => '2x233x',
-    'F#7(13)'    => '2x234x',
-    'F#m'        => '244222',
-    'F#m6'       => '244242',
-    'F#m6(9)'    => 'xx1224',
-    'F#mM7'      => '24322x',
-    'F#m7'       => '242222',
-    'F#m7(b5)'   => '2x221x',
-    'F#m7(9)'    => '242224',
-    'F#m7(9,11)' => '20210x',
-    'F#dim'      => '2x121x',
-    'F#aug'      => 'xx4332',
-    'F#aug7'     => '2x2332',
-    'F#sus4'     => '244422',
-    'F#7sus4'    => '242422',
-    'F#add9'     => 'xx4324',
-    'G'          => '320003',
-    'G6'         => '320000',
-    'G6(9)'      => '3x223x',
-    'GM7'        => '320002',
-    'GM7(9)'     => '3x423x',
-    'G7'         => '320001',
-    'G7(b5)'     => '3x342x',
-    'G7(b9)'     => 'x2313x',
-    'G7(b9,13)'  => '3x3100',
-    'G7(9)'      => '353435',
-    'G7(9,13)'   => '3x3200',
-    'G7(#9)'     => '353436',
-    'G7(#11)'    => '3x342x',
-    'G7(b13)'    => '3x344x',
-    'G7(13)'     => '323000',
-    'Gm'         => '355333',
-    'Gm6'        => '3x233x',
-    'Gm6(9)'     => 'xx2335',
-    'GmM7'       => '354333',
-    'Gm7'        => '353333',
-    'Gm7(b5)'    => '3x332x',
-    'Gm7(9)'     => '353335',
-    'Gm7(9,11)'  => '3x321x',
-    'Gdim'       => '3x232x',
-    'Gaug'       => '321003',
-    'Gaug7'      => '3x3443',
-    'Gsus4'      => '330013',
-    'G7sus4'     => '330011',
-    'Gadd9'      => '3x0233',
-    'G#'         => '431114',
-    'G#6'        => '431111',
-    'G#6(9)'     => '4x334x',
-    'G#M7'       => 'xx6543',
-    'G#M7(9)'    => '4x534x',
-    'G#7'        => '464544',
-    'G#7(b5)'    => '4x453x',
-    'G#7(b9)'    => 'x3424x',
-    'G#7(b9,13)' => '4x4211',
-    'G#7(9)'     => '464546',
-    'G#7(9,13)'  => '4x4311',
-    'G#7(#9)'    => '464547',
-    'G#7(#11)'   => '4x453x',
-    'G#7(b13)'   => '4x455x',
-    'G#7(13)'    => '434111',
-    'G#m'        => '466444',
-    'G#m6'       => 'xx1101',
-    'G#m6(9)'    => 'xx3446',
-    'G#mM7'      => 'xx1103',
-    'G#m7'       => '464444',
-    'G#m7(b5)'   => 'x20102',
-    'G#m7(9)'    => '464446',
-    'G#m7(9,11)' => '4x432x',
-    'G#dim'      => '4x343x',
-    'G#aug'      => 'xx6554',
-    'G#aug7'     => '4x4554',
-    'G#sus4'     => '466644',
-    'G#7sus4'    => '464644',
-    'G#add9'     => 'xx6546',
-    'A'          => 'x02220',
-    'A6'         => 'x02222',
-    'A6(9)'      => 'x02202',
-    'AM7'        => 'x02120',
-    'AM7(9)'     => 'x02100',
-    'A7'         => 'x02020',
-    'A7(b5)'     => 'x0102x',
-    'A7(b9)'     => 'x02323',
-    'A7(b9,13)'  => 'x05322',
-    'A7(9)'      => 'x02423',
-    'A7(9,13)'   => 'x05422',
-    'A7(#9)'     => '575658',
-    'A7(#11)'    => 'x01023',
-    'A7(b13)'    => 'x02021',
-    'A7(13)'     => 'x02022',
-    'Am'         => 'x02210',
-    'Am6'        => 'x02212',
-    'Am6(9)'     => 'xx4557',
-    'AmM7'       => 'x02110',
-    'Am7'        => 'x02010',
-    'Am7(b5)'    => 'x01213',
-    'Am7(9)'     => 'x02000',
-    'Am7(9,11)'  => 'x02433',
-    'Adim'       => 'x01212',
-    'Aaug'       => 'x03221',
-    'Aaug7'      => 'x03021',
-    'Asus4'      => 'x02230',
-    'A7sus4'     => 'x02030',
-    'Aadd9'      => 'x02200',
-    'Bb'         => 'x13331',
-    'Bb6'        => 'x13333',
-    'Bb6(9)'     => 'x10011',
-    'BbM7'       => 'x13231',
-    'BbM7(9)'    => 'x10211',
-    'Bb7'        => 'x13131',
-    'Bb7(b5)'    => 'x12131',
-    'Bb7(b9)'    => 'x10101',
-    'Bb7(b9,13)' => 'x10103',
-    'Bb7(9)'     => 'x1011x',
-    'Bb7(9,13)'  => 'x10113',
-    'Bb7(#9)'    => 'x1012x',
-    'Bb7(#11)'   => 'x10130',
-    'Bb7(b13)'   => 'x13132',
-    'Bb7(13)'    => 'x13133',
-    'Bbm'        => 'x13321',
-    'Bbm6'       => 'x1302x',
-    'Bbm6(9)'    => 'xx5668',
-    'BbmM7'      => 'x13221',
-    'Bbm7'       => 'x13121',
-    'Bbm7(b5)'   => 'x1212x',
-    'Bbm7(9)'    => 'x13111',
-    'Bbm7(9,11)' => '6x654x',
-    'Bbdim'      => 'x12020',
-    'Bbaug'      => 'x10443',
-    'Bbaug7'     => 'x14132',
-    'Bbsus4'     => 'x13341',
-    'Bb7sus4'    => 'x13141',
-    'Bbadd9'     => 'x13311',
-    'B'          => 'x24442',
-    'B6'         => 'x24444',
-    'B6(9)'      => 'x21122',
-    'BM7'        => 'x24342',
-    'BM7(9)'     => 'x2132x',
-    'B7'         => 'x21202',
-    'B7(b5)'     => 'x2324x',
-    'B7(b9)'     => 'x2121x',
-    'B7(b9,13)'  => 'x21214',
-    'B7(9)'      => 'x2122x',
-    'B7(9,13)'   => 'x21224',
-    'B7(#9)'     => 'x2123x',
-    'B7(#11)'    => 'x2324x',
-    'B7(b13)'    => 'x24243',
-    'B7(13)'     => 'x24244',
-    'Bm'         => 'x24432',
-    'Bm6'        => 'x2413x',
-    'Bm6(9)'     => 'x2012x',
-    'BmM7'       => 'x20332',
-    'Bm7'        => 'x20202',
-    'Bm7(b5)'    => 'x2323x',
-    'Bm7(9)'     => 'x2022x',
-    'Bm7(9,11)'  => 'x20220',
-    'Bdim'       => 'x2313x',
-    'Baug'       => 'x2100x',
-    'Baug7'      => 'x25243',
-    'Bsus4'      => 'x24452',
-    'B7sus4'     => 'x22202',
-    'Badd9'      => 'x24422',
-);
-
 my %synonyms = (
     'C#' => 'Db',
     'Eb' => 'D#',
@@ -423,6 +73,7 @@ sub generate {
     my $im = GD::Image->new(52 * $SIZE, 56 * $SIZE);
     my $bgcolor = $im->colorAllocate(@{$self->bgcolor});
     my $color = $im->colorAllocate(@{$self->color});
+    $im->setThickness(2);
 
     if ($self->interlaced) {
         $im->transparent($bgcolor);
@@ -434,7 +85,7 @@ sub generate {
     my $fret_max = max( grep { /^\d+$/ } @frets );
 
     if ($fret_max > 5) {
-        $im->filledRectangle(4*$SIZE, 15*$SIZE, 6*$SIZE, 45*$SIZE, $bgcolor);
+        $im->filledRectangle(3*$SIZE, 14*$SIZE, 6*$SIZE, 45*$SIZE, $bgcolor);
         my $fret_num = $fret_max - 5;
 
         for my $fret (@frets) {
@@ -442,9 +93,17 @@ sub generate {
             $fret -= $fret_num;
         }
 
-        for my $n (0..4) { $im->string(GD::Font->Small, $n * (8 * $SIZE) + 10, 47*$SIZE, $fret_num + 1, $color); $fret_num++; } } my $i = 0; for my $fret (@frets) { if (lc $fret eq 'x') { $im->line(0*$SIZE, (14 + 6 * $i)*$SIZE, 2*$SIZE, (16 + 6 * $i)*$SIZE, $color); $im->line(2*$SIZE, (14 + 6 * $i)*$SIZE, 0, (16 + 6 * $i)*$SIZE, $color);
+        for my $n (0..4) {
+            $im->stringFT($color, "./font.ttf", 15, 0, $n * (8 * $SIZE) + 24, 53*$SIZE, $fret_num + 1);
+            $fret_num++;
         }
-        elsif ($fret > 0) {
+    }
+    my $i = 0;
+    for my $fret (@frets) {
+        if (lc $fret eq 'x') {
+            $im->line(0*$SIZE, (14 + 6 * $i)*$SIZE, 2*$SIZE, (16 + 6 * $i)*$SIZE, $color);
+            $im->line(2*$SIZE, (14 + 6 * $i)*$SIZE, 0, (16 + 6 * $i)*$SIZE, $color);
+        } elsif ($fret > 0) {
             $im->filledRectangle(
                 (9  + 8 * ($fret - 1))*$SIZE,
                 (14 + 6 * $i)*$SIZE,
@@ -455,7 +114,7 @@ sub generate {
         $i++;
     }
 
-    $im->stringFT($color, "./font.ttf", 9, 0, 5, 16, $chord);
+    $im->stringFT($color, "./font.ttf", 18, 0, 8, 36, $chord);
     return $im;
 }
 
diff --git a/share/goodie/guitar_chords/README b/share/goodie/guitar_chords/README
index 5dfbad1b1..aba9e6c80 100644
--- a/share/goodie/guitar_chords/README
+++ b/share/goodie/guitar_chords/README
@@ -1,3 +1,10 @@
 generate.pm generates the images used by the GuitarChords goodie.
 
 Run `make` to run the perl script and create the .pngs and `make clean` to delete them (if necessary).
+
+Deps (from cpan):
+- GD
+- Carp
+
+External deps (from apt-get):
+- libgd_dev
diff --git a/share/goodie/guitar_chords/chords.pm b/share/goodie/guitar_chords/chords.pm
new file mode 100644
index 000000000..43ce6eb87
--- /dev/null
+++ b/share/goodie/guitar_chords/chords.pm
@@ -0,0 +1,352 @@
+# This just contains the list of valid guitar chords
+%chord_lists = (
+    'C'          => 'x32010',
+    'C6'         => 'x32210',
+    'C6(9)'      => 'x32233',
+    'CM7'        => 'x32000',
+    'CM7(9)'     => 'x30000',
+    'C7'         => 'x32310',
+    'C7(b5)'     => 'x34310',
+    'C7(b9)'     => 'x32323',
+    'C7(b9,13)'  => 'x21214',
+    'C7(9)'      => 'x3233x',
+    'C7(9,13)'   => 'x32335',
+    'C7(#9)'     => 'x3234x',
+    'C7(#11)'    => 'x1213x',
+    'C7(b13)'    => 'x1211x',
+    'C7(13)'     => 'x1221x',
+    'Cm'         => 'x35543',
+    'Cm6'        => 'x31213',
+    'Cm6(9)'     => 'x3124x',
+    'CmM7'       => 'x31003',
+    'Cm7'        => 'x31313',
+    'Cm7(b5)'    => 'x3434x',
+    'Cm7(9)'     => 'x3133x',
+    'Cm7(9,11)'  => 'x31331',
+    'Cdim'       => 'x3424x',
+    'Caug'       => 'x3211x',
+    'Caug7'      => 'x323x4',
+    'Csus4'      => 'x33011',
+    'C7sus4'     => 'x33311',
+    'Cadd9'      => 'x32030',
+    'C#'         => 'x43121',
+    'C#6'        => 'x4332x',
+    'C#6(9)'     => 'x43344',
+    'C#M7'       => 'x43111',
+    'C#M7(9)'    => 'x4354x',
+    'C#7'        => 'x4342x',
+    'C#7(b5)'    => 'x4542x',
+    'C#7(b9)'    => 'x43434',
+    'C#7(b9,13)' => 'x43436',
+    'C#7(9)'     => 'x4344x',
+    'C#7(9,13)'  => 'x43445',
+    'C#7(#9)'    => 'x4345x',
+    'C#7(#11)'   => 'x4546x',
+    'C#7(b13)'   => 'x2322x',
+    'C#7(13)'    => 'x2332x',
+    'C#m'        => 'x46654',
+    'C#m6'       => 'x42324',
+    'C#m6(9)'    => 'x4234x',
+    'C#mM7'      => 'x4211x',
+    'C#m7'       => 'x42100',
+    'C#m7(b5)'   => 'x4545x',
+    'C#m7(9)'    => 'x4244x',
+    'C#m7(9,11)' => 'x42442',
+    'C#dim'      => 'x4535x',
+    'C#aug'      => 'x4322x',
+    'C#aug7'     => 'x2322x',
+    'C#sus4'     => 'x46674',
+    'C#7sus4'    => 'x44422',
+    'C#add9'     => 'x43141',
+    'D'          => 'xx0232',
+    'D6'         => 'xx0202',
+    'D6(9)'      => 'x54455',
+    'DM7'        => 'xx0222',
+    'DM7(9)'     => 'xx0220',
+    'D7'         => 'xx0212',
+    'D7(b5)'     => 'xx0112',
+    'D7(b9)'     => 'x5454x',
+    'D7(b9,13)'  => 'x54547',
+    'D7(9)'      => 'xx0210',
+    'D7(9,13)'   => 'x54557',
+    'D7(#9)'     => 'x5456x',
+    'D7(#11)'    => 'xx0112',
+    'D7(b13)'    => 'x3433x',
+    'D7(13)'     => 'x3443x',
+    'Dm'         => 'xx0231',
+    'Dm6'        => 'xx0201',
+    'Dm6(9)'     => 'x5345x',
+    'DmM7'       => 'x5322x',
+    'Dm7'        => 'xx0211',
+    'Dm7(b5)'    => 'xx0111',
+    'Dm7(9)'     => 'x5355x',
+    'Dm7(9,11)'  => 'x53553',
+    'Ddim'       => 'xx0101',
+    'Daug'       => 'xx0332',
+    'Daug7'      => 'xx0312',
+    'Dsus4'      => 'x55033',
+    'D7sus4'     => 'xx0213',
+    'Dadd9'      => 'xx0230',
+    'Eb'         => 'xx1343',
+    'Eb6'        => 'xx1313',
+    'Eb6(9)'     => 'x65566',
+    'EbM7'       => 'xx1333',
+    'EbM7(9)'    => 'xx1331',
+    'Eb7'        => 'xx1323',
+    'Eb7(b5)'    => 'xx1223',
+    'Eb7(b9)'    => 'xx1020',
+    'Eb7(b9,13)' => 'x65658',
+    'Eb7(9)'     => 'xx1021',
+    'Eb7(9,13)'  => 'x65668',
+    'Eb7(#9)'    => 'xx1022',
+    'Eb7(#11)'   => 'xx1223',
+    'Eb7(b13)'   => 'x4544x',
+    'Eb7(13)'    => 'x4554x',
+    'Ebm'        => 'xx1342',
+    'Ebm6'       => 'xx1312',
+    'Ebm6(9)'    => 'x6456x',
+    'EbmM7'      => 'xx1332',
+    'Ebm7'       => 'xx1322',
+    'Ebm7(b5)'   => 'xx1222',
+    'Ebm7(9)'    => 'x6466x',
+    'Ebm7(9,11)' => 'xx1121',
+    'Ebdim'      => 'xx1212',
+    'Ebaug'      => 'xx1003',
+    'Ebaug7'     => 'x2102x',
+    'Ebsus4'     => 'xx1344',
+    'Eb7sus4'    => 'xx1324',
+    'Ebadd9'     => 'xx1341',
+    'E'          => '022100',
+    'E6'         => '022120',
+    'E6(9)'      => 'xx2122',
+    'EM7'        => '02110x',
+    'EM7(9)'     => '021102',
+    'E7'         => '020100',
+    'E7(b5)'     => 'xx2334',
+    'E7(b9)'     => '020101',
+    'E7(b9,13)'  => '020131',
+    'E7(9)'      => '020132',
+    'E7(9,13)'   => '020122',
+    'E7(#9)'     => '020103',
+    'E7(#11)'    => '6x675x',
+    'E7(b13)'    => '020110',
+    'E7(13)'     => '020120',
+    'Em'         => '022000',
+    'Em6'        => '022020',
+    'Em6(9)'     => '022022',
+    'EmM7'       => '021000',
+    'Em7'        => '020000',
+    'Em7(b5)'    => '0x2333',
+    'Em7(9)'     => '020002',
+    'Em7(9,11)'  => 'xx2232',
+    'Edim'       => '012020',
+    'Eaug'       => '03211x',
+    'Eaug7'      => '032130',
+    'Esus4'      => '022200',
+    'E7sus4'     => '020200',
+    'Eadd9'      => '024100',
+    'F'          => '133211',
+    'F6'         => '1x323x',
+    'F6(9)'      => '100011',
+    'FM7'        => 'xx3210',
+    'FM7(9)'     => '1x2010',
+    'F7'         => '131211',
+    'F7(b5)'     => '1x120x',
+    'F7(b9)'     => 'xx1212',
+    'F7(b9,13)'  => '1x1232',
+    'F7(9)'      => '131213',
+    'F7(9,13)'   => '1x123x',
+    'F7(#9)'     => '131214',
+    'F7(#11)'    => '101201',
+    'F7(b13)'    => '1x122x',
+    'F7(13)'     => '1x123x',
+    'Fm'         => '133111',
+    'Fm6'        => '133131',
+    'Fm6(9)'     => '1xx133',
+    'FmM7'       => '13211x',
+    'Fm7'        => '131111',
+    'Fm7(b5)'    => '1x110x',
+    'Fm7(9)'     => '131113',
+    'Fm7(9,11)'  => '131313',
+    'Fdim'       => '1x0101',
+    'Faug'       => 'xx3221',
+    'Faug7'      => '1x1221',
+    'Fsus4'      => '133311',
+    'F7sus4'     => '131311',
+    'Fadd9'      => 'xx3213',
+    'F#'         => '244322',
+    'F#6'        => '2x434x',
+    'F#6(9)'     => '2x112x',
+    'F#M7'       => 'xx4321',
+    'F#M7(9)'    => '2x312x',
+    'F#7'        => '242322',
+    'F#7(b5)'    => '2x231x',
+    'F#7(b9)'    => '212020',
+    'F#7(b9,13)' => 'x1204x',
+    'F#7(9)'     => '21212x',
+    'F#7(9,13)'  => '21213x',
+    'F#7(#9)'    => '242325',
+    'F#7(#11)'   => '2x231x',
+    'F#7(b13)'   => '2x233x',
+    'F#7(13)'    => '2x234x',
+    'F#m'        => '244222',
+    'F#m6'       => '244242',
+    'F#m6(9)'    => 'xx1224',
+    'F#mM7'      => '24322x',
+    'F#m7'       => '242222',
+    'F#m7(b5)'   => '2x221x',
+    'F#m7(9)'    => '242224',
+    'F#m7(9,11)' => '20210x',
+    'F#dim'      => '2x121x',
+    'F#aug'      => 'xx4332',
+    'F#aug7'     => '2x2332',
+    'F#sus4'     => '244422',
+    'F#7sus4'    => '242422',
+    'F#add9'     => 'xx4324',
+    'G'          => '320003',
+    'G6'         => '320000',
+    'G6(9)'      => '3x223x',
+    'GM7'        => '320002',
+    'GM7(9)'     => '3x423x',
+    'G7'         => '320001',
+    'G7(b5)'     => '3x342x',
+    'G7(b9)'     => 'x2313x',
+    'G7(b9,13)'  => '3x3100',
+    'G7(9)'      => '353435',
+    'G7(9,13)'   => '3x3200',
+    'G7(#9)'     => '353436',
+    'G7(#11)'    => '3x342x',
+    'G7(b13)'    => '3x344x',
+    'G7(13)'     => '323000',
+    'Gm'         => '355333',
+    'Gm6'        => '3x233x',
+    'Gm6(9)'     => 'xx2335',
+    'GmM7'       => '354333',
+    'Gm7'        => '353333',
+    'Gm7(b5)'    => '3x332x',
+    'Gm7(9)'     => '353335',
+    'Gm7(9,11)'  => '3x321x',
+    'Gdim'       => '3x232x',
+    'Gaug'       => '321003',
+    'Gaug7'      => '3x3443',
+    'Gsus4'      => '330013',
+    'G7sus4'     => '330011',
+    'Gadd9'      => '3x0233',
+    'G#'         => '431114',
+    'G#6'        => '431111',
+    'G#6(9)'     => '4x334x',
+    'G#M7'       => 'xx6543',
+    'G#M7(9)'    => '4x534x',
+    'G#7'        => '464544',
+    'G#7(b5)'    => '4x453x',
+    'G#7(b9)'    => 'x3424x',
+    'G#7(b9,13)' => '4x4211',
+    'G#7(9)'     => '464546',
+    'G#7(9,13)'  => '4x4311',
+    'G#7(#9)'    => '464547',
+    'G#7(#11)'   => '4x453x',
+    'G#7(b13)'   => '4x455x',
+    'G#7(13)'    => '434111',
+    'G#m'        => '466444',
+    'G#m6'       => 'xx1101',
+    'G#m6(9)'    => 'xx3446',
+    'G#mM7'      => 'xx1103',
+    'G#m7'       => '464444',
+    'G#m7(b5)'   => 'x20102',
+    'G#m7(9)'    => '464446',
+    'G#m7(9,11)' => '4x432x',
+    'G#dim'      => '4x343x',
+    'G#aug'      => 'xx6554',
+    'G#aug7'     => '4x4554',
+    'G#sus4'     => '466644',
+    'G#7sus4'    => '464644',
+    'G#add9'     => 'xx6546',
+    'A'          => 'x02220',
+    'A6'         => 'x02222',
+    'A6(9)'      => 'x02202',
+    'AM7'        => 'x02120',
+    'AM7(9)'     => 'x02100',
+    'A7'         => 'x02020',
+    'A7(b5)'     => 'x0102x',
+    'A7(b9)'     => 'x02323',
+    'A7(b9,13)'  => 'x05322',
+    'A7(9)'      => 'x02423',
+    'A7(9,13)'   => 'x05422',
+    'A7(#9)'     => '575658',
+    'A7(#11)'    => 'x01023',
+    'A7(b13)'    => 'x02021',
+    'A7(13)'     => 'x02022',
+    'Am'         => 'x02210',
+    'Am6'        => 'x02212',
+    'Am6(9)'     => 'xx4557',
+    'AmM7'       => 'x02110',
+    'Am7'        => 'x02010',
+    'Am7(b5)'    => 'x01213',
+    'Am7(9)'     => 'x02000',
+    'Am7(9,11)'  => 'x02433',
+    'Adim'       => 'x01212',
+    'Aaug'       => 'x03221',
+    'Aaug7'      => 'x03021',
+    'Asus4'      => 'x02230',
+    'A7sus4'     => 'x02030',
+    'Aadd9'      => 'x02200',
+    'Bb'         => 'x13331',
+    'Bb6'        => 'x13333',
+    'Bb6(9)'     => 'x10011',
+    'BbM7'       => 'x13231',
+    'BbM7(9)'    => 'x10211',
+    'Bb7'        => 'x13131',
+    'Bb7(b5)'    => 'x12131',
+    'Bb7(b9)'    => 'x10101',
+    'Bb7(b9,13)' => 'x10103',
+    'Bb7(9)'     => 'x1011x',
+    'Bb7(9,13)'  => 'x10113',
+    'Bb7(#9)'    => 'x1012x',
+    'Bb7(#11)'   => 'x10130',
+    'Bb7(b13)'   => 'x13132',
+    'Bb7(13)'    => 'x13133',
+    'Bbm'        => 'x13321',
+    'Bbm6'       => 'x1302x',
+    'Bbm6(9)'    => 'xx5668',
+    'BbmM7'      => 'x13221',
+    'Bbm7'       => 'x13121',
+    'Bbm7(b5)'   => 'x1212x',
+    'Bbm7(9)'    => 'x13111',
+    'Bbm7(9,11)' => '6x654x',
+    'Bbdim'      => 'x12020',
+    'Bbaug'      => 'x10443',
+    'Bbaug7'     => 'x14132',
+    'Bbsus4'     => 'x13341',
+    'Bb7sus4'    => 'x13141',
+    'Bbadd9'     => 'x13311',
+    'B'          => 'x24442',
+    'B6'         => 'x24444',
+    'B6(9)'      => 'x21122',
+    'BM7'        => 'x24342',
+    'BM7(9)'     => 'x2132x',
+    'B7'         => 'x21202',
+    'B7(b5)'     => 'x2324x',
+    'B7(b9)'     => 'x2121x',
+    'B7(b9,13)'  => 'x21214',
+    'B7(9)'      => 'x2122x',
+    'B7(9,13)'   => 'x21224',
+    'B7(#9)'     => 'x2123x',
+    'B7(#11)'    => 'x2324x',
+    'B7(b13)'    => 'x24243',
+    'B7(13)'     => 'x24244',
+    'Bm'         => 'x24432',
+    'Bm6'        => 'x2413x',
+    'Bm6(9)'     => 'x2012x',
+    'BmM7'       => 'x20332',
+    'Bm7'        => 'x20202',
+    'Bm7(b5)'    => 'x2323x',
+    'Bm7(9)'     => 'x2022x',
+    'Bm7(9,11)'  => 'x20220',
+    'Bdim'       => 'x2313x',
+    'Baug'       => 'x2100x',
+    'Baug7'      => 'x25243',
+    'Bsus4'      => 'x24452',
+    'B7sus4'     => 'x22202',
+    'Badd9'      => 'x24422',
+);
+
diff --git a/share/goodie/guitar_chords/generate.pm b/share/goodie/guitar_chords/generate.pm
index a4e396538..5978eaf8e 100644
--- a/share/goodie/guitar_chords/generate.pm
+++ b/share/goodie/guitar_chords/generate.pm
@@ -1,9 +1,7 @@
 use Guitar;
-#use GD::Tab::Guitar;
 use IO::File;
 
 my $gtr = Guitar->new;
-#my $gtr = GD::Tab::Guitar->new;
 for my $chord (@{$gtr->all_chords}) {
     my $filename = $chord;
     my $file = IO::File->new("$filename.png", 'w');