diff --git a/css/images/blue_block.png b/css/images/blue_block.png
new file mode 100644
index 0000000..b0c5504
Binary files /dev/null and b/css/images/blue_block.png differ
diff --git a/css/images/green_block.png b/css/images/green_block.png
new file mode 100644
index 0000000..6787340
Binary files /dev/null and b/css/images/green_block.png differ
diff --git a/css/images/navy_block.png b/css/images/navy_block.png
new file mode 100644
index 0000000..162dfee
Binary files /dev/null and b/css/images/navy_block.png differ
diff --git a/css/images/peach_block.png b/css/images/peach_block.png
new file mode 100644
index 0000000..ff5ed22
Binary files /dev/null and b/css/images/peach_block.png differ
diff --git a/css/images/pink_block.png b/css/images/pink_block.png
new file mode 100644
index 0000000..df75566
Binary files /dev/null and b/css/images/pink_block.png differ
diff --git a/css/images/purple_block.png b/css/images/purple_block.png
new file mode 100644
index 0000000..7357150
Binary files /dev/null and b/css/images/purple_block.png differ
diff --git a/css/images/yellow_block.png b/css/images/yellow_block.png
new file mode 100644
index 0000000..3538460
Binary files /dev/null and b/css/images/yellow_block.png differ
diff --git a/css/style.css b/css/style.css
index f6c8325..a80c0b9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -166,7 +166,10 @@ a:hover {
     justify-content: center;
 }
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 7495206d88a9f084621605098597b93928fb6c63
 #leaderboard {
     min-width: 25%;
     margin: auto;
diff --git a/css/themes/images.css b/css/themes/images.css
new file mode 100644
index 0000000..11b6694
--- /dev/null
+++ b/css/themes/images.css
@@ -0,0 +1,66 @@
+.empty-cell {
+    background: transparent;
+}
+
+.invisible-grid > .empty-cell {
+    border: 1px solid transparent;
+}
+
+.visible-grid > .empty-cell {
+    border: 1px inset rgba(128, 128, 128, 0.3);
+}
+
+.mino {
+    border: 1px inset transparent;
+    border-radius: 0;
+}
+
+.I-mino {
+    background-image: url(../images/blue_block.png);
+}
+
+.J-mino {
+    background-image: url(../images/peach_block.png);
+}
+
+.L-mino {
+    background-image: url(../images/yellow_block.png);
+}
+
+.O-mino {
+    background-image: url(../images/peach_block.png);
+}
+
+.S-mino {
+    background-image: url(../images/green_block.png);
+}
+
+.T-mino {
+    background-image: url(../images/purple_block.png);
+}
+
+.Z-mino {
+    background-image: url(../images/pink_block.png);
+}
+
+.locked-mino {
+    background: white;
+    background: rgba(255, 255, 255, 0.8);
+    border-radius: 1px;
+}
+
+.cleared-line {
+    background: white;
+}
+
+.trail {
+    background: rgba(255, 255, 255, 0.2);
+    border: 1px solid rgba(255, 255, 255, 0.2);
+    border-radius: 1px;
+}
+
+.ghost {
+    background: rgba(255, 255, 255, 0.4);
+    border: 1px transparent;
+    border-radius: 1px;
+}