Rename ScaleModel to Plamo.

It is no longer needed, since all HTTPS traffic will be handled by the Nginx service on the server hosting the docker containers.

Dockerfile

@@ -1,5 +1,5 @@
 # stage 1 - build react and elm apps first
-FROM node:20.5.1-alpine as build
+FROM node:20.5.1-alpine AS build
 
 RUN apk update &&\
     apk --no-cache add curl &&\
@@ -10,7 +10,7 @@ RUN apk update &&\
     apk del curl
 
 WORKDIR /app
-ENV PATH /app/node_modules/.bin:$PATH
+ENV PATH=/app/node_modules/.bin:$PATH
 COPY ./package.json /app/
 RUN npm install
 COPY . /app
@@ -25,5 +25,5 @@ COPY --from=build /app/src/michelaben /usr/share/nginx/html/michelaben
 RUN rm /etc/nginx/conf.d/default.conf
 COPY config/nginx/nginx.conf /etc/nginx/conf.d
 EXPOSE 80
-EXPOSE 443
+#EXPOSE 443
 CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -11,17 +11,49 @@
 `docker pull pa4kev/portfolio-reactjs-full`
 
 if required, run certbot to set the certificates.
-`docker run -it --rm -p 80:80 --name certbot -v "/etc/letsencrypt:/etc/letsencrypt" -v "/var/lib/letsencrypt:/var/lib/letsencrypt" certbot/certbot certonly --standalone --break-my-certs -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl`
 
-`docker run -d --name react -p 80:80 -p 443:443 -v /etc/letsencrypt:/etc/letsencrypt -v /var/lib/letsencrypt:/var/lib/letsencrypt -v /var/www/html:/var/www/html pa4kev/portfolio-reactjs-full`
+* First stop Nginx, as it is using port 80
+``sudo systemctl start nginx.service``
 
-To renew, stop the current running container. Then re-run the same commands as above again.
+* Run this container, I doubt that i am understanding how it works properly though.
+`docker run -it --rm -p 80:80 --name certbot -v "/etc/letsencrypt:/etc/letsencrypt" -v "/var/lib/letsencrypt:/var/lib/letsencrypt" certbot/certbot certonly --standalone --break-my-certs -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl`
 
-## Server (Wielewaal)
+* Start Nginx again.
+`sudo systemctl start nginx.service`
 
-`docker pull pa4kev/portfolio-mariadb`
+* Run the portfolio container.
+`docker run -t -d --name react -p 8080:80 -v /var/www/html:/var/www/html pa4kev/portfolio-reactjs-full`
 
----
+* `-t` foreground mode
+* `-d` detached mode
+
+* Run the Gitea container.
+`docker run -d --name gitea -p 3000:3000 -p 222:22 -v ./gitea:/data -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro gitea/gitea:1.22.6`
+
+`docker run -it --rm --name certbot --net webproxy -v $(pwd)/letsencrypt:/etc/letsencrypt -v $(pwd)/letsencrypt-lib:/var/lib/letsencrypt certbot/certbot certonly --standalone --preferred-challenges http -d matsubara.nl -d www.matsubara.nl -d pa4kev.nl -d www.pa4kev.nl -d michelaben.nl -d www.michelaben.nl -d gitea.matsubara.nl`
+
+## Nginx
+
+`sudo vim /etc/nginx/sites-available/matsubara.nl`
+
+`sudo nginx -t`
+
+`sudo systemctl reload nginx`
+
+## Gitea
+
+`docker run -d --name gitea -p 3000:3000 -p 222:22 -v ./gitea:/data -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro gitea/gitea:1.22.6`
+
+* Adjust settings for gitea.
+`docker exec -it gitea bash`
+
+`vi ./data/gitea/conf/app.ini`
+
+* Applied this setting. See also: [Gitea config cheatsheet](https://docs.gitea.com/next/administration/config-cheat-sheet)
+`DISABLE_REGISTRATION = true`
+
+* Then restart the container.
+`docker container restart gitea`
 
 ## React
 
@@ -84,6 +116,15 @@ You can now run for development:
 
 ---
 
+## Docker
+
+To no longer require `sudo` for docker, use:
+
+* `sudo groupadd docker`
+* `sudo gpasswd -a $USER docker`
+
+---
+
 ## Documentation
 
 [Create React App](https://github.com/facebook/create-react-app)

config/nginx/nginx.conf

@@ -1,83 +1,175 @@
-# matsubara.nl
 
 server {
     server_name matsubara.nl www.matsubara.nl;
     listen 80;
     listen [::]:80;
 
-    return 301 https://$host$request_uri;
-}
-
-server {
-  server_name matsubara.nl www.matsubara.nl;
-  server_tokens off;
-
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-
-  # These two directives define the paths to the TLS certificate and secret key.
-  # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
-  ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
-
-  location / {
-    root   /usr/share/nginx/html;
-    index  index.html index.htm;
-
-    # to redirect all the requests to index.html, 
-    # useful when you are using react-router
-
-    try_files $uri /index.html; 
-  }
-
-  error_page   500 502 503 504  /50x.html;
-
-  location = /50x.html {
-    root   /usr/share/nginx/html;
-  }
-
-  location /.well-known/acme-challenge/ {
-      root /var/www/certbot;
-  }
-}
-
-# michelaben.nl
-
-server {
-    server_name michelaben.nl www.michelaben.nl;
-    listen 80;
-    listen [::]:80;
-
-    return 301 https://$host$request_uri;
-}
-
-server {
-    server_name michelaben.nl www.michelaben.nl;
-    server_tokens off;
-
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    # These two directives define the paths to the TLS certificate and secret key.
-    # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
-    ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
-
     location / {
-        root   /usr/share/nginx/html/michelaben;  # Update the path to your specific directory
+        root   /usr/share/nginx/html;
-        index  index.html;
+        index  index.html index.htm;
-
-        # Redirect all requests to index.html
         try_files $uri /index.html;
     }
-
-    error_page 500 502 503 504  /50x.html;
-
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    location /.well-known/acme-challenge/ {
-        root /var/www/certbot;
-    }
 }
+
+
+# # matsubara.nl
+
+# server {
+#     server_name matsubara.nl www.matsubara.nl;
+#     listen 80;
+#     listen [::]:80;
+
+#     return 301 https://$host$request_uri;
+# }
+
+# server {
+#   server_name matsubara.nl www.matsubara.nl;
+#   server_tokens off;
+
+#   listen 443 ssl http2;
+#   listen [::]:443 ssl http2;
+
+#   # These two directives define the paths to the TLS certificate and secret key.
+#   # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
+#   ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
+#   ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
+
+#   location / {
+#     root   /usr/share/nginx/html;
+#     index  index.html index.htm;
+
+#     # to redirect all the requests to index.html,
+#     # useful when you are using react-router
+
+#     try_files $uri /index.html;
+#   }
+
+#   error_page   500 502 503 504  /50x.html;
+
+#   location = /50x.html {
+#     root   /usr/share/nginx/html;
+#   }
+
+#   location /.well-known/acme-challenge/ {
+#       root /var/www/certbot;
+#   }
+# }
+
+# # pa4kev.nl
+
+# server {
+#     server_name pa4kev.nl www.pa4kev.nl;
+#     listen 80;
+#     listen [::]:80;
+
+#     return 301 https://$host$request_uri;
+# }
+
+# server {
+#   server_name pa4kev.nl www.pa4kev.nl;
+#   server_tokens off;
+
+#   listen 443 ssl http2;
+#   listen [::]:443 ssl http2;
+
+#   # These two directives define the paths to the TLS certificate and secret key.
+#   # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
+#   ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
+#   ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
+
+#   location / {
+#     rewrite ^/$ /radio permanent;
+#   }
+
+#   error_page   500 502 503 504  /50x.html;
+
+#   location = /50x.html {
+#     root   /usr/share/nginx/html;
+#   }
+
+#   location /.well-known/acme-challenge/ {
+#       root /var/www/certbot;
+#   }
+# }
+
+# # michelaben.nl
+
+# server {
+#     server_name michelaben.nl www.michelaben.nl;
+#     listen 80;
+#     listen [::]:80;
+
+#     return 301 https://$host$request_uri;
+# }
+
+# server {
+#     server_name michelaben.nl www.michelaben.nl;
+#     server_tokens off;
+
+#     listen 443 ssl http2;
+#     listen [::]:443 ssl http2;
+
+#     # These two directives define the paths to the TLS certificate and secret key.
+#     # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
+#     ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
+#     ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
+
+#     location / {
+#         root   /usr/share/nginx/html/michelaben;  # Update the path to your specific directory
+#         index  index.html;
+
+#         # Redirect all requests to index.html
+#         try_files $uri /index.html;
+#     }
+
+#     error_page 500 502 503 504  /50x.html;
+
+#     location = /50x.html {
+#         root   /usr/share/nginx/html;
+#     }
+
+#     location /.well-known/acme-challenge/ {
+#         root /var/www/certbot;
+#     }
+# }
+
+# # gitea.matsubara.nl
+
+# server {
+#     server_name gitea.matsubara.nl;
+#     listen 80;
+#     listen [::]:80;
+
+#     return 301 https://$host$request_uri;
+# }
+
+# server {
+#     server_name gitea.matsubara.nl;
+#     server_tokens off;
+
+#     listen 443 ssl http2;
+#     listen [::]:443 ssl http2;
+
+#     # These two directives define the paths to the TLS certificate and secret key.
+#     # These will be provisioned using Certbot and mounted into the Nginx container in the next step.
+#     ssl_certificate /etc/letsencrypt/live/matsubara.nl/fullchain.pem;
+#     ssl_certificate_key /etc/letsencrypt/live/matsubara.nl/privkey.pem;
+
+#     location / {
+#         root   /usr/share/nginx/html/michelaben;  # Update the path to your specific directory
+#         index  index.html;
+
+#         # Redirect all requests to index.html
+#         try_files $uri /index.html;
+#     }
+
+#     error_page 500 502 503 504  /50x.html;
+
+#     location = /50x.html {
+#         root   /usr/share/nginx/html;
+#     }
+
+#     location /.well-known/acme-challenge/ {
+#         root /var/www/certbot;
+#     }
+# }

src/App.js

@@ -43,10 +43,10 @@ import JapanesePage from './Pages/Japan/JapanesePage';
 
 import EquipmentPage from './Pages/Radio/equipmentPage';
 
-import ScaleModelMain from './Pages/ScaleModel/ScaleModelMain'
+import PlamoMain from './Pages/Plamo/PlamoMain'
 
 import { languages, getLanguage } from './Language/Language';
-import { japaneseRoutes, scaleModelBlogRoutes, programmingLanguageRoutes } from './Routers';
+import { japaneseRoutes, plamoBlogRoutes, programmingLanguageRoutes } from './Routers';
 
 function App() {
   const language = getLanguage();
@@ -56,7 +56,7 @@ function App() {
     'japan/japanese': <JapanesePage />, // Needs an md_path
     'japanMap': <JapanMapPage />,
     'radio': <RadioMain />,
-    'scalemodel': <ScaleModelMain />,
+    'plamo': <PlamoMain />,
     'software': <SoftwareMain />,
   };
 
@@ -128,8 +128,8 @@ function App() {
           {equipmentRoutes}
           {generatedRoutes}
 
-          {/* Scale model */}
+          {/* Plamo */}
-          {scaleModelBlogRoutes}
+          {plamoBlogRoutes}
 
           {/* Software */}
           {programmingLanguageRoutes}

src/Pages/Japan/Japanese/en/contrast-particle.md

@@ -2,21 +2,25 @@
 
 The は particle can be used to indicate contrast.
 
-* 私<Jps colour="c1" text="は"/>背が低いですが、ケビン<Jps colour="c2" text="は"/>背が高いです。
+* 私<Jps colour="c2" text="は"/>背が低いですが、ケビン<Jps colour="c1" text="は"/>背が高いです。
-* I'm short, <Jps colour="c2" text="but"/> Kevin is tall.
+* I'm short, <Jps colour="c1" text="but"/> Kevin is tall.
 
-The <Jps colour="c1" text="first は particle"/> is the <Jps colour="c1" text="topic marker"/>, the <Jps colour="c2" text="second は particle"/> is the <Jps colour="c2" text="contrast particle"/>.
+The <Jps colour="c2" text="first は particle"/> is the <Jps colour="c2" text="topic marker"/>, the <Jps colour="c1" text="second は particle"/> is the <Jps colour="c1" text="contrast particle"/>.
 
 ---
 
 <Jps colour="dim1" text="例文"/>
 
-* 僕<Jps colour="c1" text="は"/>イカ<Jps colour="c2" text="は"/>すきだけど、タコ<Jps colour="c2" text="は"/>好きじゃない。
+* 僕<Jps colour="c2" text="は"/>イカ<Jps colour="c2" text="は"/>すきだけど、タコ<Jps colour="c1" text="は"/>好きじゃない。
-* I like squid, <Jps colour="c2" text="but"/> I don't like octopus.
+* I like squid, <Jps colour="c1" text="but"/> I don't like octopus.
 
 * ドイツ語が話せません。でも、オランダ語<Jps colour="c1" text="は"/>話せます。　
 * I don't speak German, <Jps colour="c1" text="but"/> I can speak Dutch.
-  * オランダ語<Jps colour="c1" text="なら"/>話せます。　(Shorter reply)
+  * オランダ語<Jps colour="c1" text="なら"/>話せます。　*(Shorter reply)*
+
+
+* 山本さんは野球<Jps colour="c2" text="は"/>しますが、テニス<Jps colour="c1" text="は"/>しません。
+* Yamamoto-san plays baseball, <Jps colour="c1" text="but"/> does not play tennis.
 
 
 #### 関係する動画

src/Pages/Japan/Japanese/en/expressions.md

@@ -6,8 +6,7 @@ Notes on some common expressions in Japanese.
 
 ---
 
-* どうぞおかけください。
+**Entering a home**
-* Please take a seat.
 
 * おじゃまします。
 * Said by a visitor entering a house.
@@ -21,9 +20,127 @@ Notes on some common expressions in Japanese.
 
 ---
 
+**Introduction**
+
 * <Furigana kanji="自己紹介" kana="じこしょうかい"/>をします。
 * This is a self-introduction, said when people explain who they are, usually to a group.
 
+---
+
+**Telephone**
+
+* ケビンともうします<Jps colour="c1" text="が"/>、松原さん<Jps colour="c1" text="を"/>おねがいします。
+* Hello, this is Kevin, I want to speak to Matsubara-san please.
+
+---
+
+**Seats**
+
+* どうぞおかけください。
+* Please take a seat.
+
+* どうぞこちらにお<Furigana kanji="座" kana="すわ"/>り<Jps colour="c1" text="に"/>なってください。
+* Pleas take a seat here.
+
+---
+
+**こちらこそう**
+
+Lit. こちら *(this person)* こそ *(it is)*
+
+* 山田さん：「どうもありがとうございます。」
+* 田中さん：「こちらこそ。」
+* Yamada-san: Thank you very much.
+* Tanaka-san: No, thank you very much.
+
+
+* 山田さん：「ごめんなさい。」
+* 田中さん：「いいえ、こちらこそ。　ごめんあさい。」
+* Yamada-san: I am sorry.
+* Tanaka-san: No, I am the one that should be sorry.
+
+---
+
+**おかげさまで**
+
+Lit. *I am in the shadow of the gods.*
+
+Used to express: *thanks to you*, or: *thank you for asking*
+
+* 山田さん：「ご主人はお元気ですか。」
+* 田中さん：「はい、おかげさまで。」
+  * Do not reply with:
+  * お元気です。　(the お sounds wrong here)
+
+
+* おかげさまで元気です。
+* I am doing well, thank you for asking.
+
+---
+
+**どういたしまして**
+
+* 山田さん：「手伝ってくれてありがとう。」
+* 田中さん：「どういたしまして。」
+* Yamada-san: Thank you very much for helping.
+* Tanaka-san: You are welcome.
+
+
+---
+
+**ご自由に**
+
+* 山田さん：「このパンフレットをもらってもいいですか。」
+* 田中さん：「ええ。ご<Furigana kanji="自由" kana="じゆう"/>に どうぞ。」
+* Yamada-san: Can I take this pamflet?
+* Tanaka-san: Sure. Please help yourself.
+  * Note, there is no such reply as: まらってください。
+
+自由 literally means: *Freedom*, *Liberty*.
+
+* どうぞご自由にケーキを食べて下さい。
+* Please help yourself to some cake
+
+---
+
+**承知いたしました**
+
+Often a reply to express a request is understood. Usually towards a customer.
+
+* 山田さん：「これ、プレゼント<Furigana kanji="用" kana="よう"/>なので、つつんでもらえますか。」
+* 田中さん：「しょうちいたしました。」
+* Yamada-san: This is a gift, could you wrap it for me?
+* Tanaka-san: I understand.
+
+かしこまりました。　Is also often used in this case.
+
+<Furigana kanji="了解" kana="りょうかい"/>しました。　Is often a reply to a command.
+
+---
+
+**New years greetings**
+
+* 山田さん：「あけまして おめでとうございます。」
+* 田中さん：「おめでとうございます。」
+
+Simply reply with that, do not use:
+
+* どうぞよいお年ね。
+* あめでとうございました。
+
+---
+
+**Requests**
+
+* テレビの音がちょっと大きすぎませんか。
+  * ↳ もう少し小さくしましょうか。
+
+
+* Dont you think the television is a bit loud?
+  * ↳ Shall I turn the volume down?
+
+---
+
 **Image source:**
 
 * [irasutoya.com](https://www.irasutoya.com/)

src/Pages/Japan/Japanese/en/if-when.md

@@ -12,7 +12,7 @@
 
 "If I go", can be phrased with:
 * 行く<Jps colour="c1" text="と"/>
-* 行く<Jps colour="c1" text="たら"/>
+* 行っ<Jps colour="c1" text="たら"/>
 * 行く<Jps colour="c1" text="なら"/>
 * 行け<Jps colour="c1" text="ば"/>
 
@@ -28,17 +28,50 @@ Note that と、なら and ば cannot be used for something that happened in the
 
 #### と
 
-* 春になる<Jps colour="c1" text="と"/>、さくらが咲きます。　<Jps colour="c1" text="When / if"/> spring comes, cherry blossoms (<Jps colour="c1" text="always"/>) bloom.
+Expresses **facts** or things that **always** happen. It cannot express wish, will or request.
-* デスノートに人の名前を書く<Jps colour="c1" text="と"/>、その人は死ぬ。　<Jps colour="c1" text="When / if"/> you write a persons name in the deathnote, that person (<Jps colour="c1" text="always"/>) dies.
+
-* デスノートに人の名前を書く<Jps colour="c1" text="とき"/>、その人は死ぬ。　<Jps colour="c1" text="When"/> you write a persons name in the deathnote, that person (<Jps colour="c1" text="always"/>) dies.
+* Conditional　＞　Grammar　＞　Outcome
-  * Puts a lot more emphasis on "the moment I am writing...", rather than: when A happens, then B.
+* Verb **Dictionary-form**　＞　と
-* 歩いていた<Jps colour="c1" text="とき"/>、お母さんから電話が来た。　<Jps colour="c1" text="When"/> I was walking, I got a phone call from my mother (Here, A has nothing to do with B, its not a direct cause).
+
-* 歩く<Jps colour="c1" text="と"/>、お母さんから電話が来た。　<Jps colour="c1" text="When"/> I was walking, I (<Jps colour="c1" text="always"/>) got a phone call from my mother (Does not make much sense).
+* 春になる<Jps colour="c1" text="と"/>、さくらが咲きます。　
+* <Jps colour="c1" text="When / if"/> spring comes, cherry blossoms (<Jps colour="c1" text="always"/>) bloom.
+
+* ここを押す<Jps colour="c1" text="と"/>、電気がつく。
+* <Jps colour="c1" text="When / if"/> you press here, the light (<Jps colour="c1" text="always"/>) turns on.
+
+* ここにお金を<Furigana kanji="入" kana="い"/>れる<Jps colour="c1" text="と"/>、きっぷが出てくる。
+* <Jps colour="c1" text="When / if"/> you insert money here, a ticket (<Jps colour="c1" text="always"/>) comes out.
+
+* 朝起きる<Jps colour="c1" text="と"/>、水を飲む。
+* <Jps colour="c1" text="When"/> I wake up in the morning, I drink water.
+
+---
+
+It can also describe things that happened in the past.
+
+* スーパーに行<Jps underline=true text="く"/><Jps colour="c1" text="と"/>、セールをしてい<Jps colour="c2" underline=true text="た"/>。
+* I went to the supermarket <Jps colour="c1" text="when"/> they <Jps colour="c2" underline=true text="had"/> a sale.
+
+---
 
 ##### と、とき
 
+* デスノートに人の名前を書く<Jps colour="c1" text="と"/>、その人は死ぬ。　
+* <Jps colour="c1" text="When / if"/> you write a persons name in the deathnote, that person (<Jps colour="c1" text="always"/>) dies.
+* デスノートに人の名前を書く<Jps colour="c1" text="とき"/>、その人は死ぬ。　
+* <Jps colour="c1" text="When"/> you write a persons name in the deathnote, that person (<Jps colour="c1" text="always"/>) dies.
+  * Puts a lot more emphasis on "the moment I am writing...", rather than: when A happens, then B.
+
+
+* 歩く<Jps colour="c1" text="と"/>、お母さんから電話が来た。　
+* <Jps colour="c1" text="When"/> I was walking, I (<Jps colour="c1" text="always"/>) got a phone call from my mother (Does not make much sense).
+* 歩いていた<Jps colour="c1" text="とき"/>、お母さんから電話が来た。　<Jps colour="c1" text="When"/> 
+* I was walking, I got a phone call from my mother (Here, A has nothing to do with B, its not a direct cause).
+
 * ここを押す<Jps colour="c1" text="と"/>、痛い。　<Jps colour="c1" text="When"/> I press here, it (<Jps colour="c1" text="always"/>) hurts.
   * If it has been that way for quite a while and it always hurts.
+
+
 * ここを押す<Jps colour="c1" text="とき"/>、痛い。　<Jps colour="c1" text="When"/> I press here, it hurts.
   * Emphasis on **when**, the time, when you press.
   * It sounds like an answer to the question: "When does it hurt?" > "When I press here..."
@@ -47,10 +80,14 @@ Note that と、なら and ば cannot be used for something that happened in the
 * 目を<Furigana kanji="閉" kana="と"/>じる<Jps colour="c1" text="と"/>、何も見えない。　<Jps colour="c1" text="When"/> you close your eyes, you (<Jps colour="c1" text="always"/>) can see nothing.
   * <Furigana kanji="閉" kana="と"/>じる　（とじる）- Is used for closing eyes, books.
   * <Furigana kanji="閉" kana="し"/>める　（しめる）- Is used for closing doors, windows.
+
+
 * 眼鏡をかけない<Jps colour="c1" text="と"/>、何も見えない。　<Jps colour="c1" text="If"/> I do not wear glasses, I (<Jps colour="c1" text="always"/>) can see nothing.
 
 * 電気を消す<Jps colour="c1" text="と"/>、部屋が暗くなる。　<Jps colour="c1" text="When"/> you turn off the light, the room (<Jps colour="c1" text="always"/>) becomes dark.
   * 暗い + なる　＞　暗<Jps colour="c2" text="く"/>なる
+
+
 * 電気をつける<Jps colour="c1" text="と"/>、部屋が明るくなる。　<Jps colour="c1" text="When"/> you turn on the light, the room (<Jps colour="c1" text="always"/>) becomes bright.
   * 明るい + なる　＞　明る<Jps colour="c2" text="く"/>なる
 
@@ -59,6 +96,8 @@ Note that と、なら and ば cannot be used for something that happened in the
 * 水に携帯を落す<Jps colour="c1" text="と"/>、壊れる。　<Jps colour="c1" text="When"/> you drop your phone in water it (<Jps colour="c1" text="always"/>) breaks.
 * 牛乳を飲む<Jps colour="c1" text="と"/>、お腹が痛くなる。　<Jps colour="c1" text="When"/> I drink milk, my stomach (<Jps colour="c1" text="always"/>) hurts.
   * 痛くなる is used here, to indicate it happens <Jps colour="c2" underline=true text="after"/> you drink it (become hurt).
+
+
 * アップルパイを食べる<Jps colour="c1" text="と"/>、幸せになるます。　<Jps colour="c1" text="When"/> I eat apple pie, I (<Jps colour="c1" text="always"/>) became happy.
 * アップルパイを食べ<Jps colour="c2" text="すぎる"/><Jps colour="c1" text="と"/>、太る。　<Jps colour="c1" text="When"/> I eat <Jps colour="c2" text="too much"/> apple pie, I (<Jps colour="c1" text="always"/>) became fat.
 * お酒を飲み<Jps colour="c2" text="すぎる"/><Jps colour="c1" text="と"/>、気持ち悪くなる。　<Jps colour="c1" text="When"/> I drink <Jps colour="c2" text="too much"/> alcohol, I (<Jps colour="c1" text="always"/>) became sick.
@@ -79,60 +118,139 @@ There is a special usage of と, to indicate a **suprising outcome**.
 
 #### たら
 
+Expresses both **hypothetical** and **definite** situations (like と).
+
+It is used often for *what-if* stories and can express wish, will or request.
+
+* Conditional　＞　Grammar　＞　Outcome
+* Verb **た-form**　＞　ら
+
+---
+
+* ひまになっ<Jps colour="c1" text="たら"/>、教えて。
+* Let me know <Jps colour="c1" text="when"/> you are free.
+* <Jps colour="c1" text="If"/> you are free, let me know.
+
+* 晴れ<Jps colour="c1" text="たら"/>、海に行きたい。 *(Hypothetical situation)*
+* I want to go to the beach <Jps colour="c1" text="when"/> it is sunny.
+* <Jps colour="c1" text="If"/> it is sunny, I want to go to the beach.
+
+* 昼になっ<Jps colour="c1" text="たら"/>、出かける。 *(Definite situation)*
+* <Jps colour="c1" text="When"/> it is noon, I will go out.
+
+* 空を飛べ<Jps colour="c1" text="たら"/>、世界一周したい。 *(Hypothetical, What-if situation)*
+* <Jps colour="c1" text="If"/> I could fly in the sky, I would like to go around the world.
+
+* 家に帰っ<Jps colour="c1" text="たら"/>、ゲームをしてもいい？ *(expresses a request)*
+* <Jps colour="c1" text="When"/> I get home, can I play games?
+
+Comparison with と
+
 「<Jps colour="c1" text="たら"/>」can do all the things that <Jps colour="c2" text="と"/> can.
 
-* 食べすぎる<Jps colour="c2" text="と"/>、太る。　<Jps colour="c2" text="If"/> I eat too much, I (<Jps colour="c2" text="always"/>) get fat.
+* 食べすぎる<Jps colour="c2" text="と"/>、太る。　
-* 食べすぎ<Jps colour="c1" text="たら"/>、太る。　<Jps colour="c1" text="If"/> I eat too much, (<Jps colour="c1" text="then"/>) I get fat.
+* <Jps colour="c2" text="If"/> I eat too much, I (<Jps colour="c2" text="always"/>) get fat.
+* 食べすぎ<Jps colour="c1" text="たら"/>、太る。　
+* <Jps colour="c1" text="If"/> I eat too much, (<Jps colour="c1" text="then"/>) I get fat.
 
 Still, <Jps colour="c2" text="と"/> sounds more natural if something <Jps colour="c2" text="always"/> happens.
 
-* ピーナッツを食べる<Jps colour="c2" text="と"/>、死んじゃう。　<Jps colour="c2" text="If"/> I eat peanuts, I (<Jps colour="c2" text="always"/>) die. *(Its as good as certain here)*
+* ピーナッツを食べる<Jps colour="c2" text="と"/>、死んじゃう。　
-* ピーナッツを食べ<Jps colour="c1" text="たら"/>、死んじゃう。　<Jps colour="c1" text="If"/> I eat peanuts (<Jps colour="c1" text="then"/>) I die. *(But, it might not happen, its not always)*
+* <Jps colour="c2" text="If"/> I eat peanuts, I (<Jps colour="c2" text="always"/>) die. *(Its as good as certain here)*
+* ピーナッツを食べ<Jps colour="c1" text="たら"/>、死んじゃう。　
+* <Jps colour="c1" text="If"/> I eat peanuts (<Jps colour="c1" text="then"/>) I die. *(But, it might not happen, its not always)*
+
+Past form, it has the same meaning and the same nuances.
+
+* スーパーに行<Jps underline=true text="く"/><Jps colour="c1" text="と"/>、セールをしてい<Jps colour="c2" underline=true text="た"/>。
+* I went to the supermarket <Jps colour="c1" text="when"/> they <Jps colour="c2" underline=true text="had"/> a sale.
+* スーパーに行<Jps underline=true text="く"/><Jps colour="c1" text="たら"/>、セールをしてい<Jps colour="c2" underline=true text="た"/>。
+* I went to the supermarket <Jps colour="c1" text="when"/> they <Jps colour="c2" underline=true text="had"/> a sale.
+
+But remember, と cannot express requests.
+
+* 寒い<Jps colour="c3" strikethrough=true text="と"/>、服を着て。
+* 寒かっ<Jps colour="c1" text="たら"/>、服を着て。
+* <Jps colour="c1" text="When / if"/> it is cold, wear clothes.　*Expresses a request*  
+
+---
 
 If clause 1 happens, then clause 2 happens.
 
-* 明日雨が降っ<Jps colour="c1" text="たら"/>、家にいる。　<Jps colour="c1" text="If"/> it rains, (<Jps colour="c1" text="then"/>) I will stay home.
+* 明日雨が降っ<Jps colour="c1" text="たら"/>、家にいる。　
-* 勉強しなかっ<Jps colour="c1" text="たら"/>、試験に合格できない。　<Jps colour="c1" text="If"/> I do not study, (<Jps colour="c1" text="then"/>) I cannot pass the exam.
+* <Jps colour="c1" text="If"/> it rains, (<Jps colour="c1" text="then"/>) I will stay home.
-* また<Furigana kanji="遅" kana="おく"/>れ<Jps colour="c1" text="たら"/>、<Furigana kanji="首" kana="くび"/>になる。　<Jps colour="c1" text="If"/> I am late again, (<Jps colour="c1" text="then"/>) I will get fired.
+
-* また<Furigana kanji="嘘" kana="うそ"/>をつい<Jps colour="c1" text="たら"/>、<Furigana kanji="許" kana="ゆる"/>さない。　<Jps colour="c1" text="If"/> you lie again, (<Jps colour="c1" text="then"/>) I will not forgive you. 
+* 勉強しなかっ<Jps colour="c1" text="たら"/>、試験に合格できない。　
-* 車を運転し<Jps colour="c1" text="たら"/>、<Furigana kanji="事故" kana="じこ"/>を<Furigana kanji="起" kana="お"/>こすと思う。　<Jps colour="c1" text="If"/> I drive a car, (<Jps colour="c1" text="then"/>) I think I  will cause an accident.
+* <Jps colour="c1" text="If"/> I do not study, (<Jps colour="c1" text="then"/>) I cannot pass the exam.
-* 車を運転し<Jps colour="c1" text="たら"/>、<Furigana kanji="事故" kana="じこ"/>を<Furigana kanji="起" kana="お"/>こすと思う<Jps colour="c2" text="から"/>、運転したくない。　I do not want to drive, <Jps colour="c2" text="because"/> <Jps colour="c1" text="if"/> I drive a car, (<Jps colour="c1" text="then"/>) I think I  will cause an accident.
+
-* 質問があっ<Jps colour="c1" text="たら"/>、<Furigana kanji="遠慮" kana="えんりょ"/>せず何でも聞いてください。　<Jps colour="c1" text="If"/> you have a question, (<Jps colour="c1" text="then"/>) feel free to ask me anything.
+* また<Furigana kanji="遅" kana="おく"/>れ<Jps colour="c1" text="たら"/>、<Furigana kanji="首" kana="くび"/>になる。　
-* お金があっ<Jps colour="c1" text="たら"/>、何がしたいですか。　<Jps colour="c1" text="If"/> you had money, (<Jps colour="c1" text="then"/>) what would you do?
+* <Jps colour="c1" text="If"/> I am late again, (<Jps colour="c1" text="then"/>) I will get fired.
-* お金があっ<Jps colour="c1" text="たら"/>、<Furigana kanji="世界中" kana="せかいじゅう"/>を旅行する。　<Jps colour="c1" text="If"/> I had money, (<Jps colour="c1" text="then"/>) I would travel around the world.
+
-* 彼女がい<Jps colour="c1" text="たら"/>、このレストランに<Furigana kanji="連" kana="つ"/>れてくる。　<Jps colour="c1" text="If"/> I had a girlfriend, (<Jps colour="c1" text="then"/>) I would bring her to this restaurant.
+* また<Furigana kanji="嘘" kana="うそ"/>をつい<Jps colour="c1" text="たら"/>、<Furigana kanji="許" kana="ゆる"/>さない。　
+* <Jps colour="c1" text="If"/> you lie again, (<Jps colour="c1" text="then"/>) I will not forgive you. 
+
+* 車を運転し<Jps colour="c1" text="たら"/>、<Furigana kanji="事故" kana="じこ"/>を<Furigana kanji="起" kana="お"/>こすと思う。　
+* <Jps colour="c1" text="If"/> I drive a car, (<Jps colour="c1" text="then"/>) I think I  will cause an accident.
+
+* 車を運転し<Jps colour="c1" text="たら"/>、<Furigana kanji="事故" kana="じこ"/>を<Furigana kanji="起" kana="お"/>こすと思う<Jps colour="c2" text="から"/>、運転したくない。　
+* I do not want to drive, <Jps colour="c2" text="because"/> <Jps colour="c1" text="if"/> I drive a car, (<Jps colour="c1" text="then"/>) I think I  will cause an accident.
+
+* 質問があっ<Jps colour="c1" text="たら"/>、<Furigana kanji="遠慮" kana="えんりょ"/>せず何でも聞いてください。　
+* <Jps colour="c1" text="If"/> you have a question, (<Jps colour="c1" text="then"/>) feel free to ask me anything.
+
+* お金があっ<Jps colour="c1" text="たら"/>、何がしたいですか。　
+* <Jps colour="c1" text="If"/> you had money, (<Jps colour="c1" text="then"/>) what would you do?
+
+* お金があっ<Jps colour="c1" text="たら"/>、<Furigana kanji="世界中" kana="せかいじゅう"/>を旅行する。　
+* <Jps colour="c1" text="If"/> I had money, (<Jps colour="c1" text="then"/>) I would travel around the world.
+
+* 彼女がい<Jps colour="c1" text="たら"/>、このレストランに<Furigana kanji="連" kana="つ"/>れてくる。　
+* <Jps colour="c1" text="If"/> I had a girlfriend, (<Jps colour="c1" text="then"/>) I would bring her to this restaurant.
   * 「object」を持ってくる。　To bring (object)
   * 「location」に「someone」を<Furigana kanji="連" kana="つ"/>れてくる。To bring (someone) to (location)
 
 
-* 明日はれ<Jps colour="c1" text="たら"/>、ピクニックをしましょう。　<Jps colour="c1" text="If"/> in is sunny tomorrow, lets have a picnic.
+* 明日はれ<Jps colour="c1" text="たら"/>、ピクニックをしましょう。　
+* <Jps colour="c1" text="If"/> in is sunny tomorrow, lets have a picnic.
 
 In this case, you cannot use と, because it does not always happens, unless:
 
-* 晴れる<Jps colour="c1" text="と"/>、<Jps colour="c2" text="いつも"/>ピクニックをする。　<Jps colour="c1" text="If"/> it is sunny, I <Jps colour="c2" text="always"/> have a picnic.
+* 晴れる<Jps colour="c1" text="と"/>、<Jps colour="c2" text="いつも"/>ピクニックをする。　
+* <Jps colour="c1" text="If"/> it is sunny, I <Jps colour="c2" text="always"/> have a picnic.
 
 
 Remember that <Jps colour="c1" text="たら"/> does not always have to mean "<Jps colour="c1" text="if"/>" it can also mean "<Jps colour="c1" text="when"/>".
 
-* 食べすぎ<Jps colour="c1" text="たら"/>、太った。　<Jps colour="c1" text="When"/> I ate to much, I got fat (its already a fact, it happened).
+* 食べすぎ<Jps colour="c1" text="たら"/>、太った。　
-* 食べすぎ<Jps colour="c1" text="とき"/>、太った。　<Jps colour="c1" text="When"/> I ate to much, I got fat (Here it emphasises the time. It sounds like an answer to: "**When** did you get fat?").
+* <Jps colour="c1" text="When"/> I ate to much, I got fat (its already a fact, it happened).
+* 食べすぎ<Jps colour="c1" text="とき"/>、太った。　
+* <Jps colour="c1" text="When"/> I ate to much, I got fat (Here it emphasises the time. It sounds like an answer to: "**When** did you get fat?").
 
-* ドアを<Furigana kanji="蹴" kana="け"/>っ<Jps colour="c1" text="たら"/>、足の骨が<Furigana kanji="折" kana="お"/>れた。　<Jps colour="c1" text="When"/> I kicked the door, (<Jps colour="c1" text="then"/>) I broke my leg.
+* ドアを<Furigana kanji="蹴" kana="け"/>っ<Jps colour="c1" text="たら"/>、足の骨が<Furigana kanji="折" kana="お"/>れた。　
-* ドアを<Furigana kanji="蹴" kana="け"/>っ<Jps colour="c1" text="から"/>、足の骨が<Furigana kanji="折" kana="お"/>れた。　<Jps colour="c1" text="Because"/> I kicked the door, I broke my leg. 
+* <Jps colour="c1" text="When"/> I kicked the door, (<Jps colour="c1" text="then"/>) I broke my leg.
+* ドアを<Furigana kanji="蹴" kana="け"/>っ<Jps colour="c1" text="から"/>、足の骨が<Furigana kanji="折" kana="お"/>れた。　
+* <Jps colour="c1" text="Because"/> I kicked the door, I broke my leg. 
 
-* マリオはキノコを<Furigana kanji="取" kana="と"/>ったら、大きくなった。　<Jps colour="c1" text="When"/> Mario took the mushroom, (<Jps colour="c1" text="then"/>) he got bigger.
+* マリオはキノコを<Furigana kanji="取" kana="と"/>ったら、大きくなった。　
+* <Jps colour="c1" text="When"/> Mario took the mushroom, (<Jps colour="c1" text="then"/>) he got bigger.
+
+* <Furigana kanji="失敗" kana="しっぱい"/>し<Jps colour="c1" text="たら"/>、どうする？　
+* What <Jps colour="c1" text="if"/> I fail?
 
-* <Furigana kanji="失敗" kana="しっぱい"/>し<Jps colour="c1" text="たら"/>、どうする？　What <Jps colour="c1" text="if"/> I fail?
 * 俺が実はスパイダーマン<Jps colour="c1" text="だったら"/>、どうする？　What <Jps colour="c1" text="if"/>　I am actually Spiderman?
   * Noun + <Jps colour="c1" text="だったら"/>
 
 
-* かわい<Jps colour="c1" text="かったら"/>。　<Jps colour="c1" text="If"/> it is cute.
+* かわい<Jps colour="c1" text="かったら"/>。　
-* その映画が面白<Jps colour="c1" text="かったら"/>、見る。　<Jps colour="c1" text="If"/> the movie is interesting, (<Jps colour="c1" text="then"/>) I will watch it.
+* <Jps colour="c1" text="If"/> it is cute.
+
+* その映画が面白<Jps colour="c1" text="かったら"/>、見る。　
+* <Jps colour="c1" text="If"/> the movie is interesting, (<Jps colour="c1" text="then"/>) I will watch it.
   * い-adjective + <Jps colour="c1" text="かったら"/>　*(past tense + ら)*
 
 
-* 静か<Jps colour="c1" text="だったら"/>。　<Jps colour="c1" text="If"/> it is quiet.
+* 静か<Jps colour="c1" text="だったら"/>。　
+* <Jps colour="c1" text="If"/> it is quiet.
   * な-adjective + <Jps colour="c1" text="だったら"/> *(past tense + ら)*
 
 
@@ -144,32 +262,41 @@ Remember that <Jps colour="c1" text="たら"/> does not always have to mean "<Jp
 * な-adjective (な > じゃ) + なかったら
 * Noun + じゃ + なかったら
 
-* 私が行<Jps colour="c1" text="かなかったら"/>、どうする？　<Jps colour="c1" text="If"/> I don't go, <Jps colour="c1" text="then"/> what do I do?
+* 私が行<Jps colour="c1" text="かなかったら"/>、どうする？　
-* 間に合<Jps colour="c1" text="わなかったら"/>、先に行ってね。　<Jps colour="c1" text="If"/> I don't make it on time, (<Jps colour="c1" text="then"/>) go ahead (without me).
+* <Jps colour="c1" text="If"/> I don't go, <Jps colour="c1" text="then"/> what do I do?
-* 好きじゃ<Jps colour="c1" text="なかったら"/>、食べなくてもいいよ。　<Jps colour="c1" text="If"/> you don't like it, (<Jps colour="c1" text="then"/>) you don't have to eat it.
+
+* 間に合<Jps colour="c1" text="わなかったら"/>、先に行ってね。　
+* <Jps colour="c1" text="If"/> I don't make it on time, (<Jps colour="c1" text="then"/>) go ahead (without me).
+
+* 好きじゃ<Jps colour="c1" text="なかったら"/>、食べなくてもいいよ。　
+* <Jps colour="c1" text="If"/> you don't like it, (<Jps colour="c1" text="then"/>) you don't have to eat it.
 
 ##### Past form
 
-Note that と、なら and ば cannot be used for something that happened in the past. Only <Jps colour="c1" text="たら"/> can be used here.
+* 食べすぎ<Jps colour="c1" text="たら"/>、気持ち悪くなった。　
-
+* <Jps colour="c1" text="When"/> I ate too much, I felt sick.
-* 食べすぎ<Jps colour="c1" text="たら"/>、気持ち悪くなった。　<Jps colour="c1" text="When"/> I ate too much, I felt sick.
 
 
 ##### て and たら
 
 There is also a difference in the nuance to "then".
 
-* テレビをみて、寝た。　I watched television and <Jps colour="c1" text="then"/> went to sleep.
+* テレビをみて、寝た。　
+* I watched television and <Jps colour="c1" text="then"/> went to sleep.
   * But note that clause 1 is not a cause for clause 2. Its an order of things.
 
-* テレビをみ<Jps colour="c1" text="たら"/>、寝た。　<Jps colour="c1" text="When"/> I watched television, <Jps colour="c1" text="then"/> went to sleep.
+* テレビをみ<Jps colour="c1" text="たら"/>、寝た。　
+* <Jps colour="c1" text="When"/> I watched television, <Jps colour="c1" text="then"/> went to sleep.
   * Here, watching television is the cause of going to sleep.
 
 * ~<Jps colour="c1" text="たら"/>、...て（ください） 
   * When / if ~, (please do...)
 
-* 暑かっ<Jps colour="c1" text="たら"/>、窓を開けてください。　<Jps colour="c1" text="When"/> it is hot, please open the window.
+* 暑かっ<Jps colour="c1" text="たら"/>、窓を開けてください。　
-* 見つかっ<Jps colour="c1" text="たら"/>、電話してください。　<Jps colour="c1" text="When"/> you find it, please call me.
+* <Jps colour="c1" text="When"/> it is hot, please open the window.
+
+* 見つかっ<Jps colour="c1" text="たら"/>、電話してください。　
+* <Jps colour="c1" text="When"/> you find it, please call me.
 
 See also the [ば](#ば) form for these request forms.
 
@@ -179,83 +306,201 @@ See also the [ば](#ば) form for these request forms.
 
 なら is used a a conditional if.
 
-* 日本に行く<Jps colour="c1" text="なら"/>、まずカメラを買う。　<Jps colour="c1" text="If"/> I go to Japan, I will get a camera first.
+* Conditional　＞　Grammar　＞　Outcome
+* Verb **Dictionary-form**　＞　なら
+
+Note, sometimes の or ん is placed before なら、but it does not change the meaning.
+
+---
+
+* 日本に行く<Jps colour="c1" text="なら"/>、まずカメラを買う。　
+* <Jps colour="c1" text="If"/> I go to Japan, I will get a camera first.
   * Here, you cannot use <Jps colour="c1" text="たら"/> because you want to do something before the other thing happens. <Jps colour="c1" text="なら"/> should be used instead.
   * Clause 2 happens first, then clause 1 happens.
 
+---
+
+* 東京に行く<Jps colour="c1" text="なら"/>、<Furigana kanji="浅草" kana="あさくさ"/>がおすすめだよ。
+* <Jps colour="c1" text="If"/> you go to Tokyo, I recommend Asakusa!
+
+* コンビニに行く<Jps colour="c1" text="なら"/>、コーラを買ってきて。
+* <Jps colour="c1" text="If"/> you go to the convenience store, buy me a Cola.
+
+---
+
 Difference between たら and なら.
 
-* <Furigana kanji="大統領" kana="だいとうりょう"/>になっ<Jps colour="c1" text="たら"/>、お金持ちになる。　<Jps colour="c1" text="If"/> I become president, (<Jps colour="c1" text="then"/>) I will be a rich person 
+* <Furigana kanji="大統領" kana="だいとうりょう"/>になっ<Jps colour="c1" text="たら"/>、お金持ちになる。　
+* <Jps colour="c1" text="If"/> I become president, (<Jps colour="c1" text="then"/>) I will be a rich person.
   * *(clause 2 is a direct result of clause 1).*
-* <Furigana kanji="大統領" kana="だいとうりょう"/>になっ<Jps colour="c1" text="なら"/>、お金持ちになる。　<Jps colour="c1" text="If"/> I become president, (<Jps colour="c1" text="first"/>) I will be a rich person 
+
+
+* <Furigana kanji="大統領" kana="だいとうりょう"/>になっ<Jps colour="c1" text="なら"/>、お金持ちになる。　
+* <Jps colour="c1" text="If"/> I become president, (<Jps colour="c1" text="first"/>) I will be a rich person.
   * *(First you need the money, in order to become president).*
 
 
-* 日本に住ん<Jps colour="c1" text="だら"/>、日本語が話せるようになる。　<Jps colour="c1" text="If"/> I live in Japan, (<Jps colour="c1" text="then"/>) I will be able to speak in Japanese.
+* 日本に住ん<Jps colour="c1" text="だら"/>、日本語が話せるようになる。
-* 日本で働きたい<Jps colour="c1" text="なら"/>、日本語を勉強しなきゃ。　<Jps colour="c1" text="If"/> I want to live in Japan, (<Jps colour="c1" text="first"/>) I must study Japanese.
+* <Jps colour="c1" text="If"/> I live in Japan, (<Jps colour="c1" text="then"/>) I will be able to speak in Japanese.
+* 日本で働きたい<Jps colour="c1" text="なら"/>、日本語を勉強しなきゃ。
+* <Jps colour="c1" text="If"/> I want to live in Japan, (<Jps colour="c1" text="first"/>) I must study Japanese.
 
 
-* 明日雨が降っ<Jps colour="c1" text="たら"/>、ピクニックに行かないほうがいい。　<Jps colour="c1" text="If"/> it rains tomorrow, we should not go for a picnic. 
+* 明日雨が降っ<Jps colour="c1" text="たら"/>、ピクニックに行かないほうがいい。
+* <Jps colour="c1" text="If"/> it rains tomorrow, we should not go for a picnic. 
   * *(This does not sound like you just found out about the rain, but more like: if A then B. There is no context)*
-* 明日雨が降る<Jps colour="c1" text="なら"/>、ピクニックに行かないほうがいい。　<Jps colour="c1" text="If"/> it rains tomorrow, we should not go for a picnic. 
+
+
+* 明日雨が降る<Jps colour="c1" text="なら"/>、ピクニックに行かないほうがいい。
+* <Jps colour="c1" text="If"/> it rains tomorrow, we should not go for a picnic. 
   * *(You already know it might rain, so given the context of A, then B.)*
 
 
-* 頭が痛かっ<Jps colour="c1" text="たら"/>、薬を飲んだほうがいいよ。　<Jps colour="c1" text="If"/> your head hurts, you should take medicine. 
+* 頭が痛かっ<Jps colour="c1" text="たら"/>、薬を飲んだほうがいいよ。
+* <Jps colour="c1" text="If"/> your head hurts, you should take medicine. 
   * *(no context, just a statement)*
-* 頭が痛い<Jps colour="c1" text="なら"/>、薬を飲んだほうがいいよ。　<Jps colour="c1" text="If"/> your head hurts, you should take medicine. 
+
+
+* 頭が痛い<Jps colour="c1" text="なら"/>、薬を飲んだほうがいいよ。
+* <Jps colour="c1" text="If"/> your head hurts, you should take medicine. 
   * *(context, maybe your friend told you he or she has a headache)*
 
 
 なら is also used in situations where you do something because someone said so. If you say/do A, I will do B.
 
-* <Furigana kanji="先輩" kana="せんぱい"/>がそう言う<Jps colour="c1" text="なら"/>。　<Jps colour="c1" text="If"/> you (senpai) say so.
+* <Furigana kanji="先輩" kana="せんぱい"/>がそう言う<Jps colour="c1" text="なら"/>。
+* <Jps colour="c1" text="If"/> you (senpai) say so.
+
 * <Furigana kanji="先輩" kana="せんぱい"/>がそう言う<Jps colour="c1" text="なら"/>、　私も行きます。　<Jps colour="c1" text="If"/> you (senpai) say so, I will go too.
-* <Furigana kanji="先輩" kana="せんぱい"/>が好き<Jps colour="c1" text="なら"/>、この曲はすごいはず。　<Jps colour="c1" text="If"/> senpai likes it, then this music it must be awesome.
+* <Furigana kanji="先輩" kana="せんぱい"/>が好き<Jps colour="c1" text="なら"/>、この曲はすごいはず。
-* <Furigana kanji="先輩" kana="せんぱい"/>がタバコをやめる<Jps colour="c1" text="なら"/>、私もタバコをやめる。　<Jps colour="c1" text="If"/> senpai quits smoking, I will quit smoking too.
+* <Jps colour="c1" text="If"/> senpai likes it, then this music it must be awesome.
+
+* <Furigana kanji="先輩" kana="せんぱい"/>がタバコをやめる<Jps colour="c1" text="なら"/>、私もタバコをやめる。
+* <Jps colour="c1" text="If"/> senpai quits smoking, I will quit smoking too.
 
 
 ##### 例文
 
-* ドレスをかう<Jps colour="c1" text="なら"/>、まず<Furigana kanji="痩" kana="や"/>せる。　<Jps colour="c1" text="If"/> I buy a dress, (<Jps colour="c1" text="first"/>) I will lose weight first.
+* ドレスをかう<Jps colour="c1" text="なら"/>、まず<Furigana kanji="痩" kana="や"/>せる。
-* 子供がほしい<Jps colour="c1" text="なら"/>、結婚しなきゃ（だめだ）。　<Jps colour="c1" text="If"/> you want a child, (<Jps colour="c1" text="first"/>) you must get married.
+* <Jps colour="c1" text="If"/> I buy a dress, (<Jps colour="c1" text="first"/>) I will lose weight first.
+
+
+* 子供がほしい<Jps colour="c1" text="なら"/>、結婚しなきゃ（だめだ）。
+* <Jps colour="c1" text="If"/> you want a child, (<Jps colour="c1" text="first"/>) you must get married.
   * なきゃ（だめだ）means: its no good if you dont do...
 
 
-* <Furigana kanji="渋谷駅" kana="しぶやえき"/>に行きたいんですが。　I would like to get to Shibuya station.
+* <Furigana kanji="渋谷駅" kana="しぶやえき"/>に行きたいんですが。
-* ↳ <Furigana kanji="渋谷駅" kana="しぶやえき"/>に行きたい<Jps colour="c1" text="なら"/>、　JR<Furigana kanji="山手線" kana="やまのてせん"/>に<Furigana kanji="乗" kana="の"/>り<Furigana kanji="換" kana="か"/>えてください。　<Jps colour="c1" text="If"/> you would like to go to Shibuya station please transfer to the [JR Yamanote line](https://en.wikipedia.org/wiki/Yamanote_Line).
+* I would like to get to Shibuya station.
+* ↳ <Furigana kanji="渋谷駅" kana="しぶやえき"/>に行きたい<Jps colour="c1" text="なら"/>、　JR<Furigana kanji="山手線" kana="やまのてせん"/>に<Furigana kanji="乗" kana="の"/>り<Furigana kanji="換" kana="か"/>えてください。
+* <Jps colour="c1" text="If"/> you would like to go to Shibuya station please transfer to the [JR Yamanote line](https://en.wikipedia.org/wiki/Yamanote_Line).
 
-* <Furigana kanji="携帯" kana="けいたい"/>を使う<Jps colour="c1" text="なら"/>、外に出てください。　<Jps colour="c1" text="If"/> you want to use your phone, please go outside.
 
-* <Furigana kanji="負" kana="ま"/>けたくない<Jps colour="c1" text="なら"/>、強くならなきゃだめだ！　<Jps colour="c1" text="If"/> you do not want to lose, you must become stronger!
+* <Furigana kanji="携帯" kana="けいたい"/>を使う<Jps colour="c1" text="なら"/>、外に出てください。
+* <Jps colour="c1" text="If"/> you want to use your phone, please go outside.
+
+
+* <Furigana kanji="負" kana="ま"/>けたくない<Jps colour="c1" text="なら"/>、強くならなきゃだめだ！
+* <Jps colour="c1" text="If"/> you do not want to lose, you must become stronger!
   * 強くなら　To become strong
 
-* 日本語が上手になりたい<Jps colour="c1" text="なら"/>、　もっと練習しなきゃ。<Jps colour="c1" text="If"/> you want to become better at Japanese, you have to practice.
 
-* <Furigana kanji="緑茶" kana="りょくちゃ"/>がありますか。　Do you have green tea?
+* 日本語が上手になりたい<Jps colour="c1" text="なら"/>、　もっと練習しなきゃ。
-* ↳ <Furigana kanji="紅茶" kana="こうちゃ"/><Jps colour="c1" text="なら"/>あります。　We have black tea (<Jps colour="c1" text="but not"/> green tea)
+* <Jps colour="c1" text="If"/> you want to become better at Japanese, you have to practice.
 
-* Lサイズがありますか。　Do you have size L?
-* ↳ XL<Jps colour="c1" text="なら"/>あります。　We have XL (<Jps colour="c1" text="but not"/> L).
 
-* 大阪に行ったことがありますか。　Have you been to Osaka?
+* <Furigana kanji="緑茶" kana="りょくちゃ"/>がありますか。
-* ↳ 京都<Jps colour="c1" text="なら"/>行ったことがあります。　I have been to Kyoto (<Jps colour="c1" text="but not"/> Osaka).
+* Do you have green tea?
+* ↳ <Furigana kanji="紅茶" kana="こうちゃ"/><Jps colour="c1" text="なら"/>あります。
+* We have black tea (<Jps colour="c1" text="but not"/> green tea)
 
-* あなた<Jps colour="c1" text="なら"/>出来る！　You can do it (<Jps colour="c1" text="but others cannot"/>).
+* Lサイズがありますか。
-* 五分<Jps colour="c1" text="なら"/>話せます。　I can speak for 5 minutes (<Jps colour="c1" text="but not longer"/>).
+* Do you have size L?
+* ↳ XL<Jps colour="c1" text="なら"/>あります。　
+* We have XL (<Jps colour="c1" text="but not"/> L).
+
+* 大阪に行ったことがありますか。
+* Have you been to Osaka?
+* ↳ 京都<Jps colour="c1" text="なら"/>行ったことがあります。
+* I have been to Kyoto (<Jps colour="c1" text="but not"/> Osaka).
+
+* あなた<Jps colour="c1" text="なら"/>出来る！
+* You can do it (<Jps colour="c1" text="but others cannot"/>).
+
+* 五分<Jps colour="c1" text="なら"/>話せます。
+* I can speak for 5 minutes (<Jps colour="c1" text="but not longer"/>).
 
 ---
 
 #### ば
 
+It emphasises the **condition**, as a means to achieve your goal.
+
+It is also used to ask for **advice**.
+
+The outcome of the condition for ば is usually a **desirable** event.
+
+* Conditional　＞　Grammar　＞　Outcome
+* Verb **え-vowel-form**　＞　ば
+* 読む　＞　読め　＞　読めば　(五段 verbs)
+* 食べる　＞　食べ<Jps strikethrough=true text="ます"/>　＞　食べれば　(一段 verbs)
+
+* する　＞　すれば
+* <Furigana kanji="来" kana="く"/>る　＞　<Furigana kanji="来" kana="く"/>れば
+
+---
+
 * A<Jps colour="c1" text="たら"/>、B > If / When A happens, <Jps colour="c1" text="then"/>, B happens. There is more emphasis on the B clause here.
 * A<Jps colour="c1" text="ば"/>、B > If A happens, B happens. There is more emphasis on the A clause here.
 
-* <Furigana kanji="翼" kana="つばさ"/>があっ<Jps colour="c1" text="たら"/>、飛べる。　<Jps colour="c1" text="If"/> I had wings, I could fly.　（focus on what happens if you have wings）
+* これを読め<Jps colour="c1" text="ば"/>、わかります。
-* <Furigana kanji="翼" kana="つばさ"/>があれ<Jps colour="c1" text="ば"/>、飛べる。　<Jps colour="c1" text="If"/> I had wings, I could fly.　（focus on the wings themselves, if only I had wings）
+* <Jps colour="c1" text="If"/> you read this, you will understand.
 
-* お金があっ<Jps colour="c1" text="たら"/>、家がかえる。　<Jps colour="c1" text="If"/> I had money, I could buy a house.　(emphasis on what would happen, you may already have the money)
+* セールに行け<Jps colour="c1" text="ば"/>、服を安く買える。
-* お金があれ<Jps colour="c1" text="ば"/>、家が買える。　<Jps colour="c1" text="If"/> I had money, I could buy a house.　(emphasis on the if-part, maybe you do not have the money)
+* <Jps colour="c1" text="If"/> you go to a sale, you can buy clothes cheaply.
+  * The emphasis is on the sale here.
+
+
+* 質問があれ<Jps colour="c1" text="ば"/>、いつでも聞いてください。
+* <Jps colour="c1" text="If"/> you have any questions, just ask anytime.
+  * ある is used to express a state of being.
+
+
+* どうすれ<Jps colour="c1" text="ば"/>、日本語が上手になりますか。　*(Asking for advice)*
+* How can I become better at Japanese?
+
+* 美味しい物を食べれ<Jps colour="c1" text="ば"/>、幸せになる。
+* <Jps colour="c1" text="If"/> I eat delicious things, I will become happy.
+
+##### ない-form, negative form
+
+* 行く　＞　行かない　＞　行かなければ
+
+##### ば and と
+
+Same meaning. But と is more factual and ば emphasises the condition.
+
+* ここにお金を<Furigana kanji="入" kana="い"/>れ<Jps underline=true text="る"/><Jps colour="c1" text="と"/>、きっぷが出てくる。
+* <Jps colour="c1" text="When / if"/> you insert money here, a ticket (<Jps colour="c1" text="always"/>) comes out.
+* ここにお金を<Furigana kanji="入" kana="い"/>れ<Jps underline=true text="れ"/><Jps colour="c1" text="ば"/>、きっぷが出てくる。
+* <Jps colour="c1" text="When / if"/> you insert money here, a ticket (<Jps colour="c1" text="always"/>) comes out.
+
+##### ば and たら 
+
+* <Furigana kanji="翼" kana="つばさ"/>があっ<Jps colour="c1" text="たら"/>、飛べる。
+* <Jps colour="c1" text="If"/> I had wings, I could fly.　（focus on what happens if you have wings）
+* <Furigana kanji="翼" kana="つばさ"/>があれ<Jps colour="c1" text="ば"/>、飛べる。
+* <Jps colour="c1" text="If"/> I had wings, I could fly.　（focus on the wings themselves, if only I had wings）
+
+* お金があっ<Jps colour="c1" text="たら"/>、家がかえる。
+* <Jps colour="c1" text="If"/> I had money, I could buy a house.　*(emphasis on what would happen, you may already have the money)*
+* お金があれ<Jps colour="c1" text="ば"/>、家が買える。
+* <Jps colour="c1" text="If"/> I had money, I could buy a house.　*(emphasis on the if-part, maybe you do not have the money)*
+
+* 晴れ<Jps colour="c1" text="たら"/>、海に行きたい。 *(Hypothetical situation)*
+* <Jps colour="c1" text="If"/> it is sunny, I want to go to the beach.
+* 晴れ<Jps underline=true text="れ"/><Jps colour="c1" text="ば"/>、海に行きたい。 *(Hypothetical situation)*
+* <Jps colour="c1" text="If"/> it is sunny, I want to go to the beach.
 
 ---
 
@@ -289,37 +534,60 @@ For adjectives:
 ある and いる are exceptional verbs that can be used with <Jps colour="c1" text="ば"/> even when clause B is "~て（request）".
 * Adjective / ある / いる + ば、...て（ください）。　When / if, (please do...)
 
-* 暑<Jps underline=true text="けれ"/><Jps colour="c1" text="ば"/>、窓を開けてください。　<Jps colour="c1" text="If"/> it is hot, please open the window.
+* 暑<Jps underline=true text="けれ"/><Jps colour="c1" text="ば"/>、窓を開けてください。
+* <Jps colour="c1" text="If"/> it is hot, please open the window.
 
 ---
 
 It is also used for asking and giving advice.
 
-* どうすれ<Jps colour="c1" text="ば"/>、日本語が上手になりますか。　How can I improve my Japanese?　(lit. <Jps colour="c1" text="If"/> I do how...)
+* どうすれ<Jps colour="c1" text="ば"/>、日本語が上手になりますか。
-* もっと勉強すれ<Jps colour="c1" text="ば"/>、日本語が上手になるよ。　<Jps colour="c1" text="If"/> I study more, my Japanese will improve.　(the outcome will be good)
+* How can I improve my Japanese?　(lit. <Jps colour="c1" text="If"/> I do how...)
+
+* もっと勉強すれ<Jps colour="c1" text="ば"/>、日本語が上手になるよ。
+* <Jps colour="c1" text="If"/> I study more, my Japanese will improve.　(the outcome will be good)
 
 Or expressions of regret, like: "it would have been good if..."
 
-* 試験の前に、もっと勉強すれ<Jps colour="c1" text="ば"/>よかった。　I wish I studied more before the exam.　(lit. It would have been good <Jps colour="c1" text="if"/> I studied more...)
+* 試験の前に、もっと勉強すれ<Jps colour="c1" text="ば"/>よかった。
-* 飛行機に乗る前に、食べれ<Jps colour="c1" text="ば"/>よかった。　I wish I had eaten before getting on the airplane.　(lit. It would have been good <Jps colour="c1" text="if"/> I had eaten...)
+* I wish I studied more before the exam.
-* 電話番号を聞け<Jps colour="c1" text="ば"/>よかった。　I wish I had asked her phone number.　(lit. It would have been good <Jps colour="c1" text="if"/> I asked...)
+* (lit. It would have been good <Jps colour="c1" text="if"/> I studied more...)
-* カメラを持ってくれ<Jps colour="c1" text="ば"/>よかった。　I wish I had brought my camera.　(lit. It would have been good <Jps colour="c1" text="if"/> I brought...)
+
+* 飛行機に乗る前に、食べれ<Jps colour="c1" text="ば"/>よかった。
+* I wish I had eaten before getting on the airplane.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I had eaten...)
+
+* 電話番号を聞け<Jps colour="c1" text="ば"/>よかった。
+* I wish I had asked her phone number.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I asked...)
+
+* カメラを持ってくれ<Jps colour="c1" text="ば"/>よかった。
+* I wish I had brought my camera.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I brought...)
 
 And its negation form:
 
-* パーテイーに<Furigana kanji="来" kana="こ"/>なけれ<Jps colour="c1" text="ば"/>よかった。　I wish I didn't come to the party.　(lit. It would have been good <Jps colour="c1" text="if"/> I did not come...)
+* パーテイーに<Furigana kanji="来" kana="こ"/>なけれ<Jps colour="c1" text="ば"/>よかった。
+* I wish I didn't come to the party.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I did not come...)
   * <Furigana kanji="来" kana="く"/>る　＞　<Furigana kanji="来" kana="こ"/>ない
 
 
-* 何も言わなけれ<Jps colour="c1" text="ば"/>よかった。　I wish I did not say anything.　(lit. It would have been good <Jps colour="c1" text="if"/> I did not say...)
+* 何も言わなけれ<Jps colour="c1" text="ば"/>よかった。　
+* I wish I did not say anything.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I did not say...)
   * 言う　＞　言わない
 
 
-* <Furigana kanji="秘密" kana="ひみつ"/>を教えなけれ<Jps colour="c1" text="ば"/>よかった。　I wish I did not tell my secret. (lit. It would have been good <Jps colour="c1" text="if"/> I did not tell/teach...)
+* <Furigana kanji="秘密" kana="ひみつ"/>を教えなけれ<Jps colour="c1" text="ば"/>よかった。
+* I wish I did not tell my secret.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I did not tell/teach...)
   * 教える　＞　教えない
 
 
-* このゲームを買わなけれ<Jps colour="c1" text="ば"/>よかった。　I wish I did not buy this game.　(lit. It would have been good <Jps colour="c1" text="if"/> I did not buy...)
+* このゲームを買わなけれ<Jps colour="c1" text="ば"/>よかった。
+* I wish I did not buy this game.
+* (lit. It would have been good <Jps colour="c1" text="if"/> I did not buy...)
   * 買う　＞　買わない
 
 ---
@@ -330,9 +598,11 @@ Puts more <Jps underline=true text="emphasis"/> on "if" to make it hypothetical.
 
 It usually is at the start of the sentence.
 
-* もし一億円あっ<Jps colour="c1" text="たら"/>、どうする？　What would you do <Jps colour="c1" text="if"/> you had 100 million yen?
+* もし一億円あっ<Jps colour="c1" text="たら"/>、どうする？
+* What would you do <Jps colour="c1" text="if"/> you had 100 million yen?
 
-* もし<Furigana kanji="妊娠" kana="にんしん"/>してい<Jps colour="c1" text="たら"/>、何て言う？　What would you say if I am pregnant?　(here, a lot more emphasis is put on that it is hypothetical)
+* もし<Furigana kanji="妊娠" kana="にんしん"/>してい<Jps colour="c1" text="たら"/>、何て言う？
+* What would you say if I am pregnant?　(here, a lot more emphasis is put on that it is hypothetical)
 
 ---
 
@@ -343,4 +613,6 @@ It usually is at the start of the sentence.
 * ["IF" conditional なら - part 3](https://www.youtube.com/watch?v=e_c3V882am0) by: [Japanese Ammo with Misa](https://www.youtube.com/@JapaneseAmmowithMisa)
 * ["IF" ば & もし & "I wish I did - part 4](https://www.youtube.com/watch?v=ELgHWErsA_k) by: [Japanese Ammo with Misa](https://www.youtube.com/@JapaneseAmmowithMisa)
 
+* [Mastering Japanese Conditionals: と, たら, ば, なら](https://www.youtube.com/watch?v=ocZfV_3gAM0) by: [Learn Japanese with Moon-chan](https://www.youtube.com/@JapanesewithMoon-chan)
+
 ---

src/Pages/Japan/Japanese/en/japanese-scale-modelling-tools.md

@@ -0,0 +1,22 @@
+
+This page is an overview of Japanese words for scale modelling tools.
+
+* <Furigana kanji="極" kana="ごく"/><Furigana kanji="薄刃" kana="うすば"/> ニッパー
+* Ultra thin bladed nippers
+
+* <Furigana kanji="平" kana="ひら"/>ヤスリ
+* Flat file
+
+* <Furigana kanji="紙" kana="かみ"/>やすり
+* Sandpaper
+* Sometimes just written as: 400<Furigana kanji="番" kana="ばん"/>ペーパー
+
+* デザインナイフ
+* Hobby Knife
+
+---
+
+Vehicle related terms.
+
+* <Furigana kanji="起動" kana="きどう"/><Furigana kanji="輪" kana="わ"/>のカバー
+* Drive wheel cover (tracked vehicle)

src/Pages/Japan/Japanese/en/mae-ni-ato-de.md

@@ -0,0 +1,47 @@
+## 前に、後で
+
+Some grammer to express *before*, *in front of* and *after*, *later*.
+
+---
+
+#### 前に
+
+* Verb **Dictionary-form** ＞ 前に
+* Noun ＋**の** ＞ 前に
+
+---
+
+**Verbs**
+
+* 映画を見る<Jps colour="c1" text="前に"/>食事をします。 
+* I will have a meal <Jps colour="c1" text="before"/> watching a movie.
+
+* 映画を見る<Jps colour="c1" text="前に"/>食事をしました。
+* I had a meal <Jps colour="c1" text="before"/> watching a movie.
+
+**Nouns**
+
+* <Furigana kanji="郵便局" kana="ゆうびんきょく"/><Jps colour="c1" text="の前に"/>自転車がたくさんあります。
+* <Jps colour="c1" text="In front of"/> the post office, there are a lot of bicycles.
+
+* 旅行<Jps colour="c1" text="の前に"/><Furigana kanji="切符" kana="きっぷ"/>を買っておきます。
+* I will buy tickets <Jps colour="c1" text="before"/> the trip.
+
+---
+
+#### 後で
+
+* Verb **Past-form** ＞ 後で
+* Noun ＋**の** ＞ 後で
+
+---
+
+**Verbs**
+
+* お酒を飲んだ<Jps colour="c1" text="後で"/>、運転してはダメですよ。
+* <Jps colour="c1" text="After"/> drinking alcohol, you cannot drive.
+
+**Nouns**
+
+* 宿題<Jps colour="c1" text="の後で"/>、友達と遊びに行きます。
+* <Jps colour="c1" text="After"/> doing homework, I will go out with my friend.

src/Pages/Japan/Japanese/en/particles.md

@@ -61,6 +61,16 @@ Note that: ここからあの<Furigana kanji="看板" kana="かんばん"/><Jps
   * おにぎる<Jps colour="c1" text="を"/>作る。To make rice balls.
   * おにぎる<Jps colour="c1" text="が"/>作れますか。Can you make rice balls?
 
+##### を ＞ が
+
+Some instances where I thought it would be を、but in should actually be <Jps colour="c3" underline=true text="が"/> instead.
+
+* 最近は日本の<Furigana kanji="雑誌" kana="ざっし"/><Jps colour="c3" underline=true text="が"/>いろいろな<Furigana kanji="国" kana="くに"/>で読まれています。
+* Recently, Japanese magazines are being read in many countries.
+
+* 明日９時半から大切な会議<Jps colour="c3" underline=true text="が"/><Furigana kanji="行" kana="おこな"/>われます。
+* There will be an important meeting tomorrow from 9:30.
+
 ---
 
 #### を
@@ -93,27 +103,56 @@ Note that: ここからあの<Furigana kanji="看板" kana="かんばん"/><Jps
 へ indicates:
 * General direction, more emphasis on <Jps colour="c2" text="direction"/>
 
-こっち<Jps colour="c1" text="へ"/><Furigana kanji="来" kana="き"/>てください。Come over here, this way (in this direction).
+* こっち<Jps colour="c1" text="へ"/><Furigana kanji="来" kana="き"/>てください。
+* Come over here, this way (in this direction).
 
-こっち<Jps colour="c1" text="に"/><Furigana kanji="来" kana="き"/>てください。Come over here, this exact spot.
+* こっち<Jps colour="c1" text="に"/><Furigana kanji="来" kana="き"/>てください。
+* Come over here, this exact spot.
 
-北<Jps colour="c1" text="へ"/>行ってください。Head north.
+* 北<Jps colour="c1" text="へ"/>行ってください。
+* Head north.
+
+* Somewhere <Jps colour="c1" text="へ"/>の行き方。
+* The way to get to somewhere.
+
+* ~<Furigana kanji="4時半" kana="よじはん"/><Jps colour="c1" text="に"/><Furigana kanji="迎" kana="むか"/>えに<Furigana kanji="来" kana="き"/>てくれる？
+*  Will you pick me up at 4:30?
 
-Somewhere <Jps colour="c1" text="へ"/>の行き方。The way to get to somewhere.
 
-~<Furigana kanji="4時半" kana="よじはん"/><Jps colour="c1" text="に"/><Furigana kanji="迎" kana="むか"/>えに<Furigana kanji="来" kana="き"/>てくれる？ Will you pick me up at 4:30?
 * Time:
   * 一時<Jps colour="c1" text="に"/>、at 1:00.
+
+
 * Days of the week:
   * 日曜日<Jps colour="c1" text="に"/>、on sunday.
+
+
 * Months:
   * <Furigana kanji="一月" kana="いちがつ"/><Jps colour="c1" text="に"/>、in January.
+
+
 * Note, this is not used always, like:
   * 今日: <Jps colour="c3" strikethrough="true" text="今日に"/>
   * 明日: <Jps colour="c3" strikethrough="true" text="明日に"/>
 
+
 一週間<Jps colour="c1" text="に"/>二回ジムに行く。Twice a week, I go to the gym.
 
+
+##### が ＞ に
+
+Some instances where I thought it would be が、but in should actually be <Jps colour="c3" underline=true text="に"/> instead.
+
+* 私は昨日夜の１２時に友だち<Jps colour="c3" underline=true text="に"/><Furigana kanji="来" kana="こ"/>られて、<Furigana kanji="困" kana="こま"/>ってしまった。
+* I was in trouble because a friend came over at 12 o'clock last night.
+
+* 私は娘<Jps colour="c3" underline=true text="に"/>宿題をさせた。
+* I made my daughter do her homework.
+
+* バスを待って いた とき、私は友だち<Jps colour="c3" underline=true text="に"/>名前を<Furigana kanji="呼" kana="よ"/>ばれた。
+* When I was waiting for the bus, my friend called my name.
+
+
 ##### まで
 
 空港<Jps colour="c1" text="まで"/>お願いします。To the airport please.

src/Pages/Japan/Japanese/en/rashii-kamoshirenai-darou.md

@@ -0,0 +1,63 @@
+## らしい、かもしれない、だろう
+
+---
+
+1. [らしい](#らしい)
+2. [かもしれない](#かもしれない)
+3. [どろう](#どろう)
+
+---
+
+#### らしい
+
+らしい is used to express: *seems*, *I heard that*, *looks like*
+
+* Verb **Dictionary-form** ＞ らしい
+
+---
+
+* 明日は雨が降る<Jps colour="c1" text="らしい"/>。
+* It <Jps colour="c1" text="seems"/> that it will rain tomorrow.
+
+* 駅前にスーパーが建つ<Jps colour="c1" text="らしい"/>。
+* It <Jps colour="c1" text="looks like"/> a supermarket will be built in front of the station.
+
+* あの会社は<Furigana kanji="倒産" kana="とうさん"/>する<Jps colour="c1" text="らしい"/>。
+* <Jps colour="c1" text="I heard that"/> the company will go bankrupt.
+
+* 山田さんは<Jps underline=true text="昨日"/>外国へ<Jps underline=true text="行った"/><Jps colour="c1" text="らしい"/>です。　*(Past form)*
+* <Jps colour="c1" text="I heard that"/> Yamada-san went to a foreign country yesterday.
+
+---
+
+
+#### かもしれない
+
+かもしれない is used to express: *might*
+
+Such as speculation or a guess.
+
+* Verb **Dictionary-form** ＞ かもしれない
+
+---
+
+* 姉は来年<Furigana kanji="結婚" kana="けっこん"/>する<Jps colour="c1" text="かもしれない"/>。
+* My older sister <Jps colour="c1" text="might"/> marry next year.
+
+---
+
+#### だろう
+
+だろう is used to express: *probably*
+
+* Verb **Dictionary-form** ＞ だろう
+
+It is the presumptive form of だ.
+
+---
+
+* 午後が風<Furigana kanji="吹" kana="ふ"/>く<Jps colour="c1" text="だろう"/>。
+* The wind will <Jps colour="c1" text="probably"/> blow in the afternoon.
+
+* 電車は五分ほど<Furigana kanji="遅" kana="おく"/>れる<Jps colour="c1" text="だろう"/>。
+* The train will <Jps colour="c1" text="probably"/> be 5 minutes late.

src/Pages/Japan/Japanese/en/tameni-youni-noni.md

@@ -54,6 +54,15 @@
 
 #### ために
 
+* Verb **Dictionary-form** ＞ ために
+* Of a **volitional verb**
+
+Or,
+
+* Noun ＋**の** ＞ ために
+
+---
+
 **Verbs**
 
 * 早く家に帰る<Jps colour="c1" text="ために"/>走る。
@@ -65,6 +74,9 @@
 * 出かける<Jps colour="c1" text="ために"/>、<Furigana kanji="準備" kana="じゅんび"/>します。
 * I am getting ready <Jps colour="c1" text="to"/> go out.
 
+* 海外で働く<Jps colour="c1" text="ために"/>、英語を勉強しています。
+* I am studying English <Jps colour="c1" text="to"/>  work abroad.
+
 **Nouns**
 
 * 家族<Jps colour="c1" text="のために"/>ケーキを焼く。
@@ -92,6 +104,18 @@ Expresses the purpose of doing something. It expresses that the speaker is doing
 
 Some ように　are meant as: **in order to**, **so that**
 
+---
+
+* Verb **Dictionary-form** ＞ ように
+* Of a **non-volitional verb**
+
+Or,
+
+* Verb **Potential-form** ＞ ように
+* Verb **ない-form** ＞ ように
+
+---
+
 * 早く起きられる<Jps colour="c1" text="ように"/>寝る。
 * I am going to sleep <Jps colour="c1" text="so that"/> I can wake up early.
 
@@ -104,15 +128,21 @@ Some ように　are meant as: **in order to**, **so that**
 * ビジネスで<Furigana kanji="成功" kana="せいこう"/>する<Jps colour="c1" text="ように"/>、たくさん勉強します。　*(non-volitional verb)*
 * I study a lot <Jps colour="c1" text="so that"/> I am successful in business.
 
-* 日本語でマンガが読める<Jps colour="c1" text="ように"/>、　勉強します。　*(potential form of verb)*
+* 日本語でマンガが読める<Jps colour="c1" text="ように"/>、勉強します。　*(potential form of verb)*
 * I study <Jps colour="c1" text="so that"/> I can read manga in Japanese.
 
-* 誰かが食べない<Jps colour="c1" text="ように"/>、　プリンになまえ書こう。　*(ない-form of verb)*
+* 誰かが食べない<Jps colour="c1" text="ように"/>、プリンになまえ書こう。　*(ない-form of verb)*
 * I will write my name on the pudding <Jps colour="c1" text="so that"/> nobody eats it.
 
-* わすれない<Jps colour="c1" text="ように"/>、　言っておくね。　*(ない-form of verb)*
+* わすれない<Jps colour="c1" text="ように"/>、言っておくね。　*(ない-form of verb)*
 * I will tell you, <Jps colour="c1" text="so that"/> I will not forget.
 
+* <Furigana kanji="三日" kana="みっか"/>練習して少し運転できる<Jps colour="c1" text="ように"/>なりました。
+* After three days of practice, I was able <Jps colour="c1" text="to"/> drive a little.
+
+* 寝る前に甘い物を食べない<Jps colour="c1" text="ように"/>しています。
+* I try not <Jps colour="c1" text="to"/> eat sweets before going to bed.
+
 ---
 
 Other ように / ような are meant as: **like**, **similar to**,  **as**
@@ -162,8 +192,8 @@ Other ように / ような are meant as: **like**, **similar to**,  **as**
 * 早く起きられる<Jps colour="c1" text="ように"/>寝る。
 * I am going to sleep <Jps colour="c1" text="so that"/> I can wake up early.
 
-* No difference, but <Jps colour="c1" text="ように"/> expresses the speaker's desire to *achieve their purpose*.
+* 「<Jps colour="c1" text="ために"/>」 is more **neutral** and **objective**.
-* <Jps colour="c1" text="ために"/> is more *neutral* and *objective*.
+* No difference, but 「<Jps colour="c1" text="ように"/>」 expresses the speaker's desire to **achieve their purpose**.
 
 ---
 
@@ -192,10 +222,10 @@ V+<Jps colour="c1" text="のに"/>+使う　V+<Jps colour="c1" text="のに"/>+
 * I use a microwave <Jps colour="c1" text="to"/> heat up a bento meal.
 
 * この絵を描く<Jps colour="c1" text="のに"/>, 1か月かかります。　
-* It took one month to draw this picture. (lit. <Jps colour="c1" text="In order to"/> draw this picture, it took 1 month.)
+* It took one month to draw this picture. *(lit. <Jps colour="c1" text="In order to"/> draw this picture, it took 1 month.)*
 
 * 話している<Jps colour="c1" text="のに"/>、<Furigana kanji="後輩" kana="こうはい"/>に寝<Jps colour="c2" text="られた"/>。　
-* My kohai fell asleep (I am upset) *<Jps colour="c2" text="passive form"/>*, <Jps colour="c1" text="even though"/> I was talking.
+* My kohai fell asleep *(I am upset, <Jps colour="c2" text="passive form"/>)*, <Jps colour="c1" text="even though"/> I was talking.
 
 ---
 

src/Pages/Japan/Japanese/en/te-oku.md

@@ -20,7 +20,7 @@
 * I will get a haircut <Jps colour="c1" text="in advance"/>, because I will go to the party next week.
 
 * 来週の試験のため、漢字を勉強し<Jps colour="c1" text="ておきました"/>。
-* I studied kanji <Jps colour="c1" text="in preparation"/> for the exam next week.
+* I studied kanji <Jps colour="c1" text="in preparation"/> because of the exam next week.
 
 #### 2. To leave as is, without doing anything.
 
@@ -33,3 +33,4 @@
 ###### 関係する動画
 
 * [【JLPT N4 Grammar】〜ておく](https://www.youtube.com/watch?v=_fm1CiLbXZ4) by: [Japanese Shoko](https://www.youtube.com/@UKjapanese369)
+* [Learn Japanese Grammar ておく | Learn N4 Japanese grammar](https://www.youtube.com/watch?v=0Z2YJjFiVGs) by: [Learn Japanese with Moon-chan](https://www.youtube.com/@JapanesewithMoon-chan)

src/Pages/Japan/en/main.md

@@ -1,4 +1,4 @@
-The country of Japan and the Japanese language has facinated me for many years now, for I am married with a Japanese. To become fluent means practice every single day, no exceptions.
+These pages contain my notes on learning the Japanese language and culture.
 
 *   [Wani Kani](https://www.wanikani.com/users/PA4KEV)
 *   [Map of Japan](./japanMap)
@@ -7,14 +7,14 @@ The country of Japan and the Japanese language has facinated me for many years n
 
 ## Japanese language notes
 
-These pages contain my notes on learning the language.
-
 * [Cheat sheet](./japanese/cheat-sheet)
 * [Expressions](./japanese/expressions)
 
 * [ために、ように、のに](./japanese/tameni-youni-noni)
-* [と、たら、ば、なら](./japanese/if-when)
+* [Conditionals: と、たら、ば、なら](./japanese/if-when)
 * [けど、けれど、けれども、のに](./japanese/but)
+* [Maybe: らしい、かもしれない、だろう](./japanese/rashii-kamoshirenai-darou)
+* [前に、後で](./japanese/mae-ni-ato-de)
 
 ### て-forms
 
@@ -33,8 +33,18 @@ These pages contain my notes on learning the language.
 
 * [だけ vs しか](./japanese/dake-vs-shika)
 
-* [とか vs たり vs し｀](./japanese/toka-tari-shi)
+* [とか vs たり vs し](./japanese/toka-tari-shi)
 
 #### Verbs
 
 * [Verbs](./japanese/verbs)
+
+#### Other
+
+* [Japanese scale modelling tools](./japanese/japanese-tools)
+
+---
+
+#### Useful websites
+
+* [mlcjapanese.co.jp](https://www.mlcjapanese.co.jp/)

src/Pages/Plamo/BlogPage.js

@@ -5,8 +5,8 @@ import MarkdownPage from '../markdownPage';
 const BlogPage = ({ mdPath }) => {
     return (
         <article className='main-page'>
-            <Breadcrumbs separator=' > ' path="scalemodel">
+            <Breadcrumbs separator=' > ' path="plamo">
-                {['Scale model']}
+                {['Plamo']}
             </Breadcrumbs>
             <MarkdownPage md={mdPath} />
         </article>

src/Pages/Plamo/PlamoMain.js

@@ -2,14 +2,14 @@ import React from 'react';
 import MarkdownPage from '../markdownPage';
 import { getLanguage } from '../../Language/Language';
 
-const ScaleModelMain = () => {
+const PlamoMain = () => {
     const language = getLanguage();
 
     return (
         <article className="main-page">
-            <MarkdownPage md={'ScaleModel/' + language + '/main.md'} />            
+            <MarkdownPage md={'Plamo/' + language + '/main.md'} />            
         </article>
     )
 }
 
-export default ScaleModelMain;
+export default PlamoMain;

src/Pages/Plamo/blog/en/airbrush-cabine.md

@@ -0,0 +1,86 @@
+# Airbrush booth
+
+I built a simple diy airbrush booth in November 2024, here is the progress I made on it.
+
+First I needed space, the bike shed below our appartment would suit well. I cleaned up everything and moved an old school desk to where I wanted my booth.
+
+[foto1]
+
+I started with some planks I wanted to use as foundation and to raise the entire booth a bit. These planks were left over from a old plant container I had on our balcony and tore down. I drilled holes, sanded the sides and glued some wooden dowels in.
+
+[foto2]
+
+[foto3]
+
+Then saw the side panels and the back panel.
+
+[foto4]
+
+Saw the bars that would go in the corners, I thought these 45 degree bars looked nice from the inside.
+
+I sawed off some of the top, so that cables for the lights could go behind these bars later.
+
+[foto5]
+
+[foto6]
+
+There is no need for this many dowels, just a few is enough. I was unable to fit them together because at some point, some dowels did not exactly match up with the opposite holes, so it did not fit. I had to saw off some of the dowels until it would fit.
+
+[foto7]
+
+The 45 degree cut bars would have looked nice, but these bars proved difficult when I had to glue them together. I could not clamp it together, not even with another 45 degree bar on the opposite side. The opposite bar just kept sliding out of place. I considered this a failure and tore it apart before the glue could cure. I sanded the glue off and decided to just take a square bar instead for these corners.
+
+[foto8]
+
+[foto9]
+
+This went much easier, I cut 2 bars to length, and again removed some of the tops for the cables.
+
+[foto10]
+
+[foto11]
+
+I tried to glue a corner together, but it did not line up perfectly nice, some of the dowels were a bit too long I thing, which I did underestimated when dry-fitting.
+
+[foto12]
+
+For the next corner, I decided to do it more simple. Just 3 dowels and glue it to the edge, nothing more. Once dried, sand it to make the sides even. This worked rather well.
+
+[foto13]
+
+[foto14]
+
+Again, add just a few dowels for the back panel, and glue together.
+
+---
+
+Next I decided to work on the planks that would form the base and carry the whole cabine. These were not the most even pieces of wood to work with and required a lot of planing to get them (a little bit) even. I wanted to do this myself and reuse these planks, but going to a workshop to have these planed would have saved a lot of time and effort.
+
+[foto15]
+
+[gifje1]
+
+[foto16]
+
+It took a few days to get them to be even enough, I then moved on to make the lid.
+
+I cut four blocks from the bar I used for the corner to put on the lid and glued it together.
+
+[foto17]
+
+I was not confident I could line up the dowels on the opposite side, so I just drilled through the blocks and hammered the dowels through them. Sadly I hit one dowel a little too hard, which almost went through the front. But it will be an easy fix later.
+
+[foto18~21]
+
+Next come two holes in the lid for the ventilation. I drew a circle, drilled holes and then cut out the rest with a mortise chisel (schietbeitel). I made another mistake here, because I drew the inner diameter to be cut out. 
+
+[foto22~23]
+
+Since the ventilation part is a few millimeters thick, of course it would not fit. To fix this, I used a rasping file to get rit of a few more millimeters of wood. 
+
+[foto24]
+
+After both holes were made in the lid, I filled up some uneven and broken parts with wood plaster. Then I put on an undercoat of white paint on the wood.
+
+After sanding the undercoat and then re-applying it again, I painted some white lacquer on the entire assembly with a paint roller. It is not necessary, but it does give it a nicer finish than just the white undercoat of paint.
+

src/Pages/Plamo/blog/en/smc-2025-rx-178-mk-2.md

@@ -0,0 +1,49 @@
+ # Scale Model Challenge 2025
+
+For years I have been painting miniatures as a hobby. I did so as a solitary activity, with only a few miniatures completed. When a colleague of mine, now a friend, discovered we shared many interests like Gundam and other things related to Japan, (both of us are married with a Japanese woman as well), he introduced me to the SIG Plamo (Special Interests Group Plamo). A group of friends from university that share similar interests. This group regularly comes together to paint historic models, Warhammer, Gunpla, airbrushing, build Lego and other fun stuff. They also promote the Gunpla hobby at Animecon. Every year, some members participate in the Scale Model Challenge, the SMC in Veldhoven, Netherlands. This sparked new enthusiasm in me for this hobby again!
+
+They created a special tradition, where they pick a model kit, preferably they can buy directly at the SMC. Then everyone needs to prepare this miniature for next year's SMC, where they present the model. During that year, they do not check each other's progress, so it is a surprise to see what everyone has created after one year. They have created a ship, a tank, an airplane and in 2023, a Velorex from Eduard.
+
+This year will be my first entry, we bought 4 discounted kits of the **HGUC RX-178 Mark II Gundam**, only 10 Euro each. Here I will describe my progress.
+
+### 2024
+#### October
+
+I cut all parts from the sprue, removed the nubs and sanded the parts. I put each part into a little plastic sandwich bag with a tag of the sprue number, so that I can track them later during assembly.
+
+equipment used:
+ * Tamiya sanding sponges 400, 600 & 1000
+ * Cutter
+ * [Fiskars hobby knife](./equipment/fiskars-knife)
+
+#### November
+
+I sanded all the remaining parts and removed the seam lines.
+
+One stupid mistake I made was that I sucked up one of the bags with the vaccuum cleaner... The plastic bag was torn and all the parts were scattered inside the cleaner's bag. Luckily I was able to retrieve all the parts, clean and fix them.
+
+I was not going to use the bazooka, so I cut it up and changed the beam rifle into a different looking weapon.
+
+Because keeping parts in plastic sandwich bags was not ideal, I bought a little organizer. I was also building a HGUC Zaku II at time, which all fit nicely.
+
+#### December
+
+At this point I added some pre-wired SMD LED lights to the Gundam.
+* 2 green, for the eyes.
+* 1 green, for the camera on top of its head.
+* 1 pink and 1 green for the vulcan pod attached to the head.
+* 2 green, for the cameras on its chest.
+* 4 orange, for the thrusters on the back.
+* 1 pink, for the weapon.
+
+It was quite easy to drill trough everything for the wiring, but glueing the LEDs in place with the super glue did not work out well. Perhaps my super glue was too old, it stayed fluid. 
+
+I made a tester circuit on a breadboard to test the LEDs, to make sure they work and give the desired effect.
+
+The testing circuit has 2 electrolytic capacitors, which are decoupling capacitors. These will prevent voltage spikes, but also give an effect to the LEDs where they gradually fade when connected/disconnected with the battery. A potentiometer is used to increase resistance, which means I can dim the LEDs. And while this is not a very power efficient way to dim lights, it is easy to implement.
+
+I have a stash of breadclips, which I used to make pavement with for Warhammer bases, but for Gundam, these are nice plates for extra armour.
+
+#### Januari
+
+

src/Pages/Plamo/en/main.md

@@ -6,6 +6,6 @@ Building and painting scale models is one of my hobbies. Here is a collection of
 
 ## Blog
 
-### Scale Model Challenge
+### Equipment
 
-* [SMC 2025 - RX-178 Mk. II](./blog/smc-2025-rx-178-mk-2)
+* [Airbrush booth](./blog/airbrush-cabine)

src/Pages/Plamo/wishlist.md

@@ -11,7 +11,7 @@
 
 ### Equipment wishlist:
 
-* Dremel
+* Dremel, Proxxon
 * Bluetack
 * Kruidvat nagellak verwijderaar (met of zonder aceton)
 * UV light for curing

src/Pages/ScaleModel/blog/en/smc-2025-rx-178-mk-2.md

@@ -1,16 +0,0 @@
- # Scale Model Challenge 2025
-
-For years I have been painting miniatures as a hobby. I did so as a solitary activity, with only a few miniatures completed. When a colleague of mine, now a friend, discovered we shared many interests like Gundam and other things related to Japan, (both of us are married with a Japanese woman as well), he introduced me to the SIG Plamo (Special Interests Group Plamo). A group of friends from university that share similar interests. This group regularly comes together to paint historic models, Warhammer, Gunpla, airbrushing, build Lego and other fun stuff. They also promote the Gunpla hobby at Animecon. Every year, some members participate in the Scale Model Challenge, the SMC in Veldhoven, Netherlands. This sparked new enthusiasm in me for this hobby again!
-
-They created a special tradition, where they pick a model kit, preferably they can buy directly at the SMC. Then everyone needs to prepare this miniature for next year's SMC, where they present the model. During that year, they do not check each other's progress, so it is a surprise to see what everyone has created after one year. They have created a ship, a tank, an airplane and in 2023, a Velorex from Eduard.
-
-This year will be my first entry, we bought 4 kits of the **HGUC RX-178 Mark II Gundam**, 10 Euro each. Here I will describe my progress.
-
-### 2024
-#### October
-
-Cut all parts from the sprue, removed the nubs and sanded the parts. I put each part into a little bag with a tag of the sprue number, so that I can track them later during assembly.
-equipment used:
- * Tamiya sanding sponges 400, 600 & 1000
- * Cutter
- * [Fiskars knife](./equipment/fiskars-knife)

src/Routers.js

@@ -2,14 +2,14 @@ import React from 'react';
 import { Route } from 'react-router-dom';
 import { languages } from './Language/Language';
 import JapanesePage from './Pages/Japan/JapanesePage';
-import BlogPage from './Pages/ScaleModel/BlogPage';
+import BlogPage from './Pages/Plamo/BlogPage';
 import CSharpPage from './Pages/Software/csharp/CSharpPage';
 import ElmPage from './Pages/Software/elm/ElmPage';
 
 
 // Japan
 export const japaneseRoutes = languages.map(lang => {
-    const pages = ['but', 'cheat-sheet', 'contrast-particle', 'dake-vs-shika', 'expressions', 'if-when', 'particles', 'tameni-youni-noni', 'te-form', 'te-oku', 'toka-tari-shi', 'verbs'];
+    const pages = ['but', 'cheat-sheet', 'contrast-particle', 'dake-vs-shika', 'expressions', 'if-when', 'japanese-scale-modelling-tools', 'mae-ni-ato-de', 'particles', 'rashii-kamoshirenai-darou', 'tameni-youni-noni', 'te-form', 'te-oku', 'toka-tari-shi', 'verbs'];
     return pages.map(page => {
       const path = `/${lang}/japan/japanese/${page}`;
       const mdPath = `Japan/Japanese/${lang}/${page}.md`;
@@ -17,12 +17,12 @@ export const japaneseRoutes = languages.map(lang => {
     });
   }).flat();
 
-// Scale model
+// Plamo
-export const scaleModelBlogRoutes = languages.map(lang => {
+export const plamoBlogRoutes = languages.map(lang => {
   const pages = ['smc-2025-rx-178-mk-2'];
   return pages.map(page => {
-    const path = `/${lang}/scalemodel/blog/${page}`;
+    const path = `/${lang}/plamo/blog/${page}`;
-    const mdPath = `ScaleModel/blog/${lang}/${page}.md`;
+    const mdPath = `Plamo/blog/${lang}/${page}.md`;
     return <Route key={`${lang}-${page}`} exact path={path} element={<BlogPage mdPath={mdPath} />} />;
   });
 }).flat();

src/michelaben/paraplu.md

@@ -0,0 +1,29 @@
+## De paraplu
+
+1. Is dè ginne paraplu? (samen): ja dè is ene paraplu, ene paraplu, van tante Truu.
+
+Refrein: Oh, wanne schonne, oh, wanne schonne, oh, wanne schonne paraplu.
+
+2. Is dè ginne Nondeju? (samen): ja dè is ene Nondeju, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+3. Is dè ginne gladde ring? (samen): ja, dè is ene gladde ring, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+4. Is dè nou gin damesding? (samen): ja, dè is 'n damesding, 'n damesding, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+5. Is dè ginne lege zak? (samen): ja, dè is ene lege zak, ene lege zak, 'n damesding, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+6. Is dè ginne zak tabak? (samen): ja, dè is ene zak tabak, ene zak tabak, ene lege zak, 'n damesding, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+7. Is dè ginne ouwe korst? (samen): ja, dè is ene ouwe korst, een ouwe korst, ene zak tabak, ene lege zak, 'n damesding, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+8. Is dè nou gin stukske worst? (samen): ja, dè is 'n stukske worst, 'n stukske worst, ene ouwe korst, ene zak tabak, ene lege zak, 'n damesding, ene gladde ring, ene Nondeju, ene paraplu, van tante Truu.
+Refrein.
+
+### Einde
+

src/overrides.scss

@@ -17,7 +17,7 @@ $theme-colors: (
   "dark-kanji": #8448bd,
   "dark-dim1": #ababab,
   "light-c1": #992299,
-  "light-c2": #446600,
+  "light-c2": #0a9dc2,
   "light-c3": #c70000,
   "light-kanji": #3a2180,
   "light-dim1": #787878,