diff --git a/Makefile b/Makefile
index aac725b7..9663e9bb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,9 @@ need := solid.woff2 solid.tar.bz2 solid.svg solid.json \
         flags.woff2 flags.tar.bz2 flags.svg flags.json# solid.png are too slow
 all: $(need)
 clean:; rm -f $(need) # opentype.js
-serve:all; python3 -m http.server
+serve:; python3 -m http.server
 
-%.ttf: %.n.ttf ; ttfautohint $^ $@
-%.n.ttf: %.otf ; fontforge -lang=ff -c 'Open("$^");Generate("$@")'
+%.ttf: %.otf   ; fontforge -lang=ff -c 'Open("$^");AutoHint();Generate("$@")'
 %.woff2: %.otf ; woff2_compress $^
 %.bz2: %       ; bzip2 -z9 <$^ >$@
 %.tar: %       ; tar -c --transform='s|[.].*|.svg|;s|^.*/||' $^/*.svg > $@
diff --git a/solid/compass.#tool.svg b/solid/compass.#architecture.#tool.svg
similarity index 100%
rename from solid/compass.#tool.svg
rename to solid/compass.#architecture.#tool.svg
diff --git a/solid/desktop.#furniture.svg b/solid/desktop.#furniture.svg
new file mode 100644
index 00000000..3fa85b81
--- /dev/null
+++ b/solid/desktop.#furniture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M0,8L0,3L8,3L8,8M1,2L1,0L4,0L4,2M1,4L1,8L5,8L5,4M7,7L7,4L6,4L6,7"></path></svg>
\ No newline at end of file
diff --git a/solid/fps120.#photo.svg b/solid/fps120.#photo.svg
new file mode 100644
index 00000000..c7dec698
--- /dev/null
+++ b/solid/fps120.#photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M2,1L2,0L4,0L4,3L3,3L3,4L4,4L4,5L2,5L2,2L3,2L3,1M5,5L5,0L8,0L8,5M7,4L7,1L6,1L6,4M6,8L6,6L8,6L8,8M0,8L0,6L1,6L1,8M2,8L2,6L3,6L3,8M4,8L4,6L5,6L5,8M0,5L0,0L1,0L1,5"></path></svg>
\ No newline at end of file
diff --git a/solid/fps25.#photo.svg b/solid/fps25.#photo.svg
new file mode 100644
index 00000000..34b22ee2
--- /dev/null
+++ b/solid/fps25.#photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M1,1L1,0L4,0L4,3L2,3L2,4L4,4L4,5L1,5L1,2L3,2L3,1M6,8L6,6L8,6L8,8M0,8L0,6L1,6L1,8M2,8L2,6L3,6L3,8M4,8L4,6L5,6L5,8M6,1L6,2L8,2L8,5L5,5L5,4L7,4L7,3L5,3L5,0L8,0L8,1"></path></svg>
\ No newline at end of file
diff --git a/solid/fps30.#photo.svg b/solid/fps30.#photo.svg
new file mode 100644
index 00000000..8469ddfc
--- /dev/null
+++ b/solid/fps30.#photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M1,1L1,0L4,0L4,5L1,5L1,4L3,4L3,3L1,3L1,2L3,2L3,1M5,5L5,0L8,0L8,5M7,4L7,1L6,1L6,4M6,8L6,6L8,6L8,8M0,8L0,6L1,6L1,8M2,8L2,6L3,6L3,8M4,8L4,6L5,6L5,8"></path></svg>
\ No newline at end of file
diff --git a/solid/fps60.#photo.svg b/solid/fps60.#photo.svg
new file mode 100644
index 00000000..70d84c9d
--- /dev/null
+++ b/solid/fps60.#photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M5,5L5,0L8,0L8,5M7,4L7,1L6,1L6,4M6,8L6,6L8,6L8,8M0,8L0,6L1,6L1,8M2,8L2,6L3,6L3,8M4,8L4,6L5,6L5,8M1,5L1,0L4,0L4,1L2,1L2,2L4,2L4,5M2,3L2,4L3,4L3,3"></path></svg>
\ No newline at end of file
diff --git a/solid/fps90.#photo.svg b/solid/fps90.#photo.svg
new file mode 100644
index 00000000..27c20038
--- /dev/null
+++ b/solid/fps90.#photo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M5,5L5,0L8,0L8,5M7,4L7,1L6,1L6,4M6,8L6,6L8,6L8,8M0,8L0,6L1,6L1,8M2,8L2,6L3,6L3,8M4,8L4,6L5,6L5,8M1,5L1,4L3,4L3,3L1,3L1,0L4,0L4,5M2,1L2,2L3,2L3,1"></path></svg>
\ No newline at end of file
diff --git a/solid/heartbroken.#heart.#f11.svg b/solid/heartbroken.#heart.#f11.svg
index 483630b4..13554c63 100644
--- a/solid/heartbroken.#heart.#f11.svg
+++ b/solid/heartbroken.#heart.#f11.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M6,2L5,1L7,1L8,2L8,4L4,8L6,4L5,4M4,2L3,1L1,1L0,2L0,4L4,8L4,5L3,5"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M4,8L4,5L3,5L4.5,2L6,2L5,4L6,4L4,8L6,6C10,2,5,0,4,3C3,0,-2,2,2,6"></path></svg>
\ No newline at end of file
diff --git a/solid/kiten.#face.svg b/solid/kitten.#cat.#face.svg
similarity index 100%
rename from solid/kiten.#face.svg
rename to solid/kitten.#cat.#face.svg
diff --git a/solid/lightbulb.#furniture.#fd1.svg b/solid/lightbulb.#furniture.#fd1.svg
index 1071325c..6efbe8cd 100644
--- a/solid/lightbulb.#furniture.#fd1.svg
+++ b/solid/lightbulb.#furniture.#fd1.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,6C-4,-2,12,-2,5,6M3,6C-4,-2,12,-2,5,6M3,8L3,6.5L5,6.5L5,8"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,8C4,4,-1,2,4,0C9,2,4,4,5,8M3,6L3,7L5,7L5,6"></path></svg>
\ No newline at end of file
diff --git a/solid/linkedin.#logo.#07b.svg b/solid/linkedin.#logo.#07b.svg
index 2d39beb1..a2c9e31d 100644
--- a/solid/linkedin.#logo.#07b.svg
+++ b/solid/linkedin.#logo.#07b.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,8L3,2L5,2L5,3L7,2L8,3L8,8L6,8L6,4L5,5L5,8M0,8L0,3L2,3L2,8M0,1L1,0L2,1L1,2"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,8L3,2L5,2L5,3Q7,1,8,3L8,8L6,8L6,4L5,5L5,8M0,8L0,3L2,3L2,8M0,1L1,0L2,1L1,2"></path></svg>
\ No newline at end of file
diff --git a/solid/metronome.#music.#instrument.#tool.svg b/solid/metronome.#music.#instrument.#tool.svg
new file mode 100644
index 00000000..6cb2cd5f
--- /dev/null
+++ b/solid/metronome.#music.#instrument.#tool.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7,8L1,8L3,0L5,0M4,7L7,0L6,0L3,7"></path></svg>
\ No newline at end of file
diff --git a/solid/microscope.#tool.svg b/solid/microscope.#tool.svg
index 0f70f299..7abfbf48 100644
--- a/solid/microscope.#tool.svg
+++ b/solid/microscope.#tool.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M7,7L4,2L5,1L9,8L3,8L3,7M2,7L1,6L5,6L4,7M2,5L4,0L6,0L4,5"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M1,6L1,5L5,5L5,6M4,3L4,0L2,0L2,3M3,2C7,2,7,7,3,7L3,8C8,8,8,1,3,1"></path></svg>
\ No newline at end of file
diff --git a/solid/shovel.#dig.svg b/solid/shovel.#dig.svg
new file mode 100644
index 00000000..fae519a3
--- /dev/null
+++ b/solid/shovel.#dig.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M5,4L1,0L0,1L4,5L7,7M3,6L6,3L8,5L8,8L5,8"></path></svg>
\ No newline at end of file
diff --git a/solid/whatsapp.#logo.#2a2.svg b/solid/whatsapp.#logo.#2a2.svg
index 3ed1756f..58561365 100644
--- a/solid/whatsapp.#logo.#2a2.svg
+++ b/solid/whatsapp.#logo.#2a2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,7Q8,8,8,3Q8,0,4,0Q-1,0,1,6L0,8M3,5L2,3L2,1L4,1L4,3L3,3L5,5L5,4L7,4L7,6L5,6"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M3,7Q8,8,8,4Q8,0,4,0Q-1,0,1,6L0,8M7,6Q1,7,2,1L4,1L4,3L3,3L5,5L5,4L7,4"></path></svg>
\ No newline at end of file
diff --git a/solid/window.#furniture.svg b/solid/window.#furniture.svg
index e1adb7cf..34bc3ba8 100644
--- a/solid/window.#furniture.svg
+++ b/solid/window.#furniture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M0,0L8,0L8,8L0,8M3,7L5,7L5,1L3,1M1,7L7,7L7,1L1,1M1,3L1,4L7,4L7,3"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M0,0L8,0L8,8L0,8M3.5,7L4.5,7L4.5,1L3.5,1M1,7L7,7L7,1L1,1M1,3.5L1,4.5L7,4.5L7,3.5"></path></svg>
\ No newline at end of file