diff --git a/awk/emoji.awk b/awk/emoji.awk
index 2324174..d27f212 100644
--- a/awk/emoji.awk
+++ b/awk/emoji.awk
@@ -1,831 +1,15 @@
 BEGIN {
-    map[":+1:"] = "👍"
-    map[":100:"] = "💯"
-    map[":1234:"] = "🔢"
-    map[":8ball:"] = "🎱"
-    map[":a:"] = "🅰️"
-    map[":ab:"] = "🆎"
-    map[":abc:"] = "🔤"
-    map[":abcd:"] = "🔡"
-    map[":accept:"] = "🉑"
-    map[":aerial_tramway:"] = "🚡"
-    map[":airplane:"] = "✈️"
-    map[":alarm_clock:"] = "⏰"
-    map[":alien:"] = "👽"
-    map[":ambulance:"] = "🚑"
-    map[":anchor:"] = "⚓"
-    map[":angel:"] = "👼"
-    map[":anger:"] = "💢"
-    map[":angry:"] = "😠"
-    map[":anguished:"] = "😧"
-    map[":ant:"] = "🐜"
-    map[":apple:"] = "🍎"
-    map[":aquarius:"] = "♒"
-    map[":aries:"] = "♈"
-    map[":arrow_backward:"] = "◀️"
-    map[":arrow_double_down:"] = "⏬"
-    map[":arrow_double_up:"] = "⏫"
-    map[":arrow_down:"] = "⬇️"
-    map[":arrow_down_small:"] = "🔽"
-    map[":arrow_forward:"] = "▶️"
-    map[":arrow_heading_down:"] = "⤵️"
-    map[":arrow_heading_up:"] = "⤴️"
-    map[":arrow_left:"] = "⬅️"
-    map[":arrow_lower_left:"] = "↙️"
-    map[":arrow_lower_right:"] = "↘️"
-    map[":arrow_right:"] = "➡️"
-    map[":arrow_right_hook:"] = "↪️"
-    map[":arrow_up:"] = "⬆️"
-    map[":arrow_up_down:"] = "↕️"
-    map[":arrow_up_small:"] = "🔼"
-    map[":arrow_upper_left:"] = "↖️"
-    map[":arrow_upper_right:"] = "↗️"
-    map[":arrows_clockwise:"] = "🔃"
-    map[":arrows_counterclockwise:"] = "🔄"
-    map[":art:"] = "🎨"
-    map[":articulated_lorry:"] = "🚛"
-    map[":astonished:"] = "😲"
-    map[":atm:"] = "🏧"
-    map[":b:"] = "🅱️"
-    map[":baby:"] = "👶"
-    map[":baby_bottle:"] = "🍼"
-    map[":baby_chick:"] = "🐤"
-    map[":baby_symbol:"] = "🚼"
-    map[":baggage_claim:"] = "🛄"
-    map[":balloon:"] = "🎈"
-    map[":ballot_box_with_check:"] = "☑️"
-    map[":bamboo:"] = "🎍"
-    map[":banana:"] = "🍌"
-    map[":bangbang:"] = "‼️"
-    map[":bank:"] = "🏦"
-    map[":bar_chart:"] = "📊"
-    map[":barber:"] = "💈"
-    map[":baseball:"] = "⚾"
-    map[":basketball:"] = "🏀"
-    map[":bath:"] = "🛀"
-    map[":bathtub:"] = "🛁"
-    map[":battery:"] = "🔋"
-    map[":bear:"] = "🐻"
-    map[":beer:"] = "🍺"
-    map[":beers:"] = "🍻"
-    map[":beetle:"] = "🪲"
-    map[":beginner:"] = "🔰"
-    map[":bell:"] = "🔔"
-    map[":bento:"] = "🍱"
-    map[":bicyclist:"] = "🚴"
-    map[":bike:"] = "🚲"
-    map[":bikini:"] = "👙"
-    map[":bird:"] = "🐦"
-    map[":birthday:"] = "🎂"
-    map[":black_circle:"] = "⚫"
-    map[":black_joker:"] = "🃏"
-    map[":black_nib:"] = "✒️"
-    map[":black_square_button:"] = "🔲"
-    map[":blossom:"] = "🌼"
-    map[":blowfish:"] = "🐡"
-    map[":blue_book:"] = "📘"
-    map[":blue_car:"] = "🚙"
-    map[":blue_heart:"] = "💙"
-    map[":blush:"] = "😊"
-    map[":boar:"] = "🐗"
-    map[":boat:"] = "⛵"
-    map[":bomb:"] = "💣"
-    map[":book:"] = "📖"
-    map[":bookmark:"] = "🔖"
-    map[":bookmark_tabs:"] = "📑"
-    map[":books:"] = "📚"
-    map[":boom:"] = "💥"
-    map[":boot:"] = "👢"
-    map[":bouquet:"] = "💐"
-    map[":bow:"] = "🙇"
-    map[":bowling:"] = "🎳"
-    map[":boy:"] = "👦"
-    map[":bread:"] = "🍞"
-    map[":bride_with_veil:"] = "👰‍♀️"
-    map[":bridge_at_night:"] = "🌉"
-    map[":briefcase:"] = "💼"
-    map[":broken_heart:"] = "💔"
-    map[":bug:"] = "🐛"
-    map[":bulb:"] = "💡"
-    map[":bullettrain_front:"] = "🚅"
-    map[":bullettrain_side:"] = "🚄"
-    map[":bus:"] = "🚌"
-    map[":busstop:"] = "🚏"
-    map[":bust_in_silhouette:"] = "👤"
-    map[":busts_in_silhouette:"] = "👥"
-    map[":cactus:"] = "🌵"
-    map[":cake:"] = "🍰"
-    map[":calendar:"] = "📆"
-    map[":calling:"] = "📲"
-    map[":camel:"] = "🐫"
-    map[":camera:"] = "📷"
-    map[":cancer:"] = "♋"
-    map[":candy:"] = "🍬"
-    map[":capital_abcd:"] = "🔠"
-    map[":capricorn:"] = "♑"
-    map[":car:"] = "🚗"
-    map[":card_index:"] = "📇"
-    map[":carousel_horse:"] = "🎠"
-    map[":cat2:"] = "🐈"
-    map[":cat:"] = "🐱"
-    map[":cd:"] = "💿"
-    map[":chart:"] = "💹"
-    map[":chart_with_downwards_trend:"] = "📉"
-    map[":chart_with_upwards_trend:"] = "📈"
-    map[":checkered_flag:"] = "🏁"
-    map[":cherries:"] = "🍒"
-    map[":cherry_blossom:"] = "🌸"
-    map[":chestnut:"] = "🌰"
-    map[":chicken:"] = "🐔"
-    map[":children_crossing:"] = "🚸"
-    map[":chocolate_bar:"] = "🍫"
-    map[":christmas_tree:"] = "🎄"
-    map[":church:"] = "⛪"
-    map[":cinema:"] = "🎦"
-    map[":circus_tent:"] = "🎪"
-    map[":city_sunrise:"] = "🌇"
-    map[":city_sunset:"] = "🌆"
-    map[":cl:"] = "🆑"
-    map[":clap:"] = "👏"
-    map[":clapper:"] = "🎬"
-    map[":clipboard:"] = "📋"
-    map[":clock1030:"] = "🕥"
-    map[":clock10:"] = "🕙"
-    map[":clock1130:"] = "🕦"
-    map[":clock11:"] = "🕚"
-    map[":clock1230:"] = "🕧"
-    map[":clock12:"] = "🕛"
-    map[":clock130:"] = "🕜"
-    map[":clock1:"] = "🕐"
-    map[":clock230:"] = "🕝"
-    map[":clock2:"] = "🕑"
-    map[":clock330:"] = "🕞"
-    map[":clock3:"] = "🕒"
-    map[":clock430:"] = "🕟"
-    map[":clock4:"] = "🕓"
-    map[":clock530:"] = "🕠"
-    map[":clock5:"] = "🕔"
-    map[":clock630:"] = "🕡"
-    map[":clock6:"] = "🕕"
-    map[":clock730:"] = "🕢"
-    map[":clock7:"] = "🕖"
-    map[":clock830:"] = "🕣"
-    map[":clock8:"] = "🕗"
-    map[":clock930:"] = "🕤"
-    map[":clock9:"] = "🕘"
-    map[":closed_book:"] = "📕"
-    map[":closed_lock_with_key:"] = "🔐"
-    map[":closed_umbrella:"] = "🌂"
-    map[":cloud:"] = "☁️"
-    map[":clubs:"] = "♣️"
-    map[":cn:"] = "🇨🇳"
-    map[":cocktail:"] = "🍸"
-    map[":coffee:"] = "☕"
-    map[":cold_sweat:"] = "😰"
-    map[":computer:"] = "💻"
-    map[":confetti_ball:"] = "🎊"
-    map[":confounded:"] = "😖"
-    map[":confused:"] = "😕"
-    map[":congratulations:"] = "㊗️"
-    map[":construction:"] = "🚧"
-    map[":construction_worker:"] = "👷"
-    map[":convenience_store:"] = "🏪"
-    map[":cookie:"] = "🍪"
-    map[":cool:"] = "🆒"
-    map[":cop:"] = "👮"
-    map[":copyright:"] = "©️"
-    map[":corn:"] = "🌽"
-    map[":couple:"] = "👫"
-    map[":couple_with_heart:"] = "💑"
-    map[":couplekiss:"] = "💏"
-    map[":cow2:"] = "🐄"
-    map[":cow:"] = "🐮"
-    map[":credit_card:"] = "💳"
-    map[":crocodile:"] = "🐊"
-    map[":crossed_flags:"] = "🎌"
-    map[":crown:"] = "👑"
-    map[":cry:"] = "😢"
-    map[":crying_cat_face:"] = "😿"
-    map[":crystal_ball:"] = "🔮"
-    map[":cupid:"] = "💘"
-    map[":curly_loop:"] = "➰"
-    map[":currency_exchange:"] = "💱"
-    map[":curry:"] = "🍛"
-    map[":custard:"] = "🍮"
-    map[":customs:"] = "🛃"
-    map[":cyclone:"] = "🌀"
-    map[":dancer:"] = "💃"
-    map[":dancers:"] = "👯"
-    map[":dango:"] = "🍡"
-    map[":dart:"] = "🎯"
-    map[":dash:"] = "💨"
-    map[":date:"] = "📅"
-    map[":de:"] = "🇩🇪"
-    map[":deciduous_tree:"] = "🌳"
-    map[":department_store:"] = "🏬"
-    map[":diamond_shape_with_a_dot_inside:"] = "💠"
-    map[":diamonds:"] = "♦️"
-    map[":disappointed:"] = "😞"
-    map[":disappointed_relieved:"] = "😥"
-    map[":dizzy:"] = "💫"
-    map[":dizzy_face:"] = "😵"
-    map[":do_not_litter:"] = "🚯"
-    map[":dog2:"] = "🐕"
-    map[":dog:"] = "🐶"
-    map[":dollar:"] = "💵"
-    map[":dolls:"] = "🎎"
-    map[":dolphin:"] = "🐬"
-    map[":door:"] = "🚪"
-    map[":doughnut:"] = "🍩"
-    map[":dragon:"] = "🐉"
-    map[":dragon_face:"] = "🐲"
-    map[":dress:"] = "👗"
-    map[":dromedary_camel:"] = "🐪"
-    map[":droplet:"] = "💧"
-    map[":dvd:"] = "📀"
-    map[":ear:"] = "👂"
-    map[":ear_of_rice:"] = "🌾"
-    map[":earth_africa:"] = "🌍"
-    map[":earth_americas:"] = "🌎"
-    map[":earth_asia:"] = "🌏"
-    map[":egg:"] = "🥚"
-    map[":eggplant:"] = "🍆"
-    map[":eight:"] = "8️⃣"
-    map[":eight_pointed_black_star:"] = "✴️"
-    map[":eight_spoked_asterisk:"] = "✳️"
-    map[":electric_plug:"] = "🔌"
-    map[":elephant:"] = "🐘"
-    map[":email:"] = "📧"
-    map[":end:"] = "🔚"
-    map[":envelope:"] = "✉️"
-    map[":es:"] = "🇪🇸"
-    map[":euro:"] = "💶"
-    map[":european_castle:"] = "🏰"
-    map[":european_post_office:"] = "🏤"
-    map[":evergreen_tree:"] = "🌲"
-    map[":exclamation:"] = "❗"
-    map[":expressionless:"] = "😑"
-    map[":eyeglasses:"] = "👓"
-    map[":eyes:"] = "👀"
-    map[":factory:"] = "🏭"
-    map[":fallen_leaf:"] = "🍂"
-    map[":family:"] = "👪"
-    map[":fast_forward:"] = "⏩"
-    map[":fax:"] = "📠"
-    map[":fearful:"] = "😨"
-    map[":feet:"] = "🐾"
-    map[":ferris_wheel:"] = "🎡"
-    map[":file_folder:"] = "📁"
-    map[":fire:"] = "🔥"
-    map[":fire_engine:"] = "🚒"
-    map[":fireworks:"] = "🎆"
-    map[":first_quarter_moon:"] = "🌓"
-    map[":first_quarter_moon_with_face:"] = "🌛"
-    map[":fish:"] = "🐟"
-    map[":fish_cake:"] = "🍥"
-    map[":fishing_pole_and_fish:"] = "🎣"
-    map[":fist:"] = "✊"
-    map[":five:"] = "5️⃣"
-    map[":flags:"] = "🎏"
-    map[":flashlight:"] = "🔦"
-    map[":floppy_disk:"] = "💾"
-    map[":flower_playing_cards:"] = "🎴"
-    map[":flushed:"] = "😳"
-    map[":foggy:"] = "🌁"
-    map[":football:"] = "🏈"
-    map[":fork_and_knife:"] = "🍴"
-    map[":fountain:"] = "⛲"
-    map[":four:"] = "4️⃣"
-    map[":four_leaf_clover:"] = "🍀"
-    map[":fr:"] = "🇫🇷"
-    map[":free:"] = "🆓"
-    map[":fried_shrimp:"] = "🍤"
-    map[":fries:"] = "🍟"
-    map[":frog:"] = "🐸"
-    map[":frowning:"] = "😦"
-    map[":fuelpump:"] = "⛽"
-    map[":full_moon:"] = "🌕"
-    map[":full_moon_with_face:"] = "🌝"
-    map[":game_die:"] = "🎲"
-    map[":gem:"] = "💎"
-    map[":gemini:"] = "♊"
-    map[":ghost:"] = "👻"
-    map[":gift:"] = "🎁"
-    map[":gift_heart:"] = "💝"
-    map[":girl:"] = "👧"
-    map[":globe_with_meridians:"] = "🌐"
-    map[":goat:"] = "🐐"
-    map[":golf:"] = "⛳"
-    map[":grapes:"] = "🍇"
-    map[":green_apple:"] = "🍏"
-    map[":green_book:"] = "📗"
-    map[":green_heart:"] = "💚"
-    map[":grey_exclamation:"] = "❕"
-    map[":grey_question:"] = "❔"
-    map[":grimacing:"] = "😬"
-    map[":grin:"] = "😁"
-    map[":grinning:"] = "😀"
-    map[":guardsman:"] = "💂‍♂️"
-    map[":guitar:"] = "🎸"
-    map[":gun:"] = "🔫"
-    map[":haircut:"] = "💇"
-    map[":hamburger:"] = "🍔"
-    map[":hammer:"] = "🔨"
-    map[":hamster:"] = "🐹"
-    map[":handbag:"] = "👜"
-    map[":hankey:"] = "💩"
-    map[":hash:"] = "#️⃣"
-    map[":hatched_chick:"] = "🐥"
-    map[":hatching_chick:"] = "🐣"
-    map[":headphones:"] = "🎧"
-    map[":hear_no_evil:"] = "🙉"
-    map[":heart:"] = "❤️"
-    map[":heart_decoration:"] = "💟"
-    map[":heart_eyes:"] = "😍"
-    map[":heart_eyes_cat:"] = "😻"
-    map[":heartbeat:"] = "💓"
-    map[":hearts:"] = "♥️"
-    map[":heavy_check_mark:"] = "✔️"
-    map[":heavy_division_sign:"] = "➗"
-    map[":heavy_dollar_sign:"] = "💲"
-    map[":heavy_minus_sign:"] = "➖"
-    map[":heavy_multiplication_x:"] = "✖️"
-    map[":heavy_plus_sign:"] = "➕"
-    map[":helicopter:"] = "🚁"
-    map[":herb:"] = "🌿"
-    map[":hibiscus:"] = "🌺"
-    map[":high_brightness:"] = "🔆"
-    map[":high_heel:"] = "👠"
-    map[":honey_pot:"] = "🍯"
-    map[":horse:"] = "🐴"
-    map[":horse_racing:"] = "🏇"
-    map[":hospital:"] = "🏥"
-    map[":hotel:"] = "🏨"
-    map[":hotsprings:"] = "♨️"
-    map[":hourglass:"] = "⌛"
-    map[":hourglass_flowing_sand:"] = "⏳"
-    map[":house:"] = "🏠"
-    map[":house_with_garden:"] = "🏡"
-    map[":hushed:"] = "😯"
-    map[":ice_cream:"] = "🍨"
-    map[":icecream:"] = "🍦"
-    map[":id:"] = "🆔"
-    map[":ideograph_advantage:"] = "🉐"
-    map[":imp:"] = "👿"
-    map[":inbox_tray:"] = "📥"
-    map[":incoming_envelope:"] = "📨"
-    map[":information_desk_person:"] = "💁"
-    map[":information_source:"] = "ℹ️"
-    map[":innocent:"] = "😇"
-    map[":interrobang:"] = "⁉️"
-    map[":iphone:"] = "📱"
-    map[":it:"] = "🇮🇹"
-    map[":izakaya_lantern:"] = "🏮"
-    map[":jack_o_lantern:"] = "🎃"
-    map[":japan:"] = "🗾"
-    map[":japanese_castle:"] = "🏯"
-    map[":japanese_goblin:"] = "👺"
-    map[":japanese_ogre:"] = "👹"
-    map[":jeans:"] = "👖"
-    map[":joy:"] = "😂"
-    map[":joy_cat:"] = "😹"
-    map[":jp:"] = "🇯🇵"
-    map[":key:"] = "🔑"
-    map[":keycap_ten:"] = "🔟"
-    map[":kimono:"] = "👘"
-    map[":kiss:"] = "💋"
-    map[":kissing:"] = "😗"
-    map[":kissing_cat:"] = "😽"
-    map[":kissing_closed_eyes:"] = "😚"
-    map[":kissing_heart:"] = "😘"
-    map[":kissing_smiling_eyes:"] = "😙"
-    map[":koala:"] = "🐨"
-    map[":koko:"] = "🈁"
-    map[":kr:"] = "🇰🇷"
-    map[":large_blue_diamond:"] = "🔷"
-    map[":large_orange_diamond:"] = "🔶"
-    map[":last_quarter_moon:"] = "🌗"
-    map[":last_quarter_moon_with_face:"] = "🌜"
-    map[":laughing:"] = "😆"
-    map[":leaves:"] = "🍃"
-    map[":ledger:"] = "📒"
-    map[":left_luggage:"] = "🛅"
-    map[":left_right_arrow:"] = "↔️"
-    map[":leftwards_arrow_with_hook:"] = "↩️"
-    map[":lemon:"] = "🍋"
-    map[":leo:"] = "♌"
-    map[":leopard:"] = "🐆"
-    map[":libra:"] = "♎"
-    map[":light_rail:"] = "🚈"
-    map[":link:"] = "🔗"
-    map[":lips:"] = "👄"
-    map[":lipstick:"] = "💄"
-    map[":lock:"] = "🔒"
-    map[":lock_with_ink_pen:"] = "🔏"
-    map[":lollipop:"] = "🍭"
-    map[":loop:"] = "➿"
-    map[":loudspeaker:"] = "📢"
-    map[":love_hotel:"] = "🏩"
-    map[":love_letter:"] = "💌"
-    map[":low_brightness:"] = "🔅"
-    map[":m:"] = "Ⓜ️"
-    map[":mag:"] = "🔍"
-    map[":mag_right:"] = "🔎"
-    map[":mahjong:"] = "🀄"
-    map[":mailbox:"] = "📫"
-    map[":mailbox_closed:"] = "📪"
-    map[":mailbox_with_mail:"] = "📬"
-    map[":mailbox_with_no_mail:"] = "📭"
-    map[":man:"] = "👨"
-    map[":man_with_gua_pi_mao:"] = "👲"
-    map[":man_with_turban:"] = "👳‍♂️"
-    map[":mans_shoe:"] = "👞"
-    map[":maple_leaf:"] = "🍁"
-    map[":mask:"] = "😷"
-    map[":massage:"] = "💆"
-    map[":meat_on_bone:"] = "🍖"
-    map[":mega:"] = "📣"
-    map[":melon:"] = "🍈"
-    map[":memo:"] = "📝"
-    map[":mens:"] = "🚹"
-    map[":metal:"] = "🤘"
-    map[":metro:"] = "🚇"
-    map[":microphone:"] = "🎤"
-    map[":microscope:"] = "🔬"
-    map[":milky_way:"] = "🌌"
-    map[":minibus:"] = "🚐"
-    map[":minidisc:"] = "💽"
-    map[":mobile_phone_off:"] = "📴"
-    map[":money_with_wings:"] = "💸"
-    map[":moneybag:"] = "💰"
-    map[":monkey:"] = "🐒"
-    map[":monkey_face:"] = "🐵"
-    map[":monorail:"] = "🚝"
-    map[":mortar_board:"] = "🎓"
-    map[":mount_fuji:"] = "🗻"
-    map[":mountain_bicyclist:"] = "🚵"
-    map[":mountain_cableway:"] = "🚠"
-    map[":mountain_railway:"] = "🚞"
-    map[":mouse2:"] = "🐁"
-    map[":mouse:"] = "🐭"
-    map[":movie_camera:"] = "🎥"
-    map[":moyai:"] = "🗿"
-    map[":muscle:"] = "💪"
-    map[":mushroom:"] = "🍄"
-    map[":musical_keyboard:"] = "🎹"
-    map[":musical_note:"] = "🎵"
-    map[":musical_score:"] = "🎼"
-    map[":mute:"] = "🔇"
-    map[":nail_care:"] = "💅"
-    map[":name_badge:"] = "📛"
-    map[":necktie:"] = "👔"
-    map[":negative_squared_cross_mark:"] = "❎"
-    map[":neutral_face:"] = "😐"
-    map[":new:"] = "🆕"
-    map[":new_moon:"] = "🌑"
-    map[":new_moon_with_face:"] = "🌚"
-    map[":newspaper:"] = "📰"
-    map[":ng:"] = "🆖"
-    map[":nine:"] = "9️⃣"
-    map[":no_bell:"] = "🔕"
-    map[":no_bicycles:"] = "🚳"
-    map[":no_entry:"] = "⛔"
-    map[":no_entry_sign:"] = "🚫"
-    map[":no_good:"] = "🙅"
-    map[":no_mobile_phones:"] = "📵"
-    map[":no_mouth:"] = "😶"
-    map[":no_pedestrians:"] = "🚷"
-    map[":no_smoking:"] = "🚭"
-    map[":nose:"] = "👃"
-    map[":notebook:"] = "📓"
-    map[":notebook_with_decorative_cover:"] = "📔"
-    map[":notes:"] = "🎶"
-    map[":nut_and_bolt:"] = "🔩"
-    map[":o2:"] = "🅾️"
-    map[":o:"] = "⭕"
-    map[":ocean:"] = "🌊"
-    map[":octopus:"] = "🐙"
-    map[":oden:"] = "🍢"
-    map[":office:"] = "🏢"
-    map[":ok:"] = "🆗"
-    map[":ok_hand:"] = "👌"
-    map[":ok_woman:"] = "🙆‍♀️"
-    map[":older_man:"] = "👴"
-    map[":older_woman:"] = "👵"
-    map[":on:"] = "🔛"
-    map[":oncoming_automobile:"] = "🚘"
-    map[":oncoming_bus:"] = "🚍"
-    map[":oncoming_police_car:"] = "🚔"
-    map[":oncoming_taxi:"] = "🚖"
-    map[":one:"] = "1️⃣"
-    map[":open_file_folder:"] = "📂"
-    map[":open_hands:"] = "👐"
-    map[":open_mouth:"] = "😮"
-    map[":ophiuchus:"] = "⛎"
-    map[":orange_book:"] = "📙"
-    map[":outbox_tray:"] = "📤"
-    map[":ox:"] = "🐂"
-    map[":page_facing_up:"] = "📄"
-    map[":page_with_curl:"] = "📃"
-    map[":pager:"] = "📟"
-    map[":palm_tree:"] = "🌴"
-    map[":panda_face:"] = "🐼"
-    map[":paperclip:"] = "📎"
-    map[":parking:"] = "🅿️"
-    map[":part_alternation_mark:"] = "〽️"
-    map[":partly_sunny:"] = "⛅"
-    map[":passport_control:"] = "🛂"
-    map[":paw_prints:"] = "🐾"
-    map[":peach:"] = "🍑"
-    map[":pear:"] = "🍐"
-    map[":pencil2:"] = "✏️"
-    map[":pencil:"] = "📝"
-    map[":penguin:"] = "🐧"
-    map[":pensive:"] = "😔"
-    map[":performing_arts:"] = "🎭"
-    map[":persevere:"] = "😣"
-    map[":pig2:"] = "🐖"
-    map[":pig:"] = "🐷"
-    map[":pig_nose:"] = "🐽"
-    map[":pill:"] = "💊"
-    map[":pineapple:"] = "🍍"
-    map[":pisces:"] = "♓"
-    map[":pizza:"] = "🍕"
-    map[":point_down:"] = "👇"
-    map[":point_left:"] = "👈"
-    map[":point_right:"] = "👉"
-    map[":point_up:"] = "☝️"
-    map[":point_up_2:"] = "👆"
-    map[":police_car:"] = "🚓"
-    map[":poodle:"] = "🐩"
-    map[":poop:"] = "💩"
-    map[":post_office:"] = "🏣"
-    map[":postal_horn:"] = "📯"
-    map[":postbox:"] = "📮"
-    map[":potable_water:"] = "🚰"
-    map[":pouch:"] = "👝"
-    map[":poultry_leg:"] = "🍗"
-    map[":pound:"] = "💷"
-    map[":pouting_cat:"] = "😾"
-    map[":pray:"] = "🙏"
-    map[":princess:"] = "👸"
-    map[":punch:"] = "👊"
-    map[":purple_heart:"] = "💜"
-    map[":purse:"] = "👛"
-    map[":pushpin:"] = "📌"
-    map[":put_litter_in_its_place:"] = "🚮"
-    map[":question:"] = "❓"
-    map[":rabbit2:"] = "🐇"
-    map[":rabbit:"] = "🐰"
-    map[":racehorse:"] = "🐎"
-    map[":radio:"] = "📻"
-    map[":radio_button:"] = "🔘"
-    map[":rage:"] = "😡"
-    map[":railway_car:"] = "🚃"
-    map[":rainbow:"] = "🌈"
-    map[":raised_hand:"] = "✋"
-    map[":raised_hands:"] = "🙌"
-    map[":raising_hand:"] = "🙋"
-    map[":ram:"] = "🐏"
-    map[":ramen:"] = "🍜"
-    map[":rat:"] = "🐀"
-    map[":recycle:"] = "♻️"
-    map[":red_car:"] = "🚗"
-    map[":red_circle:"] = "🔴"
-    map[":registered:"] = "®️"
-    map[":relaxed:"] = "☺️"
-    map[":relieved:"] = "😌"
-    map[":repeat:"] = "🔁"
-    map[":repeat_one:"] = "🔂"
-    map[":restroom:"] = "🚻"
-    map[":revolving_hearts:"] = "💞"
-    map[":rewind:"] = "⏪"
-    map[":ribbon:"] = "🎀"
-    map[":rice:"] = "🍚"
-    map[":rice_ball:"] = "🍙"
-    map[":rice_cracker:"] = "🍘"
-    map[":rice_scene:"] = "🎑"
-    map[":ring:"] = "💍"
-    map[":rocket:"] = "🚀"
-    map[":roller_coaster:"] = "🎢"
-    map[":rooster:"] = "🐓"
-    map[":rose:"] = "🌹"
-    map[":rotating_light:"] = "🚨"
-    map[":round_pushpin:"] = "📍"
-    map[":rowboat:"] = "🚣"
-    map[":ru:"] = "🇷🇺"
-    map[":rugby_football:"] = "🏉"
-    map[":runner:"] = "🏃"
-    map[":running_shirt_with_sash:"] = "🎽"
-    map[":sa:"] = "🈂️"
-    map[":sagittarius:"] = "♐"
-    map[":sailboat:"] = "⛵"
-    map[":sake:"] = "🍶"
-    map[":sandal:"] = "👡"
-    map[":santa:"] = "🎅"
-    map[":satellite:"] = "📡"
-    map[":satisfied:"] = "😆"
-    map[":saxophone:"] = "🎷"
-    map[":school:"] = "🏫"
-    map[":school_satchel:"] = "🎒"
-    map[":scissors:"] = "✂️"
-    map[":scorpius:"] = "♏"
-    map[":scream:"] = "😱"
-    map[":scream_cat:"] = "🙀"
-    map[":scroll:"] = "📜"
-    map[":seat:"] = "💺"
-    map[":secret:"] = "㊙️"
-    map[":see_no_evil:"] = "🙈"
-    map[":seedling:"] = "🌱"
-    map[":seven:"] = "7️⃣"
-    map[":shaved_ice:"] = "🍧"
-    map[":sheep:"] = "🐑"
-    map[":shell:"] = "🐚"
-    map[":ship:"] = "🚢"
-    map[":shirt:"] = "👕"
-    map[":shit:"] = "💩"
-    map[":shower:"] = "🚿"
-    map[":signal_strength:"] = "📶"
-    map[":six:"] = "6️⃣"
-    map[":six_pointed_star:"] = "🔯"
-    map[":ski:"] = "🎿"
-    map[":skull:"] = "💀"
-    map[":sleeping:"] = "😴"
-    map[":sleepy:"] = "😪"
-    map[":slot_machine:"] = "🎰"
-    map[":small_blue_diamond:"] = "🔹"
-    map[":small_orange_diamond:"] = "🔸"
-    map[":small_red_triangle:"] = "🔺"
-    map[":small_red_triangle_down:"] = "🔻"
-    map[":smile:"] = "😄"
-    map[":smile_cat:"] = "😸"
-    map[":smiley:"] = "😃"
-    map[":smiley_cat:"] = "😺"
-    map[":smiling_imp:"] = "😈"
-    map[":smirk:"] = "😏"
-    map[":smirk_cat:"] = "😼"
-    map[":smoking:"] = "🚬"
-    map[":snail:"] = "🐌"
-    map[":snake:"] = "🐍"
-    map[":snowboarder:"] = "🏂"
-    map[":snowflake:"] = "❄️"
-    map[":snowman:"] = "⛄"
-    map[":sob:"] = "😭"
-    map[":soccer:"] = "⚽"
-    map[":soon:"] = "🔜"
-    map[":sos:"] = "🆘"
-    map[":sound:"] = "🔉"
-    map[":space_invader:"] = "👾"
-    map[":spades:"] = "♠️"
-    map[":spaghetti:"] = "🍝"
-    map[":sparkler:"] = "🎇"
-    map[":sparkles:"] = "✨"
-    map[":sparkling_heart:"] = "💖"
-    map[":speak_no_evil:"] = "🙊"
-    map[":speaker:"] = "🔈"
-    map[":speech_balloon:"] = "💬"
-    map[":speedboat:"] = "🚤"
-    map[":star2:"] = "🌟"
-    map[":star:"] = "⭐"
-    map[":stars:"] = "🌠"
-    map[":station:"] = "🚉"
-    map[":statue_of_liberty:"] = "🗽"
-    map[":steam_locomotive:"] = "🚂"
-    map[":stew:"] = "🍲"
-    map[":straight_ruler:"] = "📏"
-    map[":strawberry:"] = "🍓"
-    map[":stuck_out_tongue:"] = "😛"
-    map[":stuck_out_tongue_closed_eyes:"] = "😝"
-    map[":stuck_out_tongue_winking_eye:"] = "😜"
-    map[":sun_with_face:"] = "🌞"
-    map[":sunflower:"] = "🌻"
-    map[":sunglasses:"] = "😎"
-    map[":sunny:"] = "☀️"
-    map[":sunrise:"] = "🌅"
-    map[":sunrise_over_mountains:"] = "🌄"
-    map[":surfer:"] = "🏄"
-    map[":sushi:"] = "🍣"
-    map[":suspension_railway:"] = "🚟"
-    map[":sweat:"] = "😓"
-    map[":sweat_drops:"] = "💦"
-    map[":sweat_smile:"] = "😅"
-    map[":sweet_potato:"] = "🍠"
-    map[":swimmer:"] = "🏊"
-    map[":symbols:"] = "🔣"
-    map[":syringe:"] = "💉"
-    map[":tada:"] = "🎉"
-    map[":tanabata_tree:"] = "🎋"
-    map[":tangerine:"] = "🍊"
-    map[":taurus:"] = "♉"
-    map[":taxi:"] = "🚕"
-    map[":tea:"] = "🍵"
-    map[":telephone:"] = "☎️"
-    map[":telephone_receiver:"] = "📞"
-    map[":telescope:"] = "🔭"
-    map[":tennis:"] = "🎾"
-    map[":tent:"] = "⛺"
-    map[":thought_balloon:"] = "💭"
-    map[":three:"] = "3️⃣"
-    map[":thumbsdown:"] = "👎"
-    map[":thumbsup:"] = "👍"
-    map[":ticket:"] = "🎫"
-    map[":tiger2:"] = "🐅"
-    map[":tiger:"] = "🐯"
-    map[":tired_face:"] = "😫"
-    map[":tm:"] = "™️"
-    map[":toilet:"] = "🚽"
-    map[":tokyo_tower:"] = "🗼"
-    map[":tomato:"] = "🍅"
-    map[":tongue:"] = "👅"
-    map[":top:"] = "🔝"
-    map[":tophat:"] = "🎩"
-    map[":tractor:"] = "🚜"
-    map[":traffic_light:"] = "🚥"
-    map[":train2:"] = "🚆"
-    map[":train:"] = "🚋"
-    map[":tram:"] = "🚊"
-    map[":triangular_flag_on_post:"] = "🚩"
-    map[":triangular_ruler:"] = "📐"
-    map[":trident:"] = "🔱"
-    map[":triumph:"] = "😤"
-    map[":trolleybus:"] = "🚎"
-    map[":trophy:"] = "🏆"
-    map[":tropical_drink:"] = "🍹"
-    map[":tropical_fish:"] = "🐠"
-    map[":truck:"] = "🚚"
-    map[":trumpet:"] = "🎺"
-    map[":tulip:"] = "🌷"
-    map[":turtle:"] = "🐢"
-    map[":tv:"] = "📺"
-    map[":twisted_rightwards_arrows:"] = "🔀"
-    map[":two:"] = "2️⃣"
-    map[":two_men_holding_hands:"] = "👬"
-    map[":two_women_holding_hands:"] = "👭"
-    map[":u5272:"] = "🈹"
-    map[":u5408:"] = "🈴"
-    map[":u55b6:"] = "🈺"
-    map[":u6307:"] = "🈯"
-    map[":u6708:"] = "🈷️"
-    map[":u6709:"] = "🈶"
-    map[":u6e80:"] = "🈵"
-    map[":u7121:"] = "🈚"
-    map[":u7533:"] = "🈸"
-    map[":u7981:"] = "🈲"
-    map[":u7a7a:"] = "🈳"
-    map[":umbrella:"] = "☔"
-    map[":unamused:"] = "😒"
-    map[":underage:"] = "🔞"
-    map[":unlock:"] = "🔓"
-    map[":up:"] = "🆙"
-    map[":us:"] = "🇺🇸"
-    map[":v:"] = "✌️"
-    map[":vertical_traffic_light:"] = "🚦"
-    map[":vhs:"] = "📼"
-    map[":vibration_mode:"] = "📳"
-    map[":video_camera:"] = "📹"
-    map[":video_game:"] = "🎮"
-    map[":violin:"] = "🎻"
-    map[":virgo:"] = "♍"
-    map[":volcano:"] = "🌋"
-    map[":vs:"] = "🆚"
-    map[":walking:"] = "🚶"
-    map[":waning_crescent_moon:"] = "🌘"
-    map[":waning_gibbous_moon:"] = "🌖"
-    map[":warning:"] = "⚠️"
-    map[":watch:"] = "⌚"
-    map[":water_buffalo:"] = "🐃"
-    map[":watermelon:"] = "🍉"
-    map[":wave:"] = "👋"
-    map[":wavy_dash:"] = "〰️"
-    map[":waxing_crescent_moon:"] = "🌒"
-    map[":waxing_gibbous_moon:"] = "🌔"
-    map[":wc:"] = "🚾"
-    map[":weary:"] = "😩"
-    map[":wedding:"] = "💒"
-    map[":whale2:"] = "🐋"
-    map[":whale:"] = "🐳"
-    map[":wheelchair:"] = "♿"
-    map[":white_check_mark:"] = "✅"
-    map[":white_circle:"] = "⚪"
-    map[":white_flower:"] = "💮"
-    map[":white_square_button:"] = "🔳"
-    map[":wind_chime:"] = "🎐"
-    map[":wine_glass:"] = "🍷"
-    map[":wink:"] = "😉"
-    map[":wolf:"] = "🐺"
-    map[":woman:"] = "👩"
-    map[":womans_clothes:"] = "👚"
-    map[":womans_hat:"] = "👒"
-    map[":womens:"] = "🚺"
-    map[":worried:"] = "😟"
-    map[":wrench:"] = "🔧"
-    map[":x:"] = "❌"
-    map[":yellow_heart:"] = "💛"
-    map[":yen:"] = "💴"
-    map[":yum:"] = "😋"
-    map[":zap:"] = "⚡"
-    map[":zero:"] = "0️⃣"
-    map[":zzz:"] = "💤"
+    if (emoji_file == "") {
+        emoji_file = "emoji.tsv"
+    }
+
+    while ((getline line < emoji_file) > 0) {
+        split(line, parts, "\t")
+        if (length(parts[1]) > 0) {
+            map[parts[1]] = parts[2]
+        }
+    }
+    close(emoji_file)
 }
 {
     if ($0 ~ /<pre>/) in_pre = 1
@@ -833,6 +17,7 @@ BEGIN {
         code_count = 0
         line = $0
         out = ""
+
         while (match(line, /<code>[^<]*<\/code>/)) {
             code_count++
             code_store[code_count] = substr(line, RSTART, RLENGTH)
@@ -841,14 +26,23 @@ BEGIN {
         }
         out = out line
 
-        for (sc in map) {
-            if (index(out, sc)) {
-                gsub(sc, map[sc], out)
+        line = out
+        out = ""
+        while (match(line, /:[A-Za-z0-9_+\-]+:/)) {
+            token = substr(line, RSTART, RLENGTH)
+            out = out substr(line, 1, RSTART - 1)
+            if (token in map) {
+                out = out map[token]
+            } else {
+                out = out token
             }
+            line = substr(line, RSTART + RLENGTH)
         }
+        out = out line
 
         for (i = 1; i <= code_count; i++) {
             gsub("\034EC" i "\034", code_store[i], out)
+            delete code_store[i]
         }
         $0 = out
     }
diff --git a/awk/emoji.tsv b/awk/emoji.tsv
new file mode 100644
index 0000000..8f7459c
--- /dev/null
+++ b/awk/emoji.tsv
@@ -0,0 +1,827 @@
+:+1:	👍
+:100:	💯
+:1234:	🔢
+:8ball:	🎱
+:a:	🅰️
+:ab:	🆎
+:abc:	🔤
+:abcd:	🔡
+:accept:	🉑
+:aerial_tramway:	🚡
+:airplane:	✈️
+:alarm_clock:	⏰
+:alien:	👽
+:ambulance:	🚑
+:anchor:	⚓
+:angel:	👼
+:anger:	💢
+:angry:	😠
+:anguished:	😧
+:ant:	🐜
+:apple:	🍎
+:aquarius:	♒
+:aries:	♈
+:arrow_backward:	◀️
+:arrow_double_down:	⏬
+:arrow_double_up:	⏫
+:arrow_down:	⬇️
+:arrow_down_small:	🔽
+:arrow_forward:	▶️
+:arrow_heading_down:	⤵️
+:arrow_heading_up:	⤴️
+:arrow_left:	⬅️
+:arrow_lower_left:	↙️
+:arrow_lower_right:	↘️
+:arrow_right:	➡️
+:arrow_right_hook:	↪️
+:arrow_up:	⬆️
+:arrow_up_down:	↕️
+:arrow_up_small:	🔼
+:arrow_upper_left:	↖️
+:arrow_upper_right:	↗️
+:arrows_clockwise:	🔃
+:arrows_counterclockwise:	🔄
+:art:	🎨
+:articulated_lorry:	🚛
+:astonished:	😲
+:atm:	🏧
+:b:	🅱️
+:baby:	👶
+:baby_bottle:	🍼
+:baby_chick:	🐤
+:baby_symbol:	🚼
+:baggage_claim:	🛄
+:balloon:	🎈
+:ballot_box_with_check:	☑️
+:bamboo:	🎍
+:banana:	🍌
+:bangbang:	‼️
+:bank:	🏦
+:bar_chart:	📊
+:barber:	💈
+:baseball:	⚾
+:basketball:	🏀
+:bath:	🛀
+:bathtub:	🛁
+:battery:	🔋
+:bear:	🐻
+:beer:	🍺
+:beers:	🍻
+:beetle:	🪲
+:beginner:	🔰
+:bell:	🔔
+:bento:	🍱
+:bicyclist:	🚴
+:bike:	🚲
+:bikini:	👙
+:bird:	🐦
+:birthday:	🎂
+:black_circle:	⚫
+:black_joker:	🃏
+:black_nib:	✒️
+:black_square_button:	🔲
+:blossom:	🌼
+:blowfish:	🐡
+:blue_book:	📘
+:blue_car:	🚙
+:blue_heart:	💙
+:blush:	😊
+:boar:	🐗
+:boat:	⛵
+:bomb:	💣
+:book:	📖
+:bookmark:	🔖
+:bookmark_tabs:	📑
+:books:	📚
+:boom:	💥
+:boot:	👢
+:bouquet:	💐
+:bow:	🙇
+:bowling:	🎳
+:boy:	👦
+:bread:	🍞
+:bride_with_veil:	👰‍♀️
+:bridge_at_night:	🌉
+:briefcase:	💼
+:broken_heart:	💔
+:bug:	🐛
+:bulb:	💡
+:bullettrain_front:	🚅
+:bullettrain_side:	🚄
+:bus:	🚌
+:busstop:	🚏
+:bust_in_silhouette:	👤
+:busts_in_silhouette:	👥
+:cactus:	🌵
+:cake:	🍰
+:calendar:	📆
+:calling:	📲
+:camel:	🐫
+:camera:	📷
+:cancer:	♋
+:candy:	🍬
+:capital_abcd:	🔠
+:capricorn:	♑
+:car:	🚗
+:card_index:	📇
+:carousel_horse:	🎠
+:cat2:	🐈
+:cat:	🐱
+:cd:	💿
+:chart:	💹
+:chart_with_downwards_trend:	📉
+:chart_with_upwards_trend:	📈
+:checkered_flag:	🏁
+:cherries:	🍒
+:cherry_blossom:	🌸
+:chestnut:	🌰
+:chicken:	🐔
+:children_crossing:	🚸
+:chocolate_bar:	🍫
+:christmas_tree:	🎄
+:church:	⛪
+:cinema:	🎦
+:circus_tent:	🎪
+:city_sunrise:	🌇
+:city_sunset:	🌆
+:cl:	🆑
+:clap:	👏
+:clapper:	🎬
+:clipboard:	📋
+:clock1030:	🕥
+:clock10:	🕙
+:clock1130:	🕦
+:clock11:	🕚
+:clock1230:	🕧
+:clock12:	🕛
+:clock130:	🕜
+:clock1:	🕐
+:clock230:	🕝
+:clock2:	🕑
+:clock330:	🕞
+:clock3:	🕒
+:clock430:	🕟
+:clock4:	🕓
+:clock530:	🕠
+:clock5:	🕔
+:clock630:	🕡
+:clock6:	🕕
+:clock730:	🕢
+:clock7:	🕖
+:clock830:	🕣
+:clock8:	🕗
+:clock930:	🕤
+:clock9:	🕘
+:closed_book:	📕
+:closed_lock_with_key:	🔐
+:closed_umbrella:	🌂
+:cloud:	☁️
+:clubs:	♣️
+:cn:	🇨🇳
+:cocktail:	🍸
+:coffee:	☕
+:cold_sweat:	😰
+:computer:	💻
+:confetti_ball:	🎊
+:confounded:	😖
+:confused:	😕
+:congratulations:	㊗️
+:construction:	🚧
+:construction_worker:	👷
+:convenience_store:	🏪
+:cookie:	🍪
+:cool:	🆒
+:cop:	👮
+:copyright:	©️
+:corn:	🌽
+:couple:	👫
+:couple_with_heart:	💑
+:couplekiss:	💏
+:cow2:	🐄
+:cow:	🐮
+:credit_card:	💳
+:crocodile:	🐊
+:crossed_flags:	🎌
+:crown:	👑
+:cry:	😢
+:crying_cat_face:	😿
+:crystal_ball:	🔮
+:cupid:	💘
+:curly_loop:	➰
+:currency_exchange:	💱
+:curry:	🍛
+:custard:	🍮
+:customs:	🛃
+:cyclone:	🌀
+:dancer:	💃
+:dancers:	👯
+:dango:	🍡
+:dart:	🎯
+:dash:	💨
+:date:	📅
+:de:	🇩🇪
+:deciduous_tree:	🌳
+:department_store:	🏬
+:diamond_shape_with_a_dot_inside:	💠
+:diamonds:	♦️
+:disappointed:	😞
+:disappointed_relieved:	😥
+:dizzy:	💫
+:dizzy_face:	😵
+:do_not_litter:	🚯
+:dog2:	🐕
+:dog:	🐶
+:dollar:	💵
+:dolls:	🎎
+:dolphin:	🐬
+:door:	🚪
+:doughnut:	🍩
+:dragon:	🐉
+:dragon_face:	🐲
+:dress:	👗
+:dromedary_camel:	🐪
+:droplet:	💧
+:dvd:	📀
+:ear:	👂
+:ear_of_rice:	🌾
+:earth_africa:	🌍
+:earth_americas:	🌎
+:earth_asia:	🌏
+:egg:	🥚
+:eggplant:	🍆
+:eight:	8️⃣
+:eight_pointed_black_star:	✴️
+:eight_spoked_asterisk:	✳️
+:electric_plug:	🔌
+:elephant:	🐘
+:email:	📧
+:end:	🔚
+:envelope:	✉️
+:es:	🇪🇸
+:euro:	💶
+:european_castle:	🏰
+:european_post_office:	🏤
+:evergreen_tree:	🌲
+:exclamation:	❗
+:expressionless:	😑
+:eyeglasses:	👓
+:eyes:	👀
+:factory:	🏭
+:fallen_leaf:	🍂
+:family:	👪
+:fast_forward:	⏩
+:fax:	📠
+:fearful:	😨
+:feet:	🐾
+:ferris_wheel:	🎡
+:file_folder:	📁
+:fire:	🔥
+:fire_engine:	🚒
+:fireworks:	🎆
+:first_quarter_moon:	🌓
+:first_quarter_moon_with_face:	🌛
+:fish:	🐟
+:fish_cake:	🍥
+:fishing_pole_and_fish:	🎣
+:fist:	✊
+:five:	5️⃣
+:flags:	🎏
+:flashlight:	🔦
+:floppy_disk:	💾
+:flower_playing_cards:	🎴
+:flushed:	😳
+:foggy:	🌁
+:football:	🏈
+:fork_and_knife:	🍴
+:fountain:	⛲
+:four:	4️⃣
+:four_leaf_clover:	🍀
+:fr:	🇫🇷
+:free:	🆓
+:fried_shrimp:	🍤
+:fries:	🍟
+:frog:	🐸
+:frowning:	😦
+:fuelpump:	⛽
+:full_moon:	🌕
+:full_moon_with_face:	🌝
+:game_die:	🎲
+:gem:	💎
+:gemini:	♊
+:ghost:	👻
+:gift:	🎁
+:gift_heart:	💝
+:girl:	👧
+:globe_with_meridians:	🌐
+:goat:	🐐
+:golf:	⛳
+:grapes:	🍇
+:green_apple:	🍏
+:green_book:	📗
+:green_heart:	💚
+:grey_exclamation:	❕
+:grey_question:	❔
+:grimacing:	😬
+:grin:	😁
+:grinning:	😀
+:guardsman:	💂‍♂️
+:guitar:	🎸
+:gun:	🔫
+:haircut:	💇
+:hamburger:	🍔
+:hammer:	🔨
+:hamster:	🐹
+:handbag:	👜
+:hankey:	💩
+:hash:	#️⃣
+:hatched_chick:	🐥
+:hatching_chick:	🐣
+:headphones:	🎧
+:hear_no_evil:	🙉
+:heart:	❤️
+:heart_decoration:	💟
+:heart_eyes:	😍
+:heart_eyes_cat:	😻
+:heartbeat:	💓
+:hearts:	♥️
+:heavy_check_mark:	✔️
+:heavy_division_sign:	➗
+:heavy_dollar_sign:	💲
+:heavy_minus_sign:	➖
+:heavy_multiplication_x:	✖️
+:heavy_plus_sign:	➕
+:helicopter:	🚁
+:herb:	🌿
+:hibiscus:	🌺
+:high_brightness:	🔆
+:high_heel:	👠
+:honey_pot:	🍯
+:horse:	🐴
+:horse_racing:	🏇
+:hospital:	🏥
+:hotel:	🏨
+:hotsprings:	♨️
+:hourglass:	⌛
+:hourglass_flowing_sand:	⏳
+:house:	🏠
+:house_with_garden:	🏡
+:hushed:	😯
+:ice_cream:	🍨
+:icecream:	🍦
+:id:	🆔
+:ideograph_advantage:	🉐
+:imp:	👿
+:inbox_tray:	📥
+:incoming_envelope:	📨
+:information_desk_person:	💁
+:information_source:	ℹ️
+:innocent:	😇
+:interrobang:	⁉️
+:iphone:	📱
+:it:	🇮🇹
+:izakaya_lantern:	🏮
+:jack_o_lantern:	🎃
+:japan:	🗾
+:japanese_castle:	🏯
+:japanese_goblin:	👺
+:japanese_ogre:	👹
+:jeans:	👖
+:joy:	😂
+:joy_cat:	😹
+:jp:	🇯🇵
+:key:	🔑
+:keycap_ten:	🔟
+:kimono:	👘
+:kiss:	💋
+:kissing:	😗
+:kissing_cat:	😽
+:kissing_closed_eyes:	😚
+:kissing_heart:	😘
+:kissing_smiling_eyes:	😙
+:koala:	🐨
+:koko:	🈁
+:kr:	🇰🇷
+:large_blue_diamond:	🔷
+:large_orange_diamond:	🔶
+:last_quarter_moon:	🌗
+:last_quarter_moon_with_face:	🌜
+:laughing:	😆
+:leaves:	🍃
+:ledger:	📒
+:left_luggage:	🛅
+:left_right_arrow:	↔️
+:leftwards_arrow_with_hook:	↩️
+:lemon:	🍋
+:leo:	♌
+:leopard:	🐆
+:libra:	♎
+:light_rail:	🚈
+:link:	🔗
+:lips:	👄
+:lipstick:	💄
+:lock:	🔒
+:lock_with_ink_pen:	🔏
+:lollipop:	🍭
+:loop:	➿
+:loudspeaker:	📢
+:love_hotel:	🏩
+:love_letter:	💌
+:low_brightness:	🔅
+:m:	Ⓜ️
+:mag:	🔍
+:mag_right:	🔎
+:mahjong:	🀄
+:mailbox:	📫
+:mailbox_closed:	📪
+:mailbox_with_mail:	📬
+:mailbox_with_no_mail:	📭
+:man:	👨
+:man_with_gua_pi_mao:	👲
+:man_with_turban:	👳‍♂️
+:mans_shoe:	👞
+:maple_leaf:	🍁
+:mask:	😷
+:massage:	💆
+:meat_on_bone:	🍖
+:mega:	📣
+:melon:	🍈
+:memo:	📝
+:mens:	🚹
+:metal:	🤘
+:metro:	🚇
+:microphone:	🎤
+:microscope:	🔬
+:milky_way:	🌌
+:minibus:	🚐
+:minidisc:	💽
+:mobile_phone_off:	📴
+:money_with_wings:	💸
+:moneybag:	💰
+:monkey:	🐒
+:monkey_face:	🐵
+:monorail:	🚝
+:mortar_board:	🎓
+:mount_fuji:	🗻
+:mountain_bicyclist:	🚵
+:mountain_cableway:	🚠
+:mountain_railway:	🚞
+:mouse2:	🐁
+:mouse:	🐭
+:movie_camera:	🎥
+:moyai:	🗿
+:muscle:	💪
+:mushroom:	🍄
+:musical_keyboard:	🎹
+:musical_note:	🎵
+:musical_score:	🎼
+:mute:	🔇
+:nail_care:	💅
+:name_badge:	📛
+:necktie:	👔
+:negative_squared_cross_mark:	❎
+:neutral_face:	😐
+:new:	🆕
+:new_moon:	🌑
+:new_moon_with_face:	🌚
+:newspaper:	📰
+:ng:	🆖
+:nine:	9️⃣
+:no_bell:	🔕
+:no_bicycles:	🚳
+:no_entry:	⛔
+:no_entry_sign:	🚫
+:no_good:	🙅
+:no_mobile_phones:	📵
+:no_mouth:	😶
+:no_pedestrians:	🚷
+:no_smoking:	🚭
+:nose:	👃
+:notebook:	📓
+:notebook_with_decorative_cover:	📔
+:notes:	🎶
+:nut_and_bolt:	🔩
+:o2:	🅾️
+:o:	⭕
+:ocean:	🌊
+:octopus:	🐙
+:oden:	🍢
+:office:	🏢
+:ok:	🆗
+:ok_hand:	👌
+:ok_woman:	🙆‍♀️
+:older_man:	👴
+:older_woman:	👵
+:on:	🔛
+:oncoming_automobile:	🚘
+:oncoming_bus:	🚍
+:oncoming_police_car:	🚔
+:oncoming_taxi:	🚖
+:one:	1️⃣
+:open_file_folder:	📂
+:open_hands:	👐
+:open_mouth:	😮
+:ophiuchus:	⛎
+:orange_book:	📙
+:outbox_tray:	📤
+:ox:	🐂
+:page_facing_up:	📄
+:page_with_curl:	📃
+:pager:	📟
+:palm_tree:	🌴
+:panda_face:	🐼
+:paperclip:	📎
+:parking:	🅿️
+:part_alternation_mark:	〽️
+:partly_sunny:	⛅
+:passport_control:	🛂
+:paw_prints:	🐾
+:peach:	🍑
+:pear:	🍐
+:pencil2:	✏️
+:pencil:	📝
+:penguin:	🐧
+:pensive:	😔
+:performing_arts:	🎭
+:persevere:	😣
+:pig2:	🐖
+:pig:	🐷
+:pig_nose:	🐽
+:pill:	💊
+:pineapple:	🍍
+:pisces:	♓
+:pizza:	🍕
+:point_down:	👇
+:point_left:	👈
+:point_right:	👉
+:point_up:	☝️
+:point_up_2:	👆
+:police_car:	🚓
+:poodle:	🐩
+:poop:	💩
+:post_office:	🏣
+:postal_horn:	📯
+:postbox:	📮
+:potable_water:	🚰
+:pouch:	👝
+:poultry_leg:	🍗
+:pound:	💷
+:pouting_cat:	😾
+:pray:	🙏
+:princess:	👸
+:punch:	👊
+:purple_heart:	💜
+:purse:	👛
+:pushpin:	📌
+:put_litter_in_its_place:	🚮
+:question:	❓
+:rabbit2:	🐇
+:rabbit:	🐰
+:racehorse:	🐎
+:radio:	📻
+:radio_button:	🔘
+:rage:	😡
+:railway_car:	🚃
+:rainbow:	🌈
+:raised_hand:	✋
+:raised_hands:	🙌
+:raising_hand:	🙋
+:ram:	🐏
+:ramen:	🍜
+:rat:	🐀
+:recycle:	♻️
+:red_car:	🚗
+:red_circle:	🔴
+:registered:	®️
+:relaxed:	☺️
+:relieved:	😌
+:repeat:	🔁
+:repeat_one:	🔂
+:restroom:	🚻
+:revolving_hearts:	💞
+:rewind:	⏪
+:ribbon:	🎀
+:rice:	🍚
+:rice_ball:	🍙
+:rice_cracker:	🍘
+:rice_scene:	🎑
+:ring:	💍
+:rocket:	🚀
+:roller_coaster:	🎢
+:rooster:	🐓
+:rose:	🌹
+:rotating_light:	🚨
+:round_pushpin:	📍
+:rowboat:	🚣
+:ru:	🇷🇺
+:rugby_football:	🏉
+:runner:	🏃
+:running_shirt_with_sash:	🎽
+:sa:	🈂️
+:sagittarius:	♐
+:sailboat:	⛵
+:sake:	🍶
+:sandal:	👡
+:santa:	🎅
+:satellite:	📡
+:satisfied:	😆
+:saxophone:	🎷
+:school:	🏫
+:school_satchel:	🎒
+:scissors:	✂️
+:scorpius:	♏
+:scream:	😱
+:scream_cat:	🙀
+:scroll:	📜
+:seat:	💺
+:secret:	㊙️
+:see_no_evil:	🙈
+:seedling:	🌱
+:seven:	7️⃣
+:shaved_ice:	🍧
+:sheep:	🐑
+:shell:	🐚
+:ship:	🚢
+:shirt:	👕
+:shit:	💩
+:shower:	🚿
+:signal_strength:	📶
+:six:	6️⃣
+:six_pointed_star:	🔯
+:ski:	🎿
+:skull:	💀
+:sleeping:	😴
+:sleepy:	😪
+:slot_machine:	🎰
+:small_blue_diamond:	🔹
+:small_orange_diamond:	🔸
+:small_red_triangle:	🔺
+:small_red_triangle_down:	🔻
+:smile:	😄
+:smile_cat:	😸
+:smiley:	😃
+:smiley_cat:	😺
+:smiling_imp:	😈
+:smirk:	😏
+:smirk_cat:	😼
+:smoking:	🚬
+:snail:	🐌
+:snake:	🐍
+:snowboarder:	🏂
+:snowflake:	❄️
+:snowman:	⛄
+:sob:	😭
+:soccer:	⚽
+:soon:	🔜
+:sos:	🆘
+:sound:	🔉
+:space_invader:	👾
+:spades:	♠️
+:spaghetti:	🍝
+:sparkler:	🎇
+:sparkles:	✨
+:sparkling_heart:	💖
+:speak_no_evil:	🙊
+:speaker:	🔈
+:speech_balloon:	💬
+:speedboat:	🚤
+:star2:	🌟
+:star:	⭐
+:stars:	🌠
+:station:	🚉
+:statue_of_liberty:	🗽
+:steam_locomotive:	🚂
+:stew:	🍲
+:straight_ruler:	📏
+:strawberry:	🍓
+:stuck_out_tongue:	😛
+:stuck_out_tongue_closed_eyes:	😝
+:stuck_out_tongue_winking_eye:	😜
+:sun_with_face:	🌞
+:sunflower:	🌻
+:sunglasses:	😎
+:sunny:	☀️
+:sunrise:	🌅
+:sunrise_over_mountains:	🌄
+:surfer:	🏄
+:sushi:	🍣
+:suspension_railway:	🚟
+:sweat:	😓
+:sweat_drops:	💦
+:sweat_smile:	😅
+:sweet_potato:	🍠
+:swimmer:	🏊
+:symbols:	🔣
+:syringe:	💉
+:tada:	🎉
+:tanabata_tree:	🎋
+:tangerine:	🍊
+:taurus:	♉
+:taxi:	🚕
+:tea:	🍵
+:telephone:	☎️
+:telephone_receiver:	📞
+:telescope:	🔭
+:tennis:	🎾
+:tent:	⛺
+:thought_balloon:	💭
+:three:	3️⃣
+:thumbsdown:	👎
+:thumbsup:	👍
+:ticket:	🎫
+:tiger2:	🐅
+:tiger:	🐯
+:tired_face:	😫
+:tm:	™️
+:toilet:	🚽
+:tokyo_tower:	🗼
+:tomato:	🍅
+:tongue:	👅
+:top:	🔝
+:tophat:	🎩
+:tractor:	🚜
+:traffic_light:	🚥
+:train2:	🚆
+:train:	🚋
+:tram:	🚊
+:triangular_flag_on_post:	🚩
+:triangular_ruler:	📐
+:trident:	🔱
+:triumph:	😤
+:trolleybus:	🚎
+:trophy:	🏆
+:tropical_drink:	🍹
+:tropical_fish:	🐠
+:truck:	🚚
+:trumpet:	🎺
+:tulip:	🌷
+:turtle:	🐢
+:tv:	📺
+:twisted_rightwards_arrows:	🔀
+:two:	2️⃣
+:two_men_holding_hands:	👬
+:two_women_holding_hands:	👭
+:u5272:	🈹
+:u5408:	🈴
+:u55b6:	🈺
+:u6307:	🈯
+:u6708:	🈷️
+:u6709:	🈶
+:u6e80:	🈵
+:u7121:	🈚
+:u7533:	🈸
+:u7981:	🈲
+:u7a7a:	🈳
+:umbrella:	☔
+:unamused:	😒
+:underage:	🔞
+:unlock:	🔓
+:up:	🆙
+:us:	🇺🇸
+:v:	✌️
+:vertical_traffic_light:	🚦
+:vhs:	📼
+:vibration_mode:	📳
+:video_camera:	📹
+:video_game:	🎮
+:violin:	🎻
+:virgo:	♍
+:volcano:	🌋
+:vs:	🆚
+:walking:	🚶
+:waning_crescent_moon:	🌘
+:waning_gibbous_moon:	🌖
+:warning:	⚠️
+:watch:	⌚
+:water_buffalo:	🐃
+:watermelon:	🍉
+:wave:	👋
+:wavy_dash:	〰️
+:waxing_crescent_moon:	🌒
+:waxing_gibbous_moon:	🌔
+:wc:	🚾
+:weary:	😩
+:wedding:	💒
+:whale2:	🐋
+:whale:	🐳
+:wheelchair:	♿
+:white_check_mark:	✅
+:white_circle:	⚪
+:white_flower:	💮
+:white_square_button:	🔳
+:wind_chime:	🎐
+:wine_glass:	🍷
+:wink:	😉
+:wolf:	🐺
+:woman:	👩
+:womans_clothes:	👚
+:womans_hat:	👒
+:womens:	🚺
+:worried:	😟
+:wrench:	🔧
+:x:	❌
+:yellow_heart:	💛
+:yen:	💴
+:yum:	😋
+:zap:	⚡
+:zero:	0️⃣
+:zzz:	💤
diff --git a/awk/generate_sidebar.awk b/awk/generate_sidebar.awk
index 8088264..bac0a3a 100644
--- a/awk/generate_sidebar.awk
+++ b/awk/generate_sidebar.awk
@@ -3,6 +3,15 @@ function title_from_name(name) {
     gsub(/-/, " ", name)
     return name
 }
+function url_encode_path(path) {
+    gsub(/%/, "%25", path)
+    gsub(/ /, "%20", path)
+    gsub(/#/, "%23", path)
+    gsub(/\?/, "%3F", path)
+    gsub(/"/, "%22", path)
+    gsub(/'/, "%27", path)
+    return path
+}
 
 function get_title(path, default_title,   full_path, line, title, in_fm) {
     full_path = src "/" path
@@ -172,7 +181,7 @@ END {
                 continue
             }
 
-            printf "<li><a href=\"/%sindex.html\">%s</a><ul>\n", dir_path, get_title(this_d, title_from_name(parts[i]))
+            printf "<li><a href=\"/%sindex.html\">%s</a><ul>\n", url_encode_path(dir_path), get_title(this_d, title_from_name(parts[i]))
             opened_levels[++depth] = i
         }
 
@@ -183,7 +192,7 @@ END {
         is_single = (single_file_index == "true" && md_count[curr_dir] == 1 && !has_index[curr_dir])
 
         if (parts[n] != "index.md" && !is_single) {
-            path = "/" rel
+            path = url_encode_path("/" rel)
             gsub(/\.md$/, ".html", path)
             printf "<li><a href=\"%s\">%s</a></li>\n", path, get_title(rel, title_from_name(parts[n]))
         }
diff --git a/awk/headers.awk b/awk/headers.awk
index 748e91a..fb9392d 100644
--- a/awk/headers.awk
+++ b/awk/headers.awk
@@ -13,6 +13,24 @@ function strip_markdown(s) {
     gsub(/-+$/, "", s)
     return s
 }
+function unique_id(raw_id,    candidate) {
+    candidate = raw_id
+    if (candidate == "") candidate = "section"
+    if (!(candidate in seen_ids)) {
+        seen_ids[candidate] = 1
+        return candidate
+    }
+    seen_ids[candidate]++
+    return candidate "-" seen_ids[candidate]
+}
+function print_heading(tag, line,    id) {
+    id = unique_id(strip_markdown(line))
+    if (enable_header_links == "true") {
+        print "<" tag " id=\"" id "\">" line " <a href=\"#" id "\" class=\"header-anchor\" aria-label=\"Link to this section\">#</a></" tag ">"
+    } else {
+        print "<" tag " id=\"" id "\">" line "</" tag ">"
+    }
+}
 function print_header(line) {
     tag = ""
     if (line ~ /^# /) { tag = "h1"; sub(/^# /, "", line) }
@@ -23,12 +41,7 @@ function print_header(line) {
     else if (line ~ /^###### /) { tag = "h6"; sub(/^###### /, "", line) }
 
     if (tag != "") {
-        id = strip_markdown(line)
-        if (enable_header_links == "true") {
-            print "<" tag " id=\"" id "\"><a href=\"#" id "\" class=\"header-anchor\">" line "</a></" tag ">"
-        } else {
-            print "<" tag " id=\"" id "\">" line "</" tag ">"
-        }
+        print_heading(tag, line)
     } else {
         print line
     }
@@ -52,7 +65,7 @@ BEGIN {
 
     if ($0 ~ /^=+$/) {
         if (has_prev && prev != "" && prev !~ /^<[a-z]/) {
-            print "<h1 id=\"" strip_markdown(prev) "\">" prev "</h1>"
+            print_heading("h1", prev)
             has_prev = 0
         } else {
             if (has_prev) print_header(prev)
@@ -61,7 +74,7 @@ BEGIN {
         }
     } else if ($0 ~ /^-+$/) {
         if (has_prev && prev != "" && prev !~ /^<[a-z]/) {
-            print "<h2 id=\"" strip_markdown(prev) "\">" prev "</h2>"
+            print_heading("h2", prev)
             has_prev = 0
         } else {
             if (has_prev) print_header(prev)
diff --git a/awk/render_template.awk b/awk/render_template.awk
index 1b23451..7e72fcd 100644
--- a/awk/render_template.awk
+++ b/awk/render_template.awk
@@ -16,6 +16,7 @@ BEGIN {
     style_path = ENVIRON["AWK_STYLE_PATH"]
     head_extra = ENVIRON["AWK_HEAD_EXTRA"]
     header_brand = ENVIRON["AWK_HEADER_BRAND"]
+    header_search = ENVIRON["AWK_HEADER_SEARCH"]
     lang = ENVIRON["AWK_LANG"]
     version = ENVIRON["AWK_VERSION"]
     content_warning = ENVIRON["AWK_CONTENT_WARNING"]
@@ -33,6 +34,7 @@ BEGIN {
     line = replace_all(line, "{{CSS}}", style_path)
     line = replace_all(line, "{{HEAD_EXTRA}}", head_extra)
     line = replace_all(line, "{{HEADER_BRAND}}", header_brand)
+    line = replace_all(line, "{{HEADER_SEARCH}}", header_search)
     line = replace_all(line, "{{VERSION}}", version)
 
     pos = index(line, "{{CONTENT}}")
diff --git a/lib/builder.sh b/lib/builder.sh
index d98f2b3..755c568 100644
--- a/lib/builder.sh
+++ b/lib/builder.sh
@@ -68,14 +68,16 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
             if [ "$md_count" -eq 1 ]; then
                 md_file=$(find "$dir" ! -name "$(basename "$dir")" -prune -name "*.md")
                 is_home="false"; [ "$dir" = "$src" ] && is_home="true"
-                target_url="/$rel_dir/index.html"
-                [ "$rel_dir" = "." ] && target_url="/index.html"
+                target_url=$(directory_index_url "$rel_dir")
                 if needs_rebuild "$md_file" "$out_dir/index.html"; then
                     parse_frontmatter "$md_file"
                     if [ -n "$fm_content_warning" ]; then
                         content_out_file="$out_dir/content.html"
-                        content_rel_url="/$rel_dir/content.html"
-                        [ "$rel_dir" = "." ] && content_rel_url="/content.html"
+                        if [ "$rel_dir" = "." ]; then
+                            content_rel_url="/content.html"
+                        else
+                            content_rel_url="/$(encode_url_path "$rel_dir")/content.html"
+                        fi
                         write_content_warning_outputs "$md_file" "$content_out_file" "$content_rel_url" "$target_url" "$out_dir/index.html" "$is_home"
                     else
                         render_markdown "$md_file" "$is_home" "$target_url" > "$out_dir/index.html"
@@ -112,7 +114,8 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
                 template.html|site.conf|style.css|styles.root.css|index.md) continue ;;
             esac
             if [ -d "$entry" ]; then
-                echo "${name}|- [${name}/](${name}/index.html)" >> "$temp_entries"
+                dir_url="$(encode_url_path "$name")/index.html"
+                echo "${name}|- [${name}/](${dir_url})" >> "$temp_entries"
             elif [ "${entry%.md}" != "$entry" ]; then
                 label="${name%.md}"
                 set_post_metadata "$entry" ""
@@ -147,9 +150,11 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
                 else
                     sort_key="$name"
                 fi
-                echo "${sort_key}|- [$label](${name%.md}.html)|$name|${name%.md}.html" >> "$temp_entries"
+                entry_url=$(encode_url_path "${name%.md}.html")
+                echo "${sort_key}|- [$label](${entry_url})|$name|${entry_url}" >> "$temp_entries"
             else
-                echo "${name}|- [$name]($name)|$name|$name" >> "$temp_entries"
+                asset_url=$(encode_url_path "$name")
+                echo "${name}|- [$name]($asset_url)|$name|$asset_url" >> "$temp_entries"
             fi
         done
 
@@ -186,8 +191,7 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
         rm -f "$temp_entries"
 
         is_home="false"; [ "$dir" = "$src" ] && is_home="true"
-        target_url="/$rel_dir/index.html"
-        [ "$rel_dir" = "." ] && target_url="/index.html"
+        target_url=$(directory_index_url "$rel_dir")
 
         num_items=$(wc -l < "$temp_list")
         if [ "$is_posts_dir" = "true" ] && [ -n "$posts_per_page" ] && [ "$posts_per_page" -gt 0 ] && [ "$num_items" -gt "$posts_per_page" ]; then
@@ -289,8 +293,11 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type d -print" | sort | while
 
                 if [ -n "$fm_content_warning" ]; then
                     content_out_file="$out_dir/content.html"
-                    content_rel_url="/$rel_dir/content.html"
-                    [ "$rel_dir" = "." ] && content_rel_url="/content.html"
+                    if [ "$rel_dir" = "." ]; then
+                        content_rel_url="/content.html"
+                    else
+                        content_rel_url="/$(encode_url_path "$rel_dir")/content.html"
+                    fi
                     write_content_warning_outputs "$temp_index" "$content_out_file" "$content_rel_url" "$target_url" "$out_dir/index.html" "$is_home"
                 else
                     render_markdown "$temp_index" "$is_home" "$target_url" > "$out_dir/index.html"
@@ -360,8 +367,8 @@ eval "find \"$src\" \( $IGNORE_ARGS \) -prune -o -type f -print" | sort | while
         if needs_rebuild "$file" "$out_file"; then
             if [ -n "$fm_content_warning" ]; then
                 content_out_file="$out/${rel_path%.md}-content.html"
-                content_rel_url="/${rel_path%.md}-content.html"
-                orig_rel_url="/${rel_path%.md}.html"
+                content_rel_url="/$(encode_url_path "${rel_path%.md}")-content.html"
+                orig_rel_url=$(markdown_file_url "$rel_path")
                 write_content_warning_outputs "$file" "$content_out_file" "$content_rel_url" "$orig_rel_url" "$out_file" "$is_home"
             else
                 render_markdown "$file" "$is_home" > "$out_file"
@@ -446,7 +453,7 @@ if [ "$generate_feed" = "true" ] && [ -n "$base_url" ]; then
 
         rel_path="${post_file#"$src"}"
         rel_path="${rel_path#/}"
-        post_url="$base_url_feed/${rel_path%.md}.html"
+        post_url="$base_url_feed$(markdown_file_url "$rel_path")"
 
         if date -u -d "$post_date $post_time" '+%a, %d %b %Y %H:%M:%S +0000' >/dev/null 2>&1; then
             pub_date=$(date -u -d "$post_date $post_time" '+%a, %d %b %Y %H:%M:%S +0000')
@@ -497,10 +504,10 @@ if [ "$generate_search" = "true" ] || [ "$generate_tags" = "true" ]; then
             if [ "$rel_path" = "index.md" ]; then
                 md_url="/index.html"
             else
-                md_url="/${rel_path%/index.md}/index.html"
+                md_url=$(directory_index_url "${rel_path%/index.md}")
             fi
         else
-            md_url="/${rel_path%.md}.html"
+            md_url=$(markdown_file_url "$rel_path")
             if [ "$single_file_index" = "true" ]; then
                 dir_of_file="$(dirname "$md_file")"
                 rel_dir_of_file="${dir_of_file#"$src"}"
@@ -518,7 +525,7 @@ if [ "$generate_search" = "true" ] || [ "$generate_tags" = "true" ]; then
                         if [ "$rel_dir_of_file" = "." ]; then
                             md_url="/index.html"
                         else
-                            md_url="/$rel_dir_of_file/index.html"
+                            md_url=$(directory_index_url "$rel_dir_of_file")
                         fi
                     fi
                 fi
@@ -528,7 +535,7 @@ if [ "$generate_search" = "true" ] || [ "$generate_tags" = "true" ]; then
         parse_frontmatter "$md_file"
         [ "$fm_draft" = "true" ] && continue
 
-        markdown_title_from_file "$md_file" "$title - Page"
+        markdown_title_from_loaded_file "$md_file" "$title - Page"
         md_heading="$markdown_title"
 
         if [ "$generate_search" = "true" ]; then
diff --git a/lib/config.sh b/lib/config.sh
index d6ce81a..d96b322 100644
--- a/lib/config.sh
+++ b/lib/config.sh
@@ -49,6 +49,7 @@ DEFAULT_TMPL='<!doctype html>
         <input type="checkbox" id="nav-toggle" class="nav-toggle" aria-hidden="true" />
         <header>
             <h1>{{HEADER_BRAND}}</h1>
+            {{HEADER_SEARCH}}
             <label for="nav-toggle" class="nav-toggle-label" aria-hidden="true">&#9776;</label>
         </header>
 
diff --git a/lib/generator.sh b/lib/generator.sh
index 4492657..2e83c38 100644
--- a/lib/generator.sh
+++ b/lib/generator.sh
@@ -117,7 +117,7 @@ render_markdown() {
     else
         rel_path="${file#"$src"}"
         rel_path="${rel_path#/}"
-        current_url="/${rel_path%.md}.html"
+        current_url=$(markdown_file_url "$rel_path")
     fi
 
     content_file="$file"
@@ -158,7 +158,7 @@ render_markdown() {
             "$src/styles.css") style_rel_to_src="styles.css" ;;
             "$src/style.css") style_rel_to_src="style.css" ;;
         esac
-        style_path="/${style_rel_to_src%styles.css}"
+        style_path="/$(encode_url_path "${style_rel_to_src%styles.css}")"
         style_path="${style_path%style.css}styles.css"
     else
         style_path="/styles.css"
@@ -252,13 +252,14 @@ render_markdown() {
 
     final_nav="$nav"
     final_header_brand="$header_brand"
+    final_header_search=""
     if [ "$search_in_header" = "true" ]; then
-        final_header_brand="$header_brand $SEARCH_FORM_HEADER"
+        final_header_search="$SEARCH_FORM_HEADER"
         final_nav="$SEARCH_FORM_NAV
 $nav"
     fi
 
-    ENABLE_HEADER_LINKS="$enable_header_links" CUSTOM_ADMONITIONS="$custom_admonitions" MARKDOWN_SITE_ROOT="$src" MARKDOWN_FALLBACK_FILE="$script_dir/styles/$style.css" sh "$script_dir/markdown.sh" "$content_file" | AWK_LANG="$lang" AWK_CURRENT_URL="$current_url" AWK_TITLE="$page_title" AWK_NAV="$final_nav" AWK_FOOTER="$final_footer" AWK_STYLE_PATH="${style_path}" AWK_HEADER_BRAND="$final_header_brand" AWK_HEAD_EXTRA="$head_extra" AWK_VERSION="$asset_version" AWK_CONTENT_WARNING="$fm_content_warning" awk -f "$awk_dir/render_template.awk" "$local_template"
+    ENABLE_HEADER_LINKS="$enable_header_links" CUSTOM_ADMONITIONS="$custom_admonitions" MARKDOWN_SITE_ROOT="$src" MARKDOWN_FALLBACK_FILE="$script_dir/styles/$style.css" sh "$script_dir/markdown.sh" "$content_file" | AWK_LANG="$lang" AWK_CURRENT_URL="$current_url" AWK_TITLE="$page_title" AWK_NAV="$final_nav" AWK_FOOTER="$final_footer" AWK_STYLE_PATH="${style_path}" AWK_HEADER_BRAND="$final_header_brand" AWK_HEADER_SEARCH="$final_header_search" AWK_HEAD_EXTRA="$head_extra" AWK_VERSION="$asset_version" AWK_CONTENT_WARNING="$fm_content_warning" awk -f "$awk_dir/render_template.awk" "$local_template"
 }
 generate_content_warning_page() {
     _fm_title="$1"
diff --git a/lib/metadata.sh b/lib/metadata.sh
index 35b2825..d83c94c 100644
--- a/lib/metadata.sh
+++ b/lib/metadata.sh
@@ -38,11 +38,9 @@ first_heading_from_markdown() {
     grep -m 1 '^# ' "$1" | sed 's/^# *//; s/ *$//'
 }
 
-markdown_title_from_file() {
+markdown_title_from_loaded_file() {
     _title_file="$1"
     _title_default="$2"
-
-    parse_frontmatter "$_title_file"
     markdown_title="$fm_title"
 
     if [ -z "$markdown_title" ]; then
@@ -62,6 +60,13 @@ markdown_title_from_file() {
     fi
 }
 
+markdown_title_from_file() {
+    _title_file="$1"
+    _title_default="$2"
+    parse_frontmatter "$_title_file"
+    markdown_title_from_loaded_file "$_title_file" "$_title_default"
+}
+
 set_post_datetime() {
     _raw_date="$1"
     _fallback_name="$2"
diff --git a/lib/runtime.sh b/lib/runtime.sh
index ddbf252..0f7c43d 100644
--- a/lib/runtime.sh
+++ b/lib/runtime.sh
@@ -2,6 +2,30 @@ trim_whitespace() {
     printf '%s' "$1" | sed 's/^[[:space:]]*//; s/[[:space:]]*$//'
 }
 
+encode_url_path() {
+    printf '%s' "$1" | sed \
+        -e 's/%/%25/g' \
+        -e 's/ /%20/g' \
+        -e 's/#/%23/g' \
+        -e 's/?/%3F/g' \
+        -e 's/"/%22/g' \
+        -e "s/'/%27/g"
+}
+
+markdown_file_url() {
+    _rel_path="$1"
+    printf '/%s.html\n' "$(encode_url_path "${_rel_path%.md}")"
+}
+
+directory_index_url() {
+    _rel_dir="$1"
+    if [ -z "$_rel_dir" ] || [ "$_rel_dir" = "." ]; then
+        printf '/index.html\n'
+    else
+        printf '/%s/index.html\n' "$(encode_url_path "$_rel_dir")"
+    fi
+}
+
 append_find_rule() {
     _expr="$1"
     _rule="$2"
diff --git a/markdown.sh b/markdown.sh
index 1303db2..425ecfd 100755
--- a/markdown.sh
+++ b/markdown.sh
@@ -15,7 +15,7 @@ sed_inplace() {
     fi
 }
 
-temp_file="${KEWT_TMPDIR:-/tmp}/markdown.$$.md"
+temp_file=$(mktemp "${KEWT_TMPDIR:-/tmp}/markdown.XXXXXX")
 cat "$@" > "$temp_file"
 
 trap 'rm -f "$temp_file" "$temp_file.tmp" "$temp_file.fm"' EXIT INT TERM
@@ -30,7 +30,7 @@ awk -f "$awk_dir/mask_inline_code.awk" "$temp_file" > "$temp_file.tmp" && mv "$t
 awk -f "$awk_dir/mask_plain.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 
 # Reference links
-refs=$(cat "$@" | awk '/^\[[^\]]+\]:  */')
+refs=$(awk '/^\[[^\]]+\]:  */' "$temp_file")
 IFS='
 '
 for ref in $refs; do
@@ -75,7 +75,7 @@ awk -f "$awk_dir/breaks.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.t
 awk -f "$awk_dir/paragraphs.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 
 # Inline styles
-awk -f "$awk_dir/emoji.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
+awk -v emoji_file="$awk_dir/emoji.tsv" -f "$awk_dir/emoji.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 awk -f "$awk_dir/markdown_inline.awk" "$temp_file" > "$temp_file.tmp" && mv "$temp_file.tmp" "$temp_file"
 awk -v input_file="$1" -v site_root="$MARKDOWN_SITE_ROOT" -v fallback_file="$MARKDOWN_FALLBACK_FILE" -v script_dir="$script_dir" -f "$awk_dir/markdown_embed.awk" "$temp_file"
 rm "$temp_file"