diff --git a/Backend/.gitignore b/Backend/.gitignore
deleted file mode 100644
index c2065bc..0000000
--- a/Backend/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
diff --git a/Backend/build.gradle.kts b/Backend/build.gradle.kts
deleted file mode 100644
index 90f0403..0000000
--- a/Backend/build.gradle.kts
+++ /dev/null
@@ -1,45 +0,0 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-    id("org.springframework.boot") version "2.4.1"
-    id("io.spring.dependency-management") version "1.0.10.RELEASE"
-    kotlin("jvm") version "1.4.21"
-    kotlin("plugin.spring") version "1.4.21"
-    // kotlin("plugin.jpa") version "1.4.21"
-}
-
-group = "org.hydev.ios"
-version = "0.0.1.1"
-java.sourceCompatibility = JavaVersion.VERSION_11
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    implementation("org.springframework.boot", "spring-boot-starter-validation", "2.4.1")
-
-    // MongoDB
-    implementation(group = "org.springframework.data", name = "spring-data-mongodb", version = "3.1.2")
-    implementation(group = "org.springframework.boot", name = "spring-boot-starter-data-mongodb")
-
-    // MariaDB
-    // implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    // runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
-}
diff --git a/Backend/gradle/wrapper/gradle-wrapper.jar b/Backend/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c..0000000
Binary files a/Backend/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/Backend/gradle/wrapper/gradle-wrapper.properties b/Backend/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 4d9ca16..0000000
--- a/Backend/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/Backend/gradlew b/Backend/gradlew
deleted file mode 100755
index 4f906e0..0000000
--- a/Backend/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/Backend/gradlew.bat b/Backend/gradlew.bat
deleted file mode 100644
index 107acd3..0000000
--- a/Backend/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/Backend/settings.gradle.kts b/Backend/settings.gradle.kts
deleted file mode 100644
index 6b95634..0000000
--- a/Backend/settings.gradle.kts
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "alarm-clock"
diff --git a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/AlarmClockApplication.kt b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/AlarmClockApplication.kt
deleted file mode 100644
index c525f1d..0000000
--- a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/AlarmClockApplication.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.hydev.ios.alarmclock
-
-import org.hydev.ios.alarmclock.data.UserRepo
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.runApplication
-import org.springframework.data.mongodb.repository.config.EnableMongoRepositories
-
-@SpringBootApplication
-@EnableMongoRepositories(basePackageClasses = [UserRepo::class])
-class AlarmClockApplication
-
-fun main(args: Array<String>)
-{
-    runApplication<AlarmClockApplication>(*args)
-}
diff --git a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/Extensions.kt b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/Extensions.kt
deleted file mode 100644
index 9428acb..0000000
--- a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/Extensions.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.hydev.ios.alarmclock
-
-import org.springframework.http.ResponseEntity
-import java.security.SecureRandom
-import java.security.spec.KeySpec
-import java.util.*
-import javax.crypto.SecretKeyFactory
-import javax.crypto.spec.PBEKeySpec
-
-/**
- * Generate "Bad Request" response entity
- *
- * @param msg Message
- * @return Response entity
- */
-fun bad(msg: String): ResponseEntity<String> = ResponseEntity.badRequest().body(msg)
-
-/**
- * Generate random salt
- *
- * @param len Length of the salt in bytes
- * @return Random byte array of size len
- */
-fun randSalt(len: Int = 16): ByteArray
-{
-    val random = SecureRandom()
-    val salt = ByteArray(len)
-    random.nextBytes(salt)
-    return salt
-}
-
-/**
- * Hash a password
- *
- * @return <Hash, Salt>
- */
-fun String.passwordHash(salt: String = randSalt().base64): Pair<String, String>
-{
-    val spec: KeySpec = PBEKeySpec(toCharArray(), salt.base64, 32767, 512)
-    val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1")
-    return Pair(factory.generateSecret(spec).encoded.base64, salt)
-}
-
-val ByteArray.base64: String
-    get() = Base64.getEncoder().encodeToString(this)
-
-val String.base64: ByteArray
-    get() = Base64.getDecoder().decode(this)
-
-
-fun main(args: Array<String>)
-{
-    val (hash, salt) = "password".passwordHash()
-    println(hash)
-    println(salt)
-    val (hash2, salt2) = "password".passwordHash(salt)
-    assert(hash == hash2 && salt == salt2)
-    println("Hash matches")
-}
diff --git a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/Test.kt b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/Test.kt
deleted file mode 100644
index e4c83de..0000000
--- a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/Test.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.hydev.ios.alarmclock.data
-
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-/**
- * TODO: Write a description for this class!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2021-01-12 09:28
- */
-@RestController
-@RequestMapping("/api")
-class Test
-{
-    @GetMapping("/echo")
-    fun echo(message: String?) = message
-}
diff --git a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt b/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt
deleted file mode 100644
index 34545e5..0000000
--- a/Backend/src/main/kotlin/org/hydev/ios/alarmclock/data/User.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.hydev.ios.alarmclock.data
-
-import org.hydev.ios.alarmclock.bad
-import org.hydev.ios.alarmclock.passwordHash
-import org.springframework.data.annotation.Id
-import org.springframework.data.domain.Example
-import org.springframework.data.domain.ExampleMatcher
-import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.ignoreCase
-import org.springframework.data.mongodb.core.index.Indexed
-import org.springframework.data.mongodb.core.mapping.Document
-import org.springframework.data.mongodb.repository.MongoRepository
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestParam
-import org.springframework.web.bind.annotation.RestController
-import javax.validation.constraints.Email
-
-/**
- * The database model for an user
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2021-01-09 10:48
- */
-@Document(collation = "user")
-data class User(
-    @Id
-    var id: Long = 0,
-
-    var name: String,
-
-    @Indexed(unique = true)
-    var email: String,
-
-    var passHash: String = "",
-
-    var passSalt: String = ""
-)
-{
-    constructor(name: String, email: String, pass: String) : this(name = name, email = email)
-    {
-        val (h, s) = pass.passwordHash()
-        passHash = h
-        passSalt = s
-    }
-}
-
-interface UserRepo: MongoRepository<User, String>
-
-@RestController
-@RequestMapping("/api/user")
-class UserApi(val repo: UserRepo)
-{
-    val em = ExampleMatcher.matching().withIgnorePaths("id", "passHash", "passSalt", "name").withMatcher("email", ignoreCase())
-
-    @GetMapping("/register")
-    fun register(@RequestParam name: String, @RequestParam pass: String, @RequestParam @Email email: String): Any
-    {
-        // Check name length
-        if (name.length !in 1..32) return bad("Name length not in range 1 to 32")
-
-        // Check if email exists
-        val user = User(name, email, pass)
-        if (repo.exists(Example.of(user, em))) return bad("Email is already registered")
-
-        // Check password strength
-        if (pass.length < 8) return bad("Password must be longer than 8 chars")
-
-        // Register
-        repo.save(user)
-        return user
-    }
-
-    @GetMapping("/delete")
-    fun delete(@RequestParam email: String, @RequestParam pass: String): Any
-    {
-        // Check if username exists
-        val users = repo.findAll(Example.of(User("", email, pass), em))
-        if (users.isEmpty()) return bad("User doesn't exist")
-
-        // Delete
-        users.forEach { repo.delete(it) }
-        return "Deleted"
-    }
-}
diff --git a/Backend/src/main/resources/application.properties b/Backend/src/main/resources/application.properties
deleted file mode 100644
index 703e479..0000000
--- a/Backend/src/main/resources/application.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#spring.datasource.url=jdbc:mariadb://192.168.0.22:3306/clock
-#spring.datasource.username=root
-#spring.datasource.password=<insert password here>
-#spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-#spring.jpa.hibernate.ddl-auto=update
-
-spring.data.mongodb.uri=mongodb://hykilp:<insert-password-here>@192.168.0.22:27017/?authSource=admin&retryWrites=true
-spring.data.mongodb.database=clock
diff --git a/Backend/src/test/kotlin/org/hydev/ios/alarmclock/AlarmClockApplicationTests.kt b/Backend/src/test/kotlin/org/hydev/ios/alarmclock/AlarmClockApplicationTests.kt
deleted file mode 100644
index 3605de2..0000000
--- a/Backend/src/test/kotlin/org/hydev/ios/alarmclock/AlarmClockApplicationTests.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.hydev.ios.alarmclock
-
-import org.junit.jupiter.api.Test
-import org.springframework.boot.test.context.SpringBootTest
-
-@SpringBootTest
-class AlarmClockApplicationTests
-{
-
-    @Test
-    fun contextLoads()
-    {
-    }
-
-}
diff --git a/ProjectClock/AlarmViewController.swift b/ProjectClock/AlarmViewController.swift
index 60d447d..b21a6e2 100644
--- a/ProjectClock/AlarmViewController.swift
+++ b/ProjectClock/AlarmViewController.swift
@@ -118,6 +118,11 @@ class AlarmTableCell: UITableViewCell
             }
         }
         
+        updateActivationTime()
+    }
+    
+    func updateActivationTime()
+    {
         // Show next activation date
         if alarm.enabled, let n = alarm.nextActivate {
             goingOffText.text = "(Going off in \(n.timeIntervalSince(Date()).str()))"