diff --git a/baystation12.dme b/baystation12.dme
index 5ecf0b9ff3484..a84d26578807d 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1555,7 +1555,6 @@
 #include "code\modules\client\preference_setup\general\03_equipment.dm"
 #include "code\modules\client\preference_setup\general\04_flavor.dm"
 #include "code\modules\client\preference_setup\general\05_preview.dm"
-#include "code\modules\client\preference_setup\general\06_psionics.dm"
 #include "code\modules\client\preference_setup\global\01_ui.dm"
 #include "code\modules\client\preference_setup\global\02_prefixes.dm"
 #include "code\modules\client\preference_setup\global\03_pai.dm"
@@ -1585,6 +1584,8 @@
 #include "code\modules\client\preference_setup\loadout\lists\xenowear.dm"
 #include "code\modules\client\preference_setup\occupation\occupation.dm"
 #include "code\modules\client\preference_setup\occupation\skill_selection.dm"
+#include "code\modules\client\preference_setup\psionics\01_basic.dm"
+#include "code\modules\client\preference_setup\psionics\02_abilities.dm"
 #include "code\modules\clothing\_clothing.dm"
 #include "code\modules\clothing\_clothing_flags.dm"
 #include "code\modules\clothing\buttons.dm"
@@ -2858,7 +2859,6 @@
 #include "code\modules\psionics\faculties\metakinesis.dm"
 #include "code\modules\psionics\faculties\psychokinesis.dm"
 #include "code\modules\psionics\faculties\redaction.dm"
-#include "code\modules\psionics\interface\selection_ui.dm"
 #include "code\modules\psionics\interface\ui.dm"
 #include "code\modules\psionics\interface\ui_hub.dm"
 #include "code\modules\psionics\interface\ui_toggles.dm"
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 6f9eacd088260..7f78a425db410 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -49,7 +49,7 @@
 	var/list/species_branch_rank_cache_ = list()
 	var/list/psi_faculties                // Starting psi faculties, if any.
 	var/psi_latency_chance = 0            // Chance of an additional psi latency, if any.
-	var/give_psionic_implant_on_join = TRUE // If psionic, will be implanted for control.
+	var/give_psionic_implant_on_join = FALSE // If psionic, will be implanted for control.
 
 	var/use_species_whitelist // If set, restricts the job to players with the given species whitelist. This does NOT restrict characters joining as the job to the species itself.
 
@@ -57,7 +57,7 @@
 
 	var/faction = MOB_FACTION_CREW
 
-	var/psi_allowed_species = list(/datum/species/human,/datum/species/human/vatgrown,/datum/species/human/tritonian,/datum/species/human/gravworlder,/datum/species/human/spacer)
+	var/global/psi_allowed_species = list(/datum/species/human,/datum/species/human/vatgrown,/datum/species/human/tritonian,/datum/species/human/gravworlder,/datum/species/human/spacer)
 
 /datum/job/New()
 
@@ -73,6 +73,41 @@
 /datum/job/dd_SortValue()
 	return title
 
+/datum/job/proc/give_psi(mob/living/carbon/human/H)
+	if(!(all_species[H.client.prefs.species].type in psi_allowed_species))
+		return
+
+	if(psi_latency_chance && prob(psi_latency_chance))
+		H.set_psi_rank(pick(PSI_COERCION, PSI_REDACTION, PSI_ENERGISTICS, PSI_PSYCHOKINESIS, PSI_CONSCIOUSNESS, PSI_MANIFESTATION, PSI_METAKINESIS), 1, defer_update = TRUE)
+
+	var/list/psi_abilities_by_name = H.client.prefs.psi_abilities
+
+	LAZYINITLIST(psi_faculties)
+	for(var/faculty_name in psi_abilities_by_name)
+		var/faculty_id = SSpsi.faculties_by_name[faculty_name].id
+		psi_faculties |= list("[faculty_id]" = psi_abilities_by_name[faculty_name])
+
+	for(var/psi in psi_faculties)
+		H.set_psi_rank(psi, psi_faculties[psi], take_larger = TRUE, defer_update = TRUE)
+
+	H.psi.update()
+
+	give_psionic_implant_on_join ||= (H.client.prefs.psi_openness && H.client.prefs.psi_status < 4)
+
+	if(!give_psionic_implant_on_join)
+		return
+
+	var/obj/item/implant/psi_control/imp = new
+	imp.implanted(H)
+	imp.forceMove(H)
+	imp.imp_in = H
+	imp.implanted = TRUE
+	var/obj/item/organ/external/affected = H.get_organ(BP_HEAD)
+	if(affected)
+		affected.implants += imp
+		imp.part = affected
+	to_chat(H, SPAN_DANGER("As a registered psionic, you are fitted with a psi-dampening control implant. Using psi-power while the implant is active will result in neural shocks and your violation being reported."))
+
 /datum/job/proc/equip(mob/living/carbon/human/H, alt_title, datum/mil_branch/branch, datum/mil_rank/grade)
 
 	if (required_language)
@@ -83,32 +118,8 @@
 		H.add_language(LANGUAGE_SPACER)
 		H.set_default_language(all_languages[LANGUAGE_SPACER])
 
-	if(psi_latency_chance && prob(psi_latency_chance))
-		H.set_psi_rank(pick(PSI_COERCION, PSI_REDACTION, PSI_ENERGISTICS, PSI_PSYCHOKINESIS, PSI_CONSCIOUSNESS, PSI_MANIFESTATION, PSI_METAKINESIS), 1, defer_update = TRUE)
-	if(islist(psi_faculties))
-		for(var/psi in psi_faculties)
-			H.set_psi_rank(psi, psi_faculties[psi], take_larger = TRUE, defer_update = TRUE)
-	H.psi?.update()
-	if((H.psi && give_psionic_implant_on_join) || (H.client?.prefs.psi_openness && H.client.prefs.psi_status <= 2))
-// FD PSIONICS
-		if(!(H.species.type in psi_allowed_species))
-			to_chat(H, SPAN_DANGER("Only humans can have psionic abilities!"))
-			return
-		var/obj/item/implant/psi_control/imp = new
-		imp.implanted(H)
-		imp.forceMove(H)
-		imp.imp_in = H
-		imp.implanted = TRUE
-		var/obj/item/organ/external/affected = H.get_organ(BP_HEAD)
-		if(affected)
-			affected.implants += imp
-			imp.part = affected
-		to_chat(H, SPAN_DANGER("As a registered psionic, you are fitted with a psi-dampening control implant. Using psi-power while the implant is active will result in neural shocks and your violation being reported."))
-	if(H.client?.prefs.psi_threat_level && (H.species.type in psi_allowed_species))
-		H.verbs += /mob/living/carbon/human/proc/SelectPsiAbilities
-		spawn(10)
-			H.SelectPsiAbilities()
-// FD PSIONICS
+	give_psi(H)
+
 	var/singleton/hierarchy/outfit/outfit = get_outfit(H, alt_title, branch, grade)
 	if(outfit) . = outfit.equip(H, title, alt_title)
 	if(faction)
diff --git a/code/game/objects/items/passport.dm b/code/game/objects/items/passport.dm
index fd80a14af21e7..f93ff57f2d698 100644
--- a/code/game/objects/items/passport.dm
+++ b/code/game/objects/items/passport.dm
@@ -19,10 +19,11 @@
 		fingerprint = md5(H.dna.uni_identity)
 	else
 		fingerprint = "N/A"
+	info = "\icon[src] [src]:\nName: [H.real_name]\nSpecies: [H.get_species()]\nPronouns: [H.pronouns]\nAge: [H.age]\nPlace of Birth: [pob]\nFingerprint: [fingerprint]"
 
 	var/psi
 	if(H.client?.prefs?.psi_threat_level && H.client.prefs.psi_openness)
-		psi  = "Psionics status: [GLOB.psistatus2text[H.client.prefs.psi_status]]\n"
+		psi  = "Psionics status: [GLOB.psi_status2text[H.client.prefs.psi_status]]\n"
 		psi += "Psionics threat level: [H.client.prefs.psi_threat_level]\n"
 	info = "\icon[src] [src]:\nName: [H.real_name]\nSpecies: [H.get_species()]\nGender: [gender2text(H.gender)]\nAge: [H.age]\n[psi]Place of Birth: [pob]\nFingerprint: [fingerprint]"
 
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 85706aa8bee93..b52e9b4d40e9b 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -271,7 +271,7 @@ var/global/const/NO_EMAG_ACT = -50
 	if(front && side)
 		send_rsc(user, front, "front.png")
 		send_rsc(user, side, "side.png")
-	var/datum/browser/popup = new(user, "idcard", name, 600, 300)
+	var/datum/browser/popup = new(user, "idcard", name, 600, 350)
 	popup.set_content(dat())
 	popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
 	popup.open()
@@ -302,9 +302,6 @@ var/global/const/NO_EMAG_ACT = -50
 			if(culture)
 				id_card.formal_name_prefix = "[culture.get_formal_name_prefix()][id_card.formal_name_prefix]"
 				id_card.formal_name_suffix = "[id_card.formal_name_suffix][culture.get_formal_name_suffix()]"
-		if(client.prefs.psi_threat_level && client.prefs.psi_openness)
-			id_card.psi_level = client.prefs.psi_threat_level
-			id_card.psi_status = GLOB.psistatus2text[client.prefs.psi_status]
 
 	id_card.registered_name = real_name
 
@@ -320,6 +317,10 @@ var/global/const/NO_EMAG_ACT = -50
 		id_card.dna_hash		= dna.unique_enzymes
 		id_card.fingerprint_hash= md5(dna.uni_identity)
 
+	if(client?.prefs?.psi_threat_level && client.prefs.psi_openness)
+		id_card.psi_level = client.prefs.psi_threat_level
+		id_card.psi_status = GLOB.psi_status2text[client.prefs.psi_status]
+
 /mob/living/carbon/human/set_id_info(obj/item/card/id/id_card)
 	..()
 	id_card.age = age
@@ -333,19 +334,26 @@ var/global/const/NO_EMAG_ACT = -50
 				for(var/add_access in category.add_accesses)
 					id_card.access.Add(add_access)
 
+/obj/item/card/id/proc/extra_dat()
+	. = list()
+	if(psi_status)
+		. += "Psionics status: [psi_status]<br>"
+		. += "Psionics threat level: [psi_level]<br>"
+
 /obj/item/card/id/proc/dat()
 	var/list/dat = list("<table><tr><td>")
-	dat += text("Name: []</A><BR>", "[formal_name_prefix][registered_name][formal_name_suffix]")
-	dat += text("Pronouns: []</A><BR>\n", sex)
-	dat += text("Age: []</A><BR>\n", age)
-	if(psi_status)
-		dat += "Psionics status: [psi_status]<BR>\n"
-		dat += "Psionics threat level: [psi_level]<BR>\n"
+	dat += text("Name: []</A><br>", "[formal_name_prefix][registered_name][formal_name_suffix]")
+	dat += text("Pronouns: []</A><br>\n", sex)
+	dat += text("Age: []</A><br><br>\n", age)
+
+	dat += jointext(extra_dat(), null)
+	dat += "<br>"
 
 	if(GLOB.using_map.flags & MAP_HAS_BRANCH)
 		dat += text("Branch: []</A><BR>\n", military_branch ? military_branch.name : "\[UNSET\]")
 	if(GLOB.using_map.flags & MAP_HAS_RANK)
 		dat += text("Rank: []</A><BR>\n", military_rank ? military_rank.name : "\[UNSET\]")
+	dat += "<br>"
 
 	dat += text("Assignment: []</A><BR>\n", assignment)
 	dat += text("Fingerprint: []</A><BR>\n", fingerprint_hash)
@@ -353,11 +361,12 @@ var/global/const/NO_EMAG_ACT = -50
 	dat += text("DNA Hash: []<BR><BR>\n", dna_hash)
 	if(front && side)
 		dat += "<td align = center valign = top>Photo:<br>"
-		dat += "<img style='image-rendering: pixelated;' src=front.png height=80 width=80 border=4>"
-		dat += "<img style='image-rendering: pixelated;' src=side.png height=80 width=80 border=4>"
+		dat += "<img style='image-rendering: pixelated;' src=front.png height=96 width=96>"
+		dat += "<img style='image-rendering: pixelated;' src=side.png height=96 width=96>"
 		dat += "</td>"
 	dat += "</tr></table>"
-	return jointext(dat,null)
+
+	return jointext(dat, null)
 
 /obj/item/card/id/attack_self(mob/user as mob)
 	user.visible_message("\The [user] shows you: [icon2html(src, viewers(get_turf(src)))] [src.name]. The assignment on the card: [src.assignment]",\
diff --git a/code/modules/client/preference_setup/general/06_psionics.dm b/code/modules/client/preference_setup/general/06_psionics.dm
deleted file mode 100644
index abf35d456f3e2..0000000000000
--- a/code/modules/client/preference_setup/general/06_psionics.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-GLOBAL_LIST_INIT(psistatus2text, list("C", "B", "A", "S"))
-GLOBAL_LIST_INIT(text2psistatus, list("C" = 1, "B" = 2, "A" = 3, "S" = 4))
-
-/datum/preferences
-	var/psi_threat_level = 0
-	var/psi_status       = 4
-	var/psi_openness     = FALSE
-
-/datum/category_item/player_setup_item/physical/psionics
-	name = "psionics"
-	sort_order = 5
-
-/datum/category_item/player_setup_item/physical/psionics/load_character(datum/pref_record_reader/R)
-	pref.psi_threat_level = R.read("psi_threat_level")
-	pref.psi_status       = R.read("psi_status")
-	pref.psi_openness     = R.read("psi_openness")
-
-/datum/category_item/player_setup_item/physical/psionics/save_character(datum/pref_record_writer/W)
-	W.write("psi_threat_level", pref.psi_threat_level)
-	W.write("psi_status",       pref.psi_status)
-	W.write("psi_openness",     pref.psi_openness)
-
-/datum/category_item/player_setup_item/physical/psionics/sanitize_character()
-	pref.psi_threat_level = clamp(pref.psi_threat_level, 0, 4)
-	pref.psi_status       = clamp(pref.psi_status      , 1, 4)
-
-/datum/category_item/player_setup_item/physical/psionics/content()
-	. = list()
-	. += "<hr><b>Psionics:</b><br>"
-	. += "Threat level: <a href='?src=\ref[src];select_psi_threat_level=1'><b>[pref.psi_threat_level]</b></a><br>"
-	if(pref.psi_threat_level)
-		. += "Psionic status: <a href='?src=\ref[src];select_psi_status=1'><b>[GLOB.psistatus2text[pref.psi_status]]</b></a><br>"
-		. += "Openness: <a href='?src=\ref[src];select_psi_openness=1'><b>[pref.psi_openness ? "Yes" : "No"]</b></a><br>"
-	. = jointext(.,null)
-
-/datum/category_item/player_setup_item/physical/psionics/OnTopic(href, list/href_list, mob/user)
-	if(href_list["select_psi_threat_level"])
-		pref.psi_threat_level = clamp(input("Select threat level (0 - 4)", CHARACTER_PREFERENCE_INPUT_TITLE, pref.psi_threat_level), 0, 4)
-		return TOPIC_REFRESH
-	else if(href_list["select_psi_status"])
-		var/selection = input("Select psionics status", CHARACTER_PREFERENCE_INPUT_TITLE, GLOB.psistatus2text[pref.psi_status]) in GLOB.text2psistatus
-		if(!(selection in GLOB.text2psistatus))
-			return TOPIC_HANDLED
-		pref.psi_status = GLOB.text2psistatus[selection]
-		return TOPIC_REFRESH
-	else if(href_list["select_psi_openness"])
-		var/selection = input("Select psionics openness", CHARACTER_PREFERENCE_INPUT_TITLE, pref.psi_openness ? "Yes" : "No") in list("Yes", "No")
-		pref.psi_openness = (selection == "Yes")
-		return TOPIC_REFRESH
-	return ..()
diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
index 09344a28fcf70..1803a2b7cf894 100644
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -30,6 +30,11 @@ var/global/const/CHARACTER_PREFERENCE_INPUT_TITLE = "Character Preference"
 	sort_order = 4
 	category_item_type = /datum/category_item/player_setup_item/antagonism
 
+/datum/category_group/player_setup_category/psionics_preferences
+	name = "Psionics"
+	sort_order = 5
+	category_item_type = /datum/category_item/player_setup_item/psionics
+
 /datum/category_group/player_setup_category/loadout_preferences
 	name = "Loadout"
 	sort_order = 6
diff --git a/code/modules/client/preference_setup/psionics/01_basic.dm b/code/modules/client/preference_setup/psionics/01_basic.dm
new file mode 100644
index 0000000000000..e0a04aa3b303d
--- /dev/null
+++ b/code/modules/client/preference_setup/psionics/01_basic.dm
@@ -0,0 +1,55 @@
+GLOBAL_LIST_INIT(psi_status2text, list("C", "B", "A", "S"))
+GLOBAL_LIST_INIT(text2psi_status, list("C" = 1, "B" = 2, "A" = 3, "S" = 4))
+
+/datum/preferences
+	var/psi_threat_level = 0
+	var/psi_status       = 4
+	var/psi_openness     = FALSE
+
+/datum/category_item/player_setup_item/psionics/basic
+	name = "Basic"
+	sort_order = 1
+
+/datum/category_item/player_setup_item/psionics/basic/load_character(datum/pref_record_reader/R)
+	pref.psi_threat_level = R.read("psi_threat_level")
+	pref.psi_status       = R.read("psi_status")
+	pref.psi_openness     = R.read("psi_openness")
+
+/datum/category_item/player_setup_item/psionics/basic/save_character(datum/pref_record_writer/W)
+	W.write("psi_threat_level", pref.psi_threat_level)
+	W.write("psi_status",       pref.psi_status)
+	W.write("psi_openness",     pref.psi_openness)
+
+/datum/category_item/player_setup_item/psionics/basic/sanitize_character()
+	pref.psi_threat_level = clamp(pref.psi_threat_level, 0, 4)
+	pref.psi_status       = clamp(pref.psi_status      , 1, 4)
+
+/datum/category_item/player_setup_item/psionics/basic/content()
+	. = list()
+	. += "Threat level: <a href='?src=\ref[src];select_psi_threat_level=1'><b>[pref.psi_threat_level]</b></a><br>"
+
+	if(pref.psi_threat_level)
+		. += "Psionic status: <a href='?src=\ref[src];select_psi_status=1'><b>[GLOB.psi_status2text[pref.psi_status]]</b></a><br>"
+		. += "Openness: <a href='?src=\ref[src];toggle_psi_openness=1'><b>[pref.psi_openness ? "Yes" : "No"]</b></a><br>"
+
+	. = jointext(.,null)
+
+/datum/category_item/player_setup_item/psionics/OnTopic(href, list/href_list, mob/user)
+	if(href_list["select_psi_threat_level"])
+		pref.psi_threat_level = text2num(input("Select threat level", CHARACTER_PREFERENCE_INPUT_TITLE, pref.psi_threat_level) in list("0", "1", "2", "3", "4"))
+		pref.psi_threat_level = clamp(pref.psi_threat_level, 0, 4)
+		return TOPIC_REFRESH
+
+	else if(href_list["select_psi_status"])
+		var/selection = input("Select psionics status", CHARACTER_PREFERENCE_INPUT_TITLE, GLOB.psi_status2text[pref.psi_status]) in GLOB.text2psi_status
+		if(!(selection in GLOB.text2psi_status))
+			return TOPIC_HANDLED
+
+		pref.psi_status = GLOB.text2psi_status[selection]
+		return TOPIC_REFRESH
+
+	else if(href_list["toggle_psi_openness"])
+		pref.psi_openness = !pref.psi_openness
+		return TOPIC_REFRESH
+
+	return ..()
diff --git a/code/modules/client/preference_setup/psionics/02_abilities.dm b/code/modules/client/preference_setup/psionics/02_abilities.dm
new file mode 100644
index 0000000000000..7bca5c3d1aeca
--- /dev/null
+++ b/code/modules/client/preference_setup/psionics/02_abilities.dm
@@ -0,0 +1,117 @@
+GLOBAL_LIST_INIT(psi_level2cost, list(
+	"Blunt"       = 0,
+	"Latent"      = 1,
+	"Apprentice"  = 2,
+	"Operant"     = 4,
+	"Master"      = 6,
+	"Grandmaster" = 8
+))
+
+GLOBAL_LIST_INIT(psi_faculty2color, list(
+	"Catastellia" = COLOR_SURGERY_BLUE,
+	"Allaxetia"   = COLOR_SURGERY_BLUE,
+	"Hyloforia"   = COLOR_MEDICAL_UNKNOWN_IMPLANT,
+	"Demiurgy"    = COLOR_LIGHT_CYAN,
+	"Metaplexy"   = COLOR_SEDONA,
+	"Teleplexy"   = COLOR_LIGHT_CYAN,
+	"Ephanoferia" = MANIFEST_COLOR_SERVICE
+))
+
+GLOBAL_LIST_INIT(psi_threat_level2free_points, list(3, 4, 9, 14))
+
+/datum/preferences
+	var/list/psi_abilities
+
+
+/datum/category_item/player_setup_item/psionics/abilities
+	name = "Abilities"
+	sort_order = 3
+
+/datum/category_item/player_setup_item/psionics/abilities/load_character(datum/pref_record_reader/R)
+	pref.psi_abilities = R.read("psi_abilities")
+
+/datum/category_item/player_setup_item/psionics/abilities/save_character(datum/pref_record_writer/W)
+	W.write("psi_abilities", pref.psi_abilities)
+
+/datum/category_item/player_setup_item/psionics/abilities/sanitize_character()
+	if(pref.psi_abilities)
+		return ..()
+
+	pref.psi_abilities = list()
+	for(var/faculty in SSpsi.faculties_by_name)
+		pref.psi_abilities[faculty] = 1
+
+	return ..()
+
+/datum/category_item/player_setup_item/psionics/abilities/proc/calculate_free_points()
+	. = GLOB.psi_threat_level2free_points[pref.psi_threat_level]
+
+	for(var/faculty in pref.psi_abilities)
+		for(var/level in 1 to GLOB.psi_level2cost.len)
+			var/level_name = GLOB.psi_level2cost[level]
+			var/level_cost = GLOB.psi_level2cost[level_name]
+
+			if(pref.psi_abilities[faculty] == level)
+				. -= level_cost
+
+/datum/category_item/player_setup_item/psionics/abilities/proc/can_select_level(faculty, level)
+	return (calculate_free_points() + GLOB.psi_level2cost[GLOB.psi_level2cost[pref.psi_abilities[faculty]]]) >= GLOB.psi_level2cost[GLOB.psi_level2cost[level]]
+
+/datum/category_item/player_setup_item/psionics/abilities/content()
+	if(!pref.psi_threat_level)
+		return ..()
+
+	. = list()
+
+	. += "<style>"
+	. += ".Current{background: #2f943c}"
+	. += ".Unavailable{background: #404040}"
+	. += ".Selectable, a.Selectable{float:none; border:none; margin:none !important; padding:none !important}"
+	. += ".center { margin: auto; }"
+	. += ".candystripe { background-color: rgba(148, 148, 148, 0.25);}"
+	. += ".candystripe:nth-child(odd) {background-color: rgba(0, 0, 0, 0.16);}"
+
+	. += "</style>"
+
+	. += "<tt><center>"
+
+	. += FONT_LARGE("<b>Points remaining: [calculate_free_points()]</b>")
+
+	. += "<table style='width: 100%' style='font-size: 15px; text-align: center' class='table'>"
+
+	for(var/faculty in pref.psi_abilities)
+		. += "<tr class='candystripe'>"
+		. += "<th><div class='average' style='color: [GLOB.psi_faculty2color[faculty]]'>[faculty]:</div></th>"
+
+		for(var/level_index in 1 to GLOB.psi_level2cost.len)
+			var/level_name = GLOB.psi_level2cost[level_index]
+
+			if(pref.psi_abilities[faculty] == level_index)
+				. += "<td class='Current'><div class='center'>[level_name]</div></td>"
+			else if(can_select_level(faculty, level_index))
+				. += "<td class style='background: #40628a;'><div class='center'><a class='Selectable' href='?src=\ref[src];select=[level_index];faculty=[faculty]'>[level_name]</a></div></td>"
+			else
+				. += "<td class='Unavailable'><div class='center'>[level_name]</div></td>"
+
+		. += "</tr>"
+
+	. += "</table>"
+
+	. += "</center></tt>"
+
+	. = jointext(., null)
+
+/datum/category_item/player_setup_item/psionics/abilities/OnTopic(href, list/href_list, mob/user)
+	if(..())
+		return TOPIC_HANDLED
+
+	if(href_list["select"])
+		var/level   = text2num(href_list["select"])
+		var/faculty = href_list["faculty"]
+
+		if(!can_select_level(faculty, level))
+			return TOPIC_HANDLED
+
+		pref.psi_abilities[faculty] = level
+
+	return TOPIC_REFRESH
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 4de8ab1c6ce39..5c741491f4dba 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -254,10 +254,12 @@
 		to_chat(src, alert("[job.title] is not available. Please try another."))
 		return 0
 
+/*
 	if (!check_occupation_set(job))
 		var/choice = alert("You do not have [job.title] set as your occupation, are you sure you want to join as this role?", "Occupation Mismatch", "Yes", "No")
 		if (choice != "Yes")
 			return FALSE
+*/
 
 	SSjobs.assign_role(src, job.title, 1)
 
diff --git a/code/modules/psionics/equipment/psimonitor.dm b/code/modules/psionics/equipment/psimonitor.dm
index 2f4e3a913156f..a8ba54e7c8059 100644
--- a/code/modules/psionics/equipment/psimonitor.dm
+++ b/code/modules/psionics/equipment/psimonitor.dm
@@ -59,7 +59,6 @@
 				if(!AreConnectedZLevels(z, implant.imp_in.z))
 					to_chat(usr, SPAN_WARNING("Signal to implant was lost"))
 					return 1
-
 				var/choice = input("Select a new implant mode.", "Psi Dampener") as null|anything in list(PSI_IMPLANT_AUTOMATIC, PSI_IMPLANT_SHOCK, PSI_IMPLANT_WARN, PSI_IMPLANT_LOG, PSI_IMPLANT_DISABLED)
 				if(choice && implant && implant.imp_in && !implant.malfunction)
 					implant.psi_mode = choice
diff --git a/code/modules/psionics/interface/selection_ui.dm b/code/modules/psionics/interface/selection_ui.dm
deleted file mode 100644
index d4aa97b0c6fc4..0000000000000
--- a/code/modules/psionics/interface/selection_ui.dm
+++ /dev/null
@@ -1,145 +0,0 @@
-/mob/living/carbon/human
-	var/datum/psi_abilities_selection/psi_sel
-	var/is_psi_abilities_selected = FALSE
-
-/mob/living/carbon/human/Destroy()
-	. = ..()
-	psi_sel = null
-
-/mob/living/carbon/human/proc/SelectPsiAbilities()
-	set name     = "Select Psi Abilities"
-	set category = "Psionics"
-	if(!client?.prefs?.psi_threat_level || is_psi_abilities_selected)
-		return
-
-	var/datum/nano_module/psi_ui/ui = new(src)
-	ui.ui_interact(src)
-
-/datum/psi_abilities_selection
-	var/list/selected = list() // faculty = level
-	var/global/list/levels = list(
-		"Blunt" = 0,
-		"Latent"= 1,
-		"Apprentice" = 2,
-		"Operant" = 4,
-		"Master" = 6,
-		"Grandmaster" = 8,
-
-	)
-	var/mob/living/carbon/human/M
-
-/datum/psi_abilities_selection/proc/get_free_points()
-	switch(M.client.prefs.psi_threat_level)
-		if(1)
-			. = 3
-		if(2)
-			. = 4
-		if(3)
-			. = 9
-		if(4)
-			. = 14
-
-	for(var/category in selected)
-		for(var/level in 1 to levels.len)
-			var/level_name = levels[level]
-			var/level_cost = levels[level_name]
-
-			if(selected[category] == level)
-				. -= level_cost
-
-/datum/psi_abilities_selection/New(mob/living/carbon/human/host)
-	. = ..()
-	ASSERT(host.client?.prefs)
-	M = host
-
-	for(var/faculty in SSpsi.faculties_by_name_new)
-		selected[faculty] = 1
-
-/datum/psi_abilities_selection/proc/transfer()
-	M.psi_sel = null
-	M.is_psi_abilities_selected = TRUE
-	M.verbs -= /mob/living/carbon/human/proc/SelectPsiAbilities
-	for(var/name in selected)
-		var/id = SSpsi.faculties_by_name_new[name]
-		M.set_psi_rank(id, selected[name] - 1, defer_update = TRUE)
-	M.psi.update()
-
-/datum/psi_abilities_selection/proc/get_data()
-	var/free_points = get_free_points()
-
-	.               = list()
-	.["faculties"]  = list()
-	.["free_points"]= free_points
-
-	for(var/category in selected)
-		var/list/levels_to_select = list()
-		for(var/level in 1 to levels.len)
-			var/level_name    = levels[level]
-			var/selected_level= selected[category]
-
-			levels_to_select += list(list(
-				"name"        = level_name,
-				"level"       = "[level]",
-				"category"    = category,
-				"selected"    = selected_level == level,
-				"selectable"  = can_select(category, level)
-			))
-
-		.["faculties"] += list(list(
-			"name"      = category,
-			"levels"    = levels_to_select
-		))
-
-	return .
-
-/datum/psi_abilities_selection/proc/can_select(category, level)
-	return (get_free_points() + levels[levels[selected[category]]]) >= levels[levels[level]]
-
-/datum/psi_abilities_selection/proc/select(category, level)
-	selected[category] = level
-
-/datum/nano_module/psi_ui
-	var/datum/psi_abilities_selection/psi_sel = null
-
-/datum/nano_module/psi_ui/New(mob/living/carbon/human/host, topic_manager)
-	if(!host.psi_sel)
-		host.psi_sel = new(host)
-	psi_sel = host.psi_sel
-	..()
-
-/datum/nano_module/psi_ui/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = GLOB.self_state)
-	if(!psi_sel)
-		return
-
-	var/list/data = psi_sel.get_data()
-
-	ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
-		ui = new(user, src, ui_key, "psi_ui.tmpl", "Psi abilities", 600, 390, src, state = state)
-		ui.set_initial_data(data)
-		ui.open()
-
-/datum/nano_module/psi_ui/Topic(href, href_list)
-	if(..())
-		return TOPIC_HANDLED
-	if(!psi_sel)
-		return TOPIC_HANDLED
-
-
-	if(href_list["select"])
-		var/level = text2num(href_list["select"])
-		var/category= href_list["category"]
-		if(!psi_sel.can_select(category, level))
-			return TOPIC_HANDLED
-		psi_sel.select(category, level)
-
-	if(href_list["confirm"])
-		var/confirmation = alert("Are you sure? After confirming you won't be able to change your starting abilities later", "Confirmation", "No", "Yes, give me my psi")
-		if(confirmation != "Yes, give me my psi")
-			return TOPIC_HANDLED
-
-		psi_sel.transfer()
-		qdel(src)
-		return TOPIC_HANDLED
-
-	return TOPIC_REFRESH
diff --git a/mods/_fd/backgrounds/code/factions_ipc.dm b/mods/_fd/backgrounds/code/factions_ipc.dm
index 4c5c9c14a552a..d2899f4bc866b 100644
--- a/mods/_fd/backgrounds/code/factions_ipc.dm
+++ b/mods/_fd/backgrounds/code/factions_ipc.dm
@@ -39,11 +39,10 @@
 	if(is_species(SPECIES_IPC))
 		id_card.ipc_gen = get_cultural_value(TAG_FACTION)
 
-/obj/item/card/id/dat()
-	var/list/dat = list("<table><tr><td>")
+/obj/item/card/id/extra_dat()
+	. = ..()
 	if(ipc_gen)
-		dat += text("Registration: []</A><BR>\n", ipc_gen)
-	..()
+		. += "Registration: [ipc_gen]<br>"
 
 /singleton/cultural_info/faction/ipc
 	economic_power = 0.1
diff --git a/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme b/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
index ea4c83cc2e1be..93f5fa5a9d7b6 100644
--- a/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
+++ b/mods/expanded_culture_descriptor/_expanded_culture_descriptor.dme
@@ -19,8 +19,8 @@
 #include "code/locations/locations_ipc.dm"
 #include "code/locations/locations_unathi.dm"
 
-#include "code/loadout_xeno.dm"
-#include "code/passport.dm"
+//#include "code/loadout_xeno.dm"
+//#include "code/passport.dm"
 
 #include "code/language/alain.dm"
 #include "code/language/arabic.dm"
diff --git a/nano/templates/psi_ui.tmpl b/nano/templates/psi_ui.tmpl
deleted file mode 100644
index 86cad3790b494..0000000000000
--- a/nano/templates/psi_ui.tmpl
+++ /dev/null
@@ -1,61 +0,0 @@
-<style>
-	.Selectable,
-	.Current,
-	.Unavailable,
-	.Toohigh{border: 1px solid #161616;padding: 1px 4px 1px 4px;margin: 0 2px 0 0; text-align:center; width:14%}
-	.Selectable,
-	a.Selectable{background: #40628a}
-	.Current,
-	a.Current{background: #2f943c}
-	.Unavailable{background: #404040}
-	.center {
-	  margin: auto;
-	}
-	.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton
-	{
-		float:none;
-		border:none;
-		margin:none;
-	}
-
-</style>
-
-<div style="text-align: center">
-	<b>Points remaining: {{:data.free_points}}</b><br>
-	<div class="Selectable" style="width:auto">
-	{{:helper.link("Confirm", null, {'confirm' : 1})}}
-	</div>
-</div>
-
-<table style="width:100%">
-	{{for data.faculties}}
-		<tr class="candystripe">
-		<th colspan="6">
-			<div class="average">
-				{{:value.name}}:
-			</div>
-		</th>
-		{{for value.levels :levelValue:levelIndex}}
-			{{if levelValue.selected}}
-				<td class="Current">
-					<div class="center">
-						{{:levelValue.name}}
-					</div>
-				</td>
-			{{else levelValue.selectable}}
-				<td class="Selectable">
-					<div class="center">
-						{{:helper.link(levelValue.name, null, {'select' : levelValue.level, 'category' : levelValue.category})}}
-					</div>
-				</td>
-			{{else}}
-				<td class="Unavailable">
-					<div class="center">
-						{{:levelValue.name}}
-					</div>
-				</td>
-			{{/if}}
-		{{/for}}
-		</tr>
-	{{/for}}
-</table>