diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c814746..7f27aec 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 11, 17 ]
+        java-version: [ 11, 17, 18 ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 76aaf0c..bd2fb6f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,5 +5,5 @@
     <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="18" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 7bd4e82..3b82903 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: openjdk:17
+image: openjdk:18
 
 pipelines:
   default:
diff --git a/build.gradle b/build.gradle
index 5527079..846da30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
     id 'io.gitlab.arturbosch.detekt' version '1.19.0'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
-    id 'org.jetbrains.kotlin.kapt' version '1.6.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.20-RC'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.20-RC'
     id 'org.jetbrains.kotlinx.kover' version '0.5.0'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
@@ -27,8 +27,8 @@ def isNonStable = { String version ->
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-        log4j: '2.17.1',
-        pmd  : '6.42.0',
+        log4j: '2.17.2',
+        pmd  : '6.43.0',
 ]
 
 repositories {
@@ -54,7 +54,7 @@ dependencies {
   
     // Google
     implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'com.google.guava:guava:31.0.1-jre'
+    implementation 'com.google.guava:guava:31.1-jre'
 
     // Kotlin
     implementation platform('org.jetbrains.kotlin:kotlin-bom')
@@ -71,7 +71,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
-    implementation 'org.json:json:20211205'
+    implementation 'org.json:json:20220320'
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..41d9927 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..00e33ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 5565ecb..4204e37 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -43,7 +43,7 @@ import static net.thauvin.erik.mobibot.Utils.bold;
 /**
  * The War module.
  *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
+ * @author <a href="https://erik.thauvin.net/">Erik C. Thauvin</a>
  * @since 1.0
  */
 public final class War extends AbstractModule {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index e0e6aa3..d05d9fd 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -39,7 +39,7 @@ import assertk.assertions.isInstanceOf
 import com.rometools.rome.io.FeedException
 import net.thauvin.erik.mobibot.FeedReader.Companion.readFeed
 import org.testng.annotations.Test
-import java.io.FileNotFoundException
+import java.io.IOException
 import java.net.MalformedURLException
 import java.net.UnknownHostException
 
@@ -64,8 +64,8 @@ class FeedReaderTest {
 
         assertThat { readFeed("https://www.example.com") }.isFailure().isInstanceOf(FeedException::class.java)
 
-        assertThat { readFeed("https://www.examples.com/foo") }.isFailure()
-            .isInstanceOf(FileNotFoundException::class.java)
+        assertThat { readFeed("https://www.thauvin.net/foo") }.isFailure()
+            .isInstanceOf(IOException::class.java)
 
         assertThat { readFeed("https://www.examplesfoo.com/") }.isFailure()
             .isInstanceOf(UnknownHostException::class.java)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 8ba5c3b..90e3e4e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -36,6 +36,7 @@ import assertk.assertThat
 import assertk.assertions.any
 import assertk.assertions.contains
 import assertk.assertions.isEqualTo
+import assertk.assertions.isGreaterThan
 import assertk.assertions.isInstanceOf
 import assertk.assertions.matches
 import assertk.assertions.prop
@@ -79,7 +80,7 @@ class CurrencyConverterTest {
     fun testCurrencyRates() {
         val rates = currencyRates()
         assertThat(rates).all {
-            size().isEqualTo(33)
+            size().isGreaterThan(30)
             any { it.matches("[A-Z]{3}: +[\\d.]+".toRegex()) }
             contains("EUR:        1")
         }
diff --git a/version.properties b/version.properties
index a8ed375..1c4029c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Feb 14 23:01:11 PST 2022
-version.buildmeta=024
+#Wed Mar 23 11:53:53 PDT 2022
+version.buildmeta=035
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=rc
 version.project=mobibot
-version.semver=0.8.0-rc+024
+version.semver=0.8.0-rc+035